diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 12:07:57 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 12:07:57 +0000 |
commit | 988b28ec1a379d38f6ac9ed04886ee564fd447fd (patch) | |
tree | 9d93267209387e62d23ea7abf81ef9c0d64f2f0b /spec/support | |
parent | a325f3a104748ecc68df7c3d793940aa709a111f (diff) | |
download | gitlab-ce-988b28ec1a379d38f6ac9ed04886ee564fd447fd.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support')
-rw-r--r-- | spec/support/helpers/wait_for_requests.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/helpers/wait_for_requests.rb b/spec/support/helpers/wait_for_requests.rb index d5483d0b0a7..52d1c59ab03 100644 --- a/spec/support/helpers/wait_for_requests.rb +++ b/spec/support/helpers/wait_for_requests.rb @@ -34,14 +34,14 @@ module WaitForRequests # Wait for active Rack requests and client-side AJAX requests def wait_for_all_requests wait_for('pending requests complete') do - finished_all_rack_reqiests? && + finished_all_rack_requests? && finished_all_js_requests? end end private - def finished_all_rack_reqiests? + def finished_all_rack_requests? Gitlab::Testing::RequestBlockerMiddleware.num_active_requests.zero? end |