diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-12 23:48:38 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-12 23:48:38 +0000 |
| commit | 040fc99177eb620db41940f0c36b731ed612708b (patch) | |
| tree | 7491aafba761fd472dd62fc4e2a1b0a518de79cc /spec | |
| parent | cec971b68388834f42749a9c0cb53e4d6c4fc096 (diff) | |
| parent | 718350dc9fbfea4836f0cfb2955d3d8653ba7901 (diff) | |
| download | gitlab-ce-040fc99177eb620db41940f0c36b731ed612708b.tar.gz | |
Merge branch 'dm-wait-for-requests' into 'master'
Wait for requests after each Spinach scenario instead of feature
See merge request !11349
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/support/wait_for_requests.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/spec/support/wait_for_requests.rb b/spec/support/wait_for_requests.rb index a18c8e03aa6..d41e83ae128 100644 --- a/spec/support/wait_for_requests.rb +++ b/spec/support/wait_for_requests.rb @@ -10,17 +10,12 @@ module WaitForRequests def wait_for_requests_complete Gitlab::Testing::RequestBlockerMiddleware.block_requests! wait_for('pending AJAX requests complete') do - Gitlab::Testing::RequestBlockerMiddleware.num_active_requests.zero? && - finished_all_requests? + Gitlab::Testing::RequestBlockerMiddleware.num_active_requests.zero? end ensure Gitlab::Testing::RequestBlockerMiddleware.allow_requests! end - def finished_all_requests? - finished_all_ajax_requests? && finished_all_vue_resource_requests? - end - # Waits until the passed block returns true def wait_for(condition_name, max_wait_time: Capybara.default_max_wait_time, polling_interval: 0.01) wait_until = Time.now + max_wait_time.seconds |