diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-04-02 07:22:08 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-04-02 07:22:08 +0000 |
| commit | 9fc17f6f4abdb04f3cf1b60b87bd67b894a19c39 (patch) | |
| tree | 7ddfbd3850484324f2b6adf9f2d24e2c70d72071 | |
| parent | 6de540100b61f4cdbf8f1e8c5032376c963810b4 (diff) | |
| parent | c0564c549deaff44268622bfc26c81ec0c73dae7 (diff) | |
| download | gitlab-ce-9fc17f6f4abdb04f3cf1b60b87bd67b894a19c39.tar.gz | |
Merge branch 'sh-fix-capybara-features' into 'master'
Fix Spinach and Capybara dependencies
Closes #30347
See merge request !10395
| -rw-r--r-- | features/support/capybara.rb | 4 | ||||
| -rw-r--r-- | spec/support/test_env.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/features/support/capybara.rb b/features/support/capybara.rb index 33ca76bea8d..1e46b3faf0b 100644 --- a/features/support/capybara.rb +++ b/features/support/capybara.rb @@ -1,4 +1,3 @@ -require 'spinach/capybara' require 'capybara/poltergeist' require 'capybara-screenshot/spinach' @@ -25,5 +24,8 @@ Capybara.ignore_hidden_elements = false Capybara::Screenshot.prune_strategy = :keep_last_run Spinach.hooks.before_run do + require 'spinach/capybara' + require 'capybara/rails' + TestEnv.eager_load_driver_server end diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 9db489e9a9b..a19a35c2c0d 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -172,7 +172,7 @@ module TestEnv def eager_load_driver_server return unless defined?(Capybara) - puts "Starting the Capybara driver' server..." + puts "Starting the Capybara driver server..." Capybara.current_session.visit '/' end |