Reset Webmock for each test

spec/controllers/admin/case_logs_controller_spec.rb

@@ -3,10 +3,6 @@ require_relative "../../support/devise"
 require_relative "../../request_helper"
 
 describe Admin::CaseLogsController, type: :controller do
-  before do
-    RequestHelper.stub_http_requests
-  end
-
   render_views
   let(:page) { Capybara::Node::Simple.new(response.body) }
   let(:resource_title) { "Logs" }

spec/controllers/admin/dashboard_controller_spec.rb

@@ -3,10 +3,6 @@ require_relative "../../support/devise"
 require_relative "../../request_helper"
 
 describe Admin::DashboardController, type: :controller do
-  before do
-    RequestHelper.stub_http_requests
-  end
-
   render_views
   let(:page) { Capybara::Node::Simple.new(response.body) }
   let(:resource_title) { "Dashboard" }

spec/features/form/accessible_autocomplete_spec.rb

@@ -15,7 +15,6 @@ RSpec.describe "Accessible Automcomplete" do
   end
 
   before do
-    RequestHelper.stub_http_requests
     sign_in user
   end
 

spec/features/form/check_answers_page_spec.rb

@@ -33,7 +33,6 @@ RSpec.describe "Form Check Answers Page" do
   let(:id) { case_log.id }
 
   before do
-    RequestHelper.stub_http_requests
     sign_in user
   end
 

spec/features/form/conditional_questions_spec.rb

@@ -16,7 +16,6 @@ RSpec.describe "Form Conditional Questions" do
   let(:id) { case_log.id }
 
   before do
-    RequestHelper.stub_http_requests
     sign_in user
   end
 

spec/features/form/form_navigation_spec.rb

@@ -24,7 +24,6 @@ RSpec.describe "Form Navigation" do
   end
 
   before do
-    RequestHelper.stub_http_requests
     sign_in user
   end
 

spec/features/form/page_routing_spec.rb

@@ -17,7 +17,6 @@ RSpec.describe "Form Page Routing" do
   let(:validator) { case_log._validators[nil].first }
 
   before do
-    RequestHelper.stub_http_requests
     allow(validator).to receive(:validate_pregnancy).and_return(true)
     sign_in user
   end

spec/features/form/progressive_total_field_spec.rb

@@ -15,7 +15,6 @@ RSpec.describe "Accessible Automcomplete" do
   end
 
   before do
-    RequestHelper.stub_http_requests
     sign_in user
   end
 

spec/features/form/saving_data_spec.rb

@@ -32,7 +32,6 @@ RSpec.describe "Form Saving Data" do
   end
 
   before do
-    RequestHelper.stub_http_requests
     sign_in user
   end
 

spec/features/form/validations_spec.rb

@@ -4,7 +4,6 @@ require_relative "../../request_helper"
 
 RSpec.describe "validations" do
   before do
-    RequestHelper.stub_http_requests
     sign_in user
   end
 

spec/helpers/form_page_error_helper_spec.rb

@@ -2,10 +2,6 @@ require "rails_helper"
 require_relative "../request_helper"
 
 RSpec.describe FormPageErrorHelper do
-  before do
-    RequestHelper.stub_http_requests
-  end
-
   describe "#remove_other_page_errors" do
     context "when non base other questions are removed" do
       let!(:case_log) { FactoryBot.create(:case_log, :in_progress) }

spec/helpers/tasklist_helper_spec.rb

@@ -2,10 +2,6 @@ require "rails_helper"
 require_relative "../request_helper"
 
 RSpec.describe TasklistHelper do
-  before do
-    RequestHelper.stub_http_requests
-  end
-
   let(:empty_case_log) { FactoryBot.create(:case_log) }
   let(:case_log) { FactoryBot.create(:case_log, :in_progress) }
 

spec/models/case_log_spec.rb

@@ -5,10 +5,6 @@ RSpec.describe CaseLog do
   let(:owning_organisation) { FactoryBot.create(:organisation) }
   let(:managing_organisation) { owning_organisation }
 
