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

Explicitly enable webmock in spinach env See merge request gitlab-org/gitlab-ce!16346

Merge branch 'dz-fix-webmock' into 'master'
acd171d1 · Stan Hu · a3904da9 · cb8ab6b5 · acd171d1
Commit acd171d1 authored Jan 10, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

env.rb features/support/env.rb +3 -3

No files found.
--- 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