diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2017-03-08 12:50:19 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-03-08 12:50:19 -0500 |
| commit | 460c2d1c5124b365d413949d5171136f1604b671 (patch) | |
| tree | e09f1af22e98e1cdd99a1af36411497135eadbad | |
| parent | 935574edd407ebb2f8aeeee2584da9b07850e813 (diff) | |
| download | gitlab-ce-rs-lower-capybara-timeout.tar.gz | |
Decrease Capybara timeout for CI environmentrs-lower-capybara-timeout
| -rw-r--r-- | features/support/capybara.rb | 2 | ||||
| -rw-r--r-- | spec/support/capybara.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/features/support/capybara.rb b/features/support/capybara.rb index 47372df152d..a5fcbb65131 100644 --- a/features/support/capybara.rb +++ b/features/support/capybara.rb @@ -2,7 +2,7 @@ require 'spinach/capybara' require 'capybara/poltergeist' # Give CI some extra time -timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 90 : 15 +timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 30 : 10 Capybara.javascript_driver = :poltergeist Capybara.register_driver :poltergeist do |app| diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index 16d5f2bf0b8..62740ec29fd 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -3,7 +3,7 @@ require 'capybara/rspec' require 'capybara/poltergeist' # Give CI some extra time -timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 90 : 10 +timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 30 : 10 Capybara.javascript_driver = :poltergeist Capybara.register_driver :poltergeist do |app| |