diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-08 21:20:52 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-08 21:20:52 +0000 |
| commit | 2d0056709228d1de4fb8304a9c66ee1ed001e12c (patch) | |
| tree | fdd69067b61cdfc8f0cd4a58d5d881590c1e0ebf | |
| parent | 75efb2c9afb68f722476f8843f8cf06b14863375 (diff) | |
| parent | 460c2d1c5124b365d413949d5171136f1604b671 (diff) | |
| download | gitlab-ce-2d0056709228d1de4fb8304a9c66ee1ed001e12c.tar.gz | |
Merge branch 'rs-lower-capybara-timeout' into 'master'
Decrease Capybara timeout for CI environment
Closes #29091
See merge request !9816
| -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| |