diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-01 03:38:22 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-04-01 03:38:22 +0300 |
| commit | 731d574d9359eca8cd37ef46e525bbc9603837a3 (patch) | |
| tree | 1284598b044917e4b997cf779cd25f045d35171e /features | |
| parent | b54acba8b732688c59fe2f38510c469dc86ee499 (diff) | |
| parent | 2fa560744871506d46d85ba0f008854ba4439a81 (diff) | |
Merge branch '30236-fix-capybara-timeouts' into 'master'
Increase Capybara's timeout
Closes #30236
See merge request !10337
Diffstat (limited to 'features')
| -rw-r--r-- | features/support/capybara.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/features/support/capybara.rb b/features/support/capybara.rb index c0c489d2775..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']) ? 30 : 10 +timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 60 : 30 Capybara.javascript_driver = :poltergeist Capybara.register_driver :poltergeist do |app| @@ -25,5 +25,5 @@ Capybara.ignore_hidden_elements = false Capybara::Screenshot.prune_strategy = :keep_last_run Spinach.hooks.before_run do - TestEnv.warm_asset_cache unless ENV['CI'] || ENV['CI_SERVER'] + TestEnv.eager_load_driver_server end |