diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-19 11:50:12 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-19 11:50:12 +0000 |
| commit | 6cd5b7dbfaa4ff630ecbbfe351a1faac5fc71a8d (patch) | |
| tree | d3563b9f60936c18a02185e2e53b424bb1b83539 /spec/support | |
| parent | b3e0658cb1fbc7c8e7dd381467c656f2e675ee46 (diff) | |
| download | gitlab-ce-6cd5b7dbfaa4ff630ecbbfe351a1faac5fc71a8d.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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/support/helpers/wait_for_requests.rb b/spec/support/helpers/wait_for_requests.rb index 30dff1063b5..d5483d0b0a7 100644 --- a/spec/support/helpers/wait_for_requests.rb +++ b/spec/support/helpers/wait_for_requests.rb @@ -49,11 +49,11 @@ module WaitForRequests return true unless javascript_test? finished_all_ajax_requests? && - finished_all_vue_resource_requests? + finished_all_axios_requests? end - def finished_all_vue_resource_requests? - Capybara.page.evaluate_script('window.activeVueResources || 0').zero? + def finished_all_axios_requests? + Capybara.page.evaluate_script('window.pendingRequests || 0').zero? end def finished_all_ajax_requests? |