summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-01-10 11:45:11 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-01-10 16:45:10 +0200
commitcb8ab6b524114c89cff3cbfb5cdfe23cfe72f15b (patch)
treeff1b38d0fae4dd0d621fa6420323c34a63000643
parentbe623ef3c1a867d23e9625fe372c17fcad3c47ce (diff)
downloadgitlab-ce-cb8ab6b524114c89cff3cbfb5cdfe23cfe72f15b.tar.gz
Explicitly enable webmock in spinach env
-rw-r--r--features/support/env.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/features/support/env.rb b/features/support/env.rb
index 91a92314959..7f5b4c1c11b 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -10,14 +10,14 @@ if ENV['CI']
Knapsack::Adapters::SpinachAdapter.bind
end
-%w(select2_helper test_env repo_helpers wait_for_requests sidekiq project_forks_helper).each do |f|
+WebMock.enable!
+
+%w(select2_helper test_env repo_helpers wait_for_requests sidekiq project_forks_helper webmock).each do |f|
require Rails.root.join('spec', 'support', f)
end
Dir["#{Rails.root}/features/steps/shared/*.rb"].each { |file| require file }
-WebMock.allow_net_connect!
-
Spinach.hooks.before_run do
include RSpec::Mocks::ExampleMethods
RSpec::Mocks.setup