Commit 1cb6ec5c authored by Robert Speicher's avatar Robert Speicher

Merge branch 'increase-capybara-js-timeout' into 'master'

Increase capybara JS request timeout

Closes #48837

See merge request gitlab-org/gitlab-ce!20411
parents 8d90f9fd 7e1b491c
...@@ -24,7 +24,9 @@ module WaitForRequests ...@@ -24,7 +24,9 @@ module WaitForRequests
# Wait for client-side AJAX requests # Wait for client-side AJAX requests
def wait_for_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 end
# Wait for active Rack requests and client-side AJAX requests # Wait for active Rack requests and client-side AJAX requests
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment