summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-03-08 12:50:19 -0500
committerRobert Speicher <rspeicher@gmail.com>2017-03-08 12:50:19 -0500
commit460c2d1c5124b365d413949d5171136f1604b671 (patch)
treee09f1af22e98e1cdd99a1af36411497135eadbad /features
parent935574edd407ebb2f8aeeee2584da9b07850e813 (diff)
downloadgitlab-ce-460c2d1c5124b365d413949d5171136f1604b671.tar.gz
Decrease Capybara timeout for CI environmentrs-lower-capybara-timeout
Diffstat (limited to 'features')
-rw-r--r--features/support/capybara.rb2
1 files changed, 1 insertions, 1 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|