From 8205ee6213e83b64fc43b3baf4fd262bb9b1daec Mon Sep 17 00:00:00 2001
From: baarkerlounger <db@slothlife.xyz>
Date: Wed, 2 Feb 2022 19:31:32 +0000
Subject: [PATCH] All cops pass

---
 .rubocop.yml                            |  4 ++--
 spec/features/form/page_routing_spec.rb |  3 ++-
 spec/requests/form_controller_spec.rb   | 11 +++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index cae659438..cf0c1e933 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,13 +1,13 @@
 require:
   - rubocop-performance
   - rubocop-rails
-#  - rubocop-rspec
+  - rubocop-rspec
 
 inherit_gem:
   rubocop-govuk:
     - config/default.yml
     - config/rails.yml
-#    - config/rspec.yml
+    - config/rspec.yml
 
 AllCops:
   Exclude:
diff --git a/spec/features/form/page_routing_spec.rb b/spec/features/form/page_routing_spec.rb
index ad63321d4..ed0bf8aa7 100644
--- a/spec/features/form/page_routing_spec.rb
+++ b/spec/features/form/page_routing_spec.rb
@@ -14,10 +14,11 @@ RSpec.describe "Form Page Routing" do
     )
   end
   let(:id) { case_log.id }
+  let(:validator) { case_log._validators[nil].first }
 
   before do
     RequestHelper.stub_http_requests
-    allow_any_instance_of(CaseLogValidator).to receive(:validate_pregnancy).and_return(true)
+    allow(validator).to receive(:validate_pregnancy).and_return(true)
     sign_in user
   end
 
diff --git a/spec/requests/form_controller_spec.rb b/spec/requests/form_controller_spec.rb
index 46439b4a3..3d77492b7 100644
--- a/spec/requests/form_controller_spec.rb
+++ b/spec/requests/form_controller_spec.rb
@@ -245,10 +245,7 @@ RSpec.describe FormController, type: :request do
       end
 
       context "with conditional routing" do
-        before do
-          allow_any_instance_of(CaseLogValidator).to receive(:validate_pregnancy).and_return(true)
-        end
-
+        let(:validator) { case_log._validators[nil].first }
         let(:case_log_form_conditional_question_yes_params) do
           {
             id: case_log.id,
@@ -258,7 +255,6 @@ RSpec.describe FormController, type: :request do
             },
           }
         end
-
         let(:case_log_form_conditional_question_no_params) do
           {
             id: case_log.id,
@@ -268,7 +264,6 @@ RSpec.describe FormController, type: :request do
             },
           }
         end
-
         let(:case_log_form_conditional_question_wchair_yes_params) do
           {
             id: case_log.id,
@@ -279,6 +274,10 @@ RSpec.describe FormController, type: :request do
           }
         end
 
+        before do
+          allow(validator).to receive(:validate_pregnancy).and_return(true)
+        end
+
         it "routes to the appropriate conditional page based on the question answer of the current page" do
           post "/logs/#{case_log.id}/form", params: case_log_form_conditional_question_yes_params
           expect(response).to redirect_to("/logs/#{case_log.id}/conditional-question-yes-page")