Don't include Capybara::DSL in the global scope

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

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!