Merge branch 'sh-fix-capybara-features' into 'master'

Fix Spinach and Capybara dependencies

Closes #30347

See merge request !10395
This commit is contained in:
Grzegorz Bizon 2017-04-02 07:22:08 +00:00
commit 9fc17f6f4a
2 changed files with 4 additions and 2 deletions

View file

@ -1,4 +1,3 @@
require 'spinach/capybara'
require 'capybara/poltergeist' require 'capybara/poltergeist'
require 'capybara-screenshot/spinach' require 'capybara-screenshot/spinach'
@ -25,5 +24,8 @@ Capybara.ignore_hidden_elements = false
Capybara::Screenshot.prune_strategy = :keep_last_run Capybara::Screenshot.prune_strategy = :keep_last_run
Spinach.hooks.before_run do Spinach.hooks.before_run do
require 'spinach/capybara'
require 'capybara/rails'
TestEnv.eager_load_driver_server TestEnv.eager_load_driver_server
end end

View file

@ -172,7 +172,7 @@ module TestEnv
def eager_load_driver_server def eager_load_driver_server
return unless defined?(Capybara) return unless defined?(Capybara)
puts "Starting the Capybara driver' server..." puts "Starting the Capybara driver server..."
Capybara.current_session.visit '/' Capybara.current_session.visit '/'
end end