Fix spec regressions

Author: stevehook

spec/features/mmr_already_had_spec.rb

@@ -321,12 +321,16 @@ def and_the_dose_number_is_second
   end
 
   def and_the_performed_at_date_and_time_are_set
-    expect(page).to have_content("Date#{@vaccination_date.strftime('%-d %B %Y')}")
+    expect(page).to have_content(
+      "Date#{@vaccination_date.strftime("%-d %B %Y")}"
+    )
     expect(page).to have_content("Time12:30")
   end
 
   def and_the_performed_at_date_only_is_set
-    expect(page).to have_content("Date#{@vaccination_date.strftime('%-d %B %Y')}")
+    expect(page).to have_content(
+      "Date#{@vaccination_date.strftime("%-d %B %Y")}"
+    )
   end
 
   def and_the_consent_requests_are_sent

spec/helpers/vaccination_records_helper_spec.rb

@@ -10,39 +10,80 @@
     let(:session) { create(:session, :today, team:, programmes: [programme]) }
     let(:patient) { build(:patient, id: 123) }
 
-    context "on the MMR programme" do
-      let(:programme) { Programme.mmr }
+    context "with the `already_vaccinated` feature flag enabled" do
+      before { Flipper.enable(:already_vaccinated) }
 
-      context "when patient has NOT had their first dose" do
-        it { should eq("Record 1st dose as already given") }
-      end
+      context "on the MMR programme" do
+        let(:programme) { Programme.mmr }
 
-      context "when patient has had their first dose" do
-        let(:patient) do
-          build(
-            :patient,
-            :consent_no_response,
-            id: 123,
-            programmes: [Programme.mmr]
-          )
+        context "when patient has NOT had their first dose" do
+          it { should eq("Record 1st dose as already given") }
         end
 
-        before do
-          patient.programme_status(
-            programme,
-            academic_year: AcademicYear.current
-          ).dose_sequence =
-            2
+        context "when patient has had their first dose" do
+          let(:patient) do
+            build(
+              :patient,
+              :consent_no_response,
+              id: 123,
+              programmes: [Programme.mmr]
+            )
+          end
+
+          before do
+            patient.programme_status(
+              programme,
+              academic_year: AcademicYear.current
+            ).dose_sequence =
+              2
+          end
+
+          it { should eq("Record 2nd dose as already given") }
         end
+      end
 
-        it { should eq("Record 2nd dose as already given") }
+      context "on the flu programme" do
+        let(:programme) { Programme.flu }
+
+        it { should eq("Record as already vaccinated") }
       end
     end
 
-    context "on the flu programme" do
-      let(:programme) { Programme.flu }
+    context "with the `already_vaccinated` feature flag disabled" do
+      context "on the MMR programme" do
+        let(:programme) { Programme.mmr }
+
+        context "when patient has NOT had their first dose" do
+          it { should eq("Record as already vaccinated") }
+        end
+
+        context "when patient has had their first dose" do
+          let(:patient) do
+            build(
+              :patient,
+              :consent_no_response,
+              id: 123,
+              programmes: [Programme.mmr]
+            )
+          end
+
+          before do
+            patient.programme_status(
+              programme,
+              academic_year: AcademicYear.current
+            ).dose_sequence =
+              2
+          end
 
-      it { should eq("Record as already vaccinated") }
+          it { should eq("Record as already vaccinated") }
+        end
+      end
+
+      context "on the flu programme" do
+        let(:programme) { Programme.flu }
+
+        it { should eq("Record as already vaccinated") }
+      end
     end
   end
 end

spec/models/draft_vaccination_record_spec.rb

@@ -12,7 +12,14 @@
 
   let(:programme) { Programme.hpv }
   let(:session) { create(:session, team:, programmes: [programme]) }
-  let(:patient) { create(:patient, :in_attendance, session:, date_of_birth: Date.new(2020, 8, 31)) }
+  let(:patient) do
+    create(
+      :patient,
+      :in_attendance,
+      session:,
+      date_of_birth: Date.new(2020, 8, 31)
+    )
+  end
 
   let(:vaccine) { programme.vaccines.first }
   let(:batch) { create(:batch, team:, vaccine:, expiry: Date.new(2026, 11, 1)) }
@@ -80,15 +87,24 @@
 
         it "has an error" do
           expect(draft_vaccination_record.save(context: :update)).to be(false)
-          expect(draft_vaccination_record.errors[:performed_at_date]).to include(
+          expect(
+            draft_vaccination_record.errors[:performed_at_date]
+          ).to include(
             "The vaccination cannot take place before 1 September 2024"
           )
         end
       end
     end
 
     context "when the record is national reporting" do
-      let(:team) { create(:team, :national_reporting, :with_one_nurse, programmes: [programme]) }
+      let(:team) do
+        create(
+          :team,
+          :national_reporting,
+          :with_one_nurse,
+          programmes: [programme]
+        )
+      end
       let(:attributes) do
         valid_administered_attributes.merge(
           performed_at: Time.zone.local(2023, 8, 31, 12),
@@ -104,7 +120,9 @@
 
         it "has an error" do
           expect(draft_vaccination_record.save(context: :update)).to be(false)
-          expect(draft_vaccination_record.errors[:performed_at_date]).to include(
+          expect(
+            draft_vaccination_record.errors[:performed_at_date]
+          ).to include(
             "The vaccination cannot take place before 1 September 2024"
           )
         end
@@ -126,12 +144,21 @@
 
         it "is valid" do
           expect(draft_vaccination_record.save(context: :update)).to be(true)
-          expect(draft_vaccination_record.errors[:performed_at_date]).to be_empty
+          expect(
+            draft_vaccination_record.errors[:performed_at_date]
+          ).to be_empty
         end
       end
 
       context "when performed_at is before patient date of birth" do
-        let(:patient) { create(:patient, :in_attendance, session:, date_of_birth: Date.new(2020, 8, 31)) }
+        let(:patient) do
+          create(
+            :patient,
+            :in_attendance,
+            session:,
+            date_of_birth: Date.new(2020, 8, 31)
+          )
+        end
         let(:attributes) do
           valid_administered_attributes.merge(
             performed_at: Time.zone.local(2020, 8, 30, 12),
@@ -145,7 +172,9 @@
 
         it "has an error" do
           expect(draft_vaccination_record.save(context: :update)).to be(false)
-          expect(draft_vaccination_record.errors[:performed_at_date]).to include(
+          expect(
+            draft_vaccination_record.errors[:performed_at_date]
+          ).to include(
             "The vaccination cannot take place before 31 August 2020"
           )
         end