From 806ffd2cec8beedd84351bd383bd4ab9906fc7ab Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 15 Jun 2017 18:33:44 -0700
Subject: [PATCH] Don't include Capybara::DSL in the global scope
---
features/support/env.rb | 1 -
spec/support/wait_for_requests.rb | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
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!
--
GitLab