From 62adb1a8e283a4fc9f347bef87da541d4a5f604e Mon Sep 17 00:00:00 2001
From: Hauke Klement <dev@hklement.de>
Date: Thu, 29 Jan 2015 15:03:19 +0100
Subject: [PATCH] don't use WebKit with Capybara

---
 Gemfile              | 1 -
 Gemfile.lock         | 4 ----
 spec/rails_helper.rb | 2 --
 3 files changed, 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index a1306319..be18fee1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,6 @@ end
 group :test do
   gem 'autotest-rails'
   gem 'capybara'
-  gem 'capybara-webkit'
   gem 'codeclimate-test-reporter', require: nil
   gem 'database_cleaner'
   gem 'nyan-cat-formatter'
diff --git a/Gemfile.lock b/Gemfile.lock
index e91a4745..67be91fd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -66,9 +66,6 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-webkit (1.4.1)
-      capybara (>= 2.3.0, < 2.5.0)
-      json
     carrierwave (0.10.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
@@ -306,7 +303,6 @@ DEPENDENCIES
   capistrano-upload-config
   capistrano3-puma
   capybara
-  capybara-webkit
   carrierwave
   codeclimate-test-reporter
   coffee-rails (~> 4.0.0)
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 4034b52c..88b2a5bc 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -20,8 +20,6 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 # If you are not using ActiveRecord, you can remove this line.
 ActiveRecord::Migration.maintain_test_schema!
 
-Capybara.javascript_driver = :webkit
-
 RSpec.configure do |config|
   config.around(:each) do |example|
     Timeout::timeout(example.metadata[:permitted_execution_time] || MAXIMUM_EXECUTION_TIME) { example.run }