diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-16 09:35:00 +0000 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-16 12:21:15 -0500 |
| commit | bb599f3970328375d01adaf2888eccca0665a223 (patch) | |
| tree | c08789ccd1c8d434c66574190ca8d0481e6a6564 | |
| parent | e066db394c93e64e8c68edd421d91bc419cbe564 (diff) | |
| download | gitlab-ce-9-3-stable-rc3.tar.gz | |
Merge branch 'sh-fix-issue-33756' into 'master'9-3-stable-rc3
Wait for all Ajax and Vue requests to complete in JavaScript tests
Closes #33756
See merge request !12203
| -rw-r--r-- | spec/support/wait_for_requests.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/support/wait_for_requests.rb b/spec/support/wait_for_requests.rb index 05ec9026141..1cbe609c0e0 100644 --- a/spec/support/wait_for_requests.rb +++ b/spec/support/wait_for_requests.rb @@ -7,7 +7,7 @@ module WaitForRequests def block_and_wait_for_requests_complete Gitlab::Testing::RequestBlockerMiddleware.block_requests! wait_for('pending requests complete') do - Gitlab::Testing::RequestBlockerMiddleware.num_active_requests.zero? + Gitlab::Testing::RequestBlockerMiddleware.num_active_requests.zero? && finished_all_requests? end ensure Gitlab::Testing::RequestBlockerMiddleware.allow_requests! @@ -40,13 +40,13 @@ module WaitForRequests end def finished_all_vue_resource_requests? - page.evaluate_script('window.activeVueResources || 0').zero? + Capybara.page.evaluate_script('window.activeVueResources || 0').zero? end def finished_all_ajax_requests? - return true if page.evaluate_script('typeof jQuery === "undefined"') + return true if Capybara.page.evaluate_script('typeof jQuery === "undefined"') - page.evaluate_script('jQuery.active').zero? + Capybara.page.evaluate_script('jQuery.active').zero? end def javascript_test? |