-  before do
-    RequestHelper.stub_http_requests
-  end
-
   describe "#form" do
     let(:case_log) { FactoryBot.build(:case_log) }
     let(:case_log_2) { FactoryBot.build(:case_log, startdate: Time.zone.local(2022, 1, 1)) }

spec/models/organisation_spec.rb

@@ -2,10 +2,6 @@ require "rails_helper"
 require_relative "../request_helper"
 
 RSpec.describe Organisation, type: :model do
-  before do
-    RequestHelper.stub_http_requests
-  end
-
   describe "#new" do
     let(:user) { FactoryBot.create(:user) }
     let(:organisation) { user.organisation }

spec/models/user_spec.rb

@@ -2,10 +2,6 @@ require "rails_helper"
 require_relative "../request_helper"
 
 RSpec.describe User, type: :model do
-  before do
-    RequestHelper.stub_http_requests
-  end
-
   describe "#new" do
     let(:user) { FactoryBot.create(:user) }
     let(:other_organisation) { FactoryBot.create(:organisation) }

spec/request_helper.rb

@@ -1,7 +1,5 @@
 require "webmock/rspec"
 
-WebMock.disable_net_connect!(allow_localhost: true)
-
 module RequestHelper
   def self.stub_http_requests
     WebMock.stub_request(:get, /api.postcodes.io/)
@@ -9,4 +7,8 @@ module RequestHelper
     WebMock.stub_request(:post, /api.notifications.service.gov.uk\/v2\/notifications\/email/)
       .to_return(status: 200, body: "", headers: {})
   end
+
+  def self.real_http_requests
+    WebMock.allow_net_connect!
+  end
 end

spec/requests/case_logs_controller_spec.rb

@@ -20,7 +20,6 @@ RSpec.describe CaseLogsController, type: :request do
   end
 
   before do
-    RequestHelper.stub_http_requests
     allow(ENV).to receive(:[])
     allow(ENV).to receive(:[]).with("API_USER").and_return(api_username)
     allow(ENV).to receive(:[]).with("API_KEY").and_return(api_password)
@@ -139,7 +138,6 @@ RSpec.describe CaseLogsController, type: :request do
       let(:headers) { { "Accept" => "text/html" } }
 
       before do
-        RequestHelper.stub_http_requests
         sign_in user
         get "/logs", headers: headers, params: {}
       end

spec/requests/soft_validations_controller_spec.rb

@@ -6,10 +6,6 @@ RSpec.describe SoftValidationsController, type: :request do
   let(:url) { "/logs/#{case_log.id}/net-income/soft-validations" }
   let(:user) { FactoryBot.create(:user) }
 
-  before do
-    RequestHelper.stub_http_requests
-  end
-
   context "when a user is not signed in" do
     let(:case_log) { FactoryBot.create(:case_log, :in_progress) }
 

spec/spec_helper.rb

@@ -16,6 +16,7 @@
 
 require "factory_bot"
 require "simplecov"
+require "request_helper"
 
 SimpleCov.start "rails" do
   add_filter "/bin/"
@@ -108,4 +109,7 @@ RSpec.configure do |config|
   #   Kernel.srand config.seed
 
   config.include FactoryBot::Syntax::Methods
+
+  config.before { RequestHelper.stub_http_requests }
+  config.after { RequestHelper.real_http_requests }
 end

spec/views/case_log_index_view_spec.rb

@@ -2,10 +2,6 @@ require "rails_helper"
 require_relative "../request_helper"
 
 RSpec.describe "case_logs/index" do
-  before do
-    RequestHelper.stub_http_requests
-  end
-
   let(:in_progress_log) { FactoryBot.create(:case_log, :in_progress) }
   let(:completed_log) { FactoryBot.create(:case_log, :completed) }
 

spec/views/form/page_view_spec.rb

@@ -1,5 +1,4 @@
 require "rails_helper"
-require_relative "../../request_helper"
 
 RSpec.describe "form/page" do
   let(:case_log) { FactoryBot.create(:case_log, :in_progress) }
@@ -19,7 +18,6 @@ RSpec.describe "form/page" do
   end
 
   before do
-    RequestHelper.stub_http_requests
     assign(:case_log, case_log)
     assign(:page, page)
     assign(:subsection, subsection)