summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorJacob Vosmaer (GitLab) <jacob@gitlab.com>2018-07-05 16:49:18 +0000
committerRobert Speicher <robert@gitlab.com>2018-07-05 16:49:18 +0000
commit7e1b491caf5a2850b9bc5a8afb014ee47248442f (patch)
treeda5c580452d7ed1913397a3ac3c21eca4000b1a3 /spec
parent8d90f9fd61c56d34226efc3280ec82c526175753 (diff)
downloadgitlab-ce-7e1b491caf5a2850b9bc5a8afb014ee47248442f.tar.gz
Increase capybara JS request timeout
Diffstat (limited to 'spec')
-rw-r--r--spec/support/helpers/wait_for_requests.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/support/helpers/wait_for_requests.rb b/spec/support/helpers/wait_for_requests.rb
index fda0e29f983..c7f878b7371 100644
--- a/spec/support/helpers/wait_for_requests.rb
+++ b/spec/support/helpers/wait_for_requests.rb
@@ -24,7 +24,9 @@ module WaitForRequests
# Wait for client-side AJAX requests
def wait_for_requests
- wait_for('JS requests complete') { finished_all_js_requests? }
+ wait_for('JS requests complete', max_wait_time: 2 * Capybara.default_max_wait_time) do
+ finished_all_js_requests?
+ end
end
# Wait for active Rack requests and client-side AJAX requests