From d6c692962e87826469c4ae479919b152fbcc5f6a Mon Sep 17 00:00:00 2001
From: Chrisbr <cbruckmayer@gmx.net>
Date: Sat, 10 May 2014 17:53:31 +0200
Subject: [PATCH] Enables capybara-webkit

---
 Gemfile             | 1 +
 Gemfile.lock        | 4 ++++
 spec/spec_helper.rb | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/Gemfile b/Gemfile
index 7847bfd9..743510a2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -77,6 +77,7 @@ group :development, :test do
   gem 'rspec-rails', '>= 3.0.0.beta'
   gem 'capybara'
   gem 'database_cleaner'
+  gem 'capybara-webkit'
 end
 
 # FIXME: We should use http://weblog.rubyonrails.org/2012/3/21/strong-parameters/ 
diff --git a/Gemfile.lock b/Gemfile.lock
index 1e787f6e..ba6788b1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,6 +55,9 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    capybara-webkit (1.1.0)
+      capybara (~> 2.0, >= 2.0.2)
+      json
     celluloid (0.15.2)
       timers (~> 1.1.0)
     celluloid-io (0.15.0)
@@ -303,6 +306,7 @@ DEPENDENCIES
   bootstrap-sass
   cancan
   capybara
+  capybara-webkit
   cocoon
   coveralls
   d3_rails
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index da3d3021..06839d80 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -44,6 +44,9 @@ RSpec.configure do |config|
   # Enables devise sign_in function
   config.include Devise::TestHelpers, type: :controller
 
+  # Use capybara-webkit as default javascript driver
+  Capybara.javascript_driver = :webkit
+
   # As we start from scratch in April 2014, let's forbid the old :should syntax
   config.expect_with :rspec do |c|
     c.syntax = :expect