Merge pull request #4109 from nhsuk/fix-consent-given-labels

Author: thomasleese

config/locales/en.yml

@@ -1,13 +1,5 @@
 en:
   activemodel:
-    attributes:
-      draft_consent:
-        responses:
-          given: Consent given
-          given_injection: Consent given
-          given_nasal: Consent given
-          not_provided: Not provided
-          refused: Consent refused
     errors:
       models:
         batch_form:
@@ -158,6 +150,8 @@ en:
           will_be_vaccinated_elsewhere: Vaccine will be given elsewhere
         responses:
           given: Consent given
+          given_injection: Consent given
+          given_nasal: Consent given
           not_provided: Not provided
           refused: Consent refused
         routes:

spec/features/verbal_consent_given_spec.rb

@@ -15,6 +15,19 @@
     and_i_can_see_the_consent_response_details
   end
 
+  scenario "Given flu injection" do
+    given_an_flu_programme_is_underway
+    and_i_am_signed_in
+
+    when_i_record_that_verbal_injection_consent_was_given
+    then_i_see_the_check_and_confirm_page
+    and_i_see_the_flu_injection_consent_given
+
+    when_i_confirm_the_consent_response
+    then_an_email_is_sent_to_the_parent_confirming_their_consent
+    and_a_text_is_sent_to_the_parent_confirming_their_consent
+  end
+
   scenario "Given flu nasal spray" do
     given_an_flu_programme_is_underway
     and_i_am_signed_in
@@ -71,6 +84,14 @@ def when_i_record_that_verbal_consent_was_given
     )
   end
 
+  def when_i_record_that_verbal_injection_consent_was_given
+    record_that_verbal_consent_was_given(
+      consent_option: "Yes, for the injected vaccine only",
+      number_of_health_questions: 4,
+      triage_option: "Yes, it’s safe to vaccinate with injected vaccine"
+    )
+  end
+
   def when_i_record_that_verbal_nasal_consent_was_given
     record_that_verbal_consent_was_given(
       consent_option: "Yes, for the nasal spray",
@@ -140,13 +161,17 @@ def then_i_see_the_check_and_confirm_page
     expect(page).to have_content(["Method", "By phone"].join)
   end
 
+  def and_i_see_the_flu_injection_consent_given
+    expect(page).to have_content("Consent givenInjection")
+  end
+
   def and_i_see_the_flu_nasal_consent_given
-    expect(page).to have_content("Given nasalNasal spray")
+    expect(page).to have_content("Consent givenNasal spray")
     expect(page).to have_content("Consent also given for injected vaccine?No")
   end
 
   def and_i_see_the_flu_nasal_and_injection_consent_given
-    expect(page).to have_content("Given nasalNasal spray")
+    expect(page).to have_content("Consent givenNasal spray")
     expect(page).to have_content("Consent also given for injected vaccine?Yes")
   end