diff options
author | Stan Hu <stanhu@gmail.com> | 2017-06-15 18:33:44 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2017-06-15 18:33:44 -0700 |
commit | 806ffd2cec8beedd84351bd383bd4ab9906fc7ab (patch) | |
tree | e3c721e0f2e80bd955030cc7dd697371352b9916 | |
parent | 619a792861fdd974bc4966ce8702bedbbd0d4a94 (diff) | |
download | gitlab-ce-806ffd2cec8beedd84351bd383bd4ab9906fc7ab.tar.gz |
Don't include Capybara::DSL in the global scope
-rw-r--r-- | features/support/env.rb | 1 | ||||
-rw-r--r-- | spec/support/wait_for_requests.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/features/support/env.rb b/features/support/env.rb index b46667cfc22..1690465d9b2 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -32,7 +32,6 @@ end Spinach.hooks.after_scenario do |scenario_data, step_definitions| if scenario_data.tags.include?('javascript') - include Capybara::DSL include WaitForRequests block_and_wait_for_requests_complete end diff --git a/spec/support/wait_for_requests.rb b/spec/support/wait_for_requests.rb index ebdc62e4bca..4712ecc658c 100644 --- a/spec/support/wait_for_requests.rb +++ b/spec/support/wait_for_requests.rb @@ -3,6 +3,8 @@ 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! |