Use poltergeist instaead of capybara-webkit

1 files changed, 2 insertions, 8 deletions

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4700c3fe9af..ace5ca00cc1 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -11,14 +11,13 @@ require 'capybara/rails'
 require 'capybara/rspec'
 require 'webmock/rspec'
 require 'email_spec'
-require 'headless'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
-# Use capybara-webkit
-Capybara.javascript_driver = :webkit
+require 'capybara/poltergeist'
+Capybara.javascript_driver = :poltergeist
 
 WebMock.disable_net_connect!(allow_localhost: true)
 
@@ -35,11 +34,6 @@ RSpec.configure do |config|
   # instead of true.
   config.use_transactional_fixtures = false
 
-  config.before :all do
-    headless = Headless.new
-    headless.start
-  end
-
   config.before do
     stub_gitolite!