From aac1e8181cb2e33d16c7bb91af3fc69d4e847b91 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Thu, 15 Jun 2017 16:46:18 -0700 Subject: Wait for all Ajax and Vue requests to complete in JavaScript tests From logs in #33756, we that it's possible for an Ajax call to be made before the middleware receives it. To prevent stray Ajax calls from breaking other specs, we need to wait for all scheduled calls to finish. Closes #33756 --- spec/support/wait_for_requests.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/support/wait_for_requests.rb b/spec/support/wait_for_requests.rb index 05ec9026141..ebdc62e4bca 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! -- cgit v1.2.1