summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Bennett <lukeeeebennettplus@gmail.com>2016-07-27 21:35:35 +0100
committerLuke Bennett <lukeeeebennettplus@gmail.com>2016-07-27 21:35:35 +0100
commiteecc027a96cbf35dc558208572f2b4ca0a15bda1 (patch)
tree804ffbb685c44208503f03f9756cf999fecee42d
parentc675bdad95668b891aec51eac7afbeec72873891 (diff)
downloadgitlab-ce-increase-capybara-timeout.tar.gz
Increase capybara timeout for both CI envs and non-CI envsincrease-capybara-timeout
-rw-r--r--spec/support/capybara.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index e1f90e17cce..20c562ad3db 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']) ? 120 : 40
Capybara.javascript_driver = :poltergeist
Capybara.register_driver :poltergeist do |app|