diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-31 09:55:46 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-31 14:43:36 +0200 |
| commit | 2fa560744871506d46d85ba0f008854ba4439a81 (patch) | |
| tree | 801a11b623c6306ccdcb418e295c9690f08f33d0 | |
| parent | f659c406ab90b6ce45138fec5e7756c7740f8e2d (diff) | |
| download | gitlab-ce-2fa560744871506d46d85ba0f008854ba4439a81.tar.gz | |
Properly eagerly-load the Capybara server for JS feature specs only
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | features/support/capybara.rb | 2 | ||||
| -rw-r--r-- | spec/support/capybara.rb | 8 | ||||
| -rw-r--r-- | spec/support/test_env.rb | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/features/support/capybara.rb b/features/support/capybara.rb index 96e1421462f..33ca76bea8d 100644 --- a/features/support/capybara.rb +++ b/features/support/capybara.rb @@ -3,7 +3,7 @@ require 'capybara/poltergeist' require 'capybara-screenshot/spinach' # Give CI some extra time -timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 40 : 10 +timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 60 : 30 Capybara.javascript_driver = :poltergeist Capybara.register_driver :poltergeist do |app| diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index d4e38eb2a51..b8ca8f22a3d 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -1,10 +1,11 @@ +# rubocop:disable Style/GlobalVars require 'capybara/rails' require 'capybara/rspec' require 'capybara/poltergeist' require 'capybara-screenshot/rspec' # Give CI some extra time -timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 40 : 10 +timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 60 : 30 Capybara.javascript_driver = :poltergeist Capybara.register_driver :poltergeist do |app| @@ -26,7 +27,10 @@ Capybara.ignore_hidden_elements = true Capybara::Screenshot.prune_strategy = :keep_last_run RSpec.configure do |config| - config.before(:suite) do + config.before(:context, :js) do + next if $capybara_server_already_started + TestEnv.eager_load_driver_server + $capybara_server_already_started = true end end diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 6c48be904fc..9db489e9a9b 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -172,7 +172,8 @@ module TestEnv def eager_load_driver_server return unless defined?(Capybara) - Capybara.current_session.driver.visit '/' + puts "Starting the Capybara driver' server..." + Capybara.current_session.visit '/' end private |