diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-30 15:08:14 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-31 11:43:17 +0200 |
| commit | e559283cc0fe3f05ee57e060c44e307e8f721b67 (patch) | |
| tree | b95ba5ffb025807e176bbf99567b2106a46a9724 /features | |
| parent | acc2a03d924ec0b8fde8231e258830c103dffc59 (diff) | |
| download | gitlab-ce-e559283cc0fe3f05ee57e060c44e307e8f721b67.tar.gz | |
Increase Capybara's timeout
Also disabled assets warming for Capybara/RSpec and remove a check to
skip assets warming when ./tmp/cache/assets/test exists because assets
are now served by webpack-dev-server.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'features')
| -rw-r--r-- | features/support/capybara.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/features/support/capybara.rb b/features/support/capybara.rb index c0c489d2775..456ec4deaf5 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']) ? 40 : 10 Capybara.javascript_driver = :poltergeist Capybara.register_driver :poltergeist do |app| |