summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2017-11-15 10:09:14 +0000
committerWinnie Hellmann <winnie@gitlab.com>2017-11-15 17:26:03 +0000
commit6917985032a85945dcb846ba15ef7cf196df87fe (patch)
tree773d361059e042988360ea3514580e0e9f09873b /qa
parentb3008a939dbf9de55fe066f4189f62083542e93b (diff)
downloadgitlab-ce-6917985032a85945dcb846ba15ef7cf196df87fe.tar.gz
Merge branch 'rs-qa-default-timeout' into 'master'
Raise the QA Capybara's default wait time from 4 to 10 Closes gitlab-qa#103 See merge request gitlab-org/gitlab-ce!15382 (cherry picked from commit 331c807a40c2c61ea9b14423d65bed7e4fccca33) b09b9b8e Raise the QA Capybara's default wait time from 4 to 10
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/specs/config.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/qa/specs/config.rb b/qa/qa/specs/config.rb
index 79c681168cc..7e5fbe6cdde 100644
--- a/qa/qa/specs/config.rb
+++ b/qa/qa/specs/config.rb
@@ -59,7 +59,7 @@ module QA
config.app_host = @address
config.default_driver = :chrome
config.javascript_driver = :chrome
- config.default_max_wait_time = 4
+ config.default_max_wait_time = 10
# https://github.com/mattheworiordan/capybara-screenshot/issues/164
config.save_path = 'tmp'