Commit acd171d1 authored by Stan Hu's avatar Stan Hu

Merge branch 'dz-fix-webmock' into 'master'

Explicitly enable webmock in spinach env

See merge request gitlab-org/gitlab-ce!16346
parents a3904da9 cb8ab6b5
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment