diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-06-15 19:54:09 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-06-15 19:54:09 -0700 |
| commit | fdf78bb9c71c6b3119a054adeec2bb1c55b46284 (patch) | |
| tree | 0499c867bfc3ca384d1c3777ed261c8181cfbc83 | |
| parent | 806ffd2cec8beedd84351bd383bd4ab9906fc7ab (diff) | |
| download | gitlab-ce-sh-fix-issue-33756.tar.gz | |
Avoid including Capybara::DSL to conflict with definition of pagesh-fix-issue-33756
| -rw-r--r-- | spec/support/wait_for_requests.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/spec/support/wait_for_requests.rb b/spec/support/wait_for_requests.rb index 4712ecc658c..1cbe609c0e0 100644 --- a/spec/support/wait_for_requests.rb +++ b/spec/support/wait_for_requests.rb @@ -3,8 +3,6 @@ require_relative './wait_for_requests' module WaitForRequests extend self - include Capybara::DSL - # This is inspired by http://www.salsify.com/blog/engineering/tearing-capybara-ajax-tests def block_and_wait_for_requests_complete Gitlab::Testing::RequestBlockerMiddleware.block_requests! @@ -42,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? |