Merge pull request #851 from NHSDigital/adapt-mmrv-expectation

Use / expect MMR(V) when required

Author: jf-x-dev

mavis/test/constants.py

@@ -140,7 +140,7 @@ class Programme(StrEnum):
     FLU = "flu"
     HPV = "HPV"
     MENACWY = "MenACWY"
-    MMR = "MMR"
+    MMR = "MMR(V)"
     TD_IPV = "Td/IPV"
 
     @property

mavis/test/pages/online_consent_wizard_page.py

@@ -379,12 +379,14 @@ def check_final_consent_message(
         def programme_display(
             programme: Programme, consent_option: ConsentOption
         ) -> str:
-            if programme == Programme.FLU:
+            if programme is Programme.FLU:
                 return (
                     "injected flu"
                     if consent_option is ConsentOption.INJECTION
                     else "nasal spray flu"
                 )
+            if programme is Programme.MMR:
+                return "MMR"
             return str(programme)
 
         programmes_str = " and ".join(

mavis/test/pages/sessions/sessions_patient_page.py

@@ -111,7 +111,8 @@ def _select_tab(self, name: str) -> None:
 
     @step("Click on {1} tab")
     def click_programme_tab(self, programme: Programme) -> None:
-        self._select_tab(str(programme))
+        tab_name = "MMR" if programme is Programme.MMR else str(programme)
+        self._select_tab(tab_name)
 
     @step("Click on Update triage outcome")
     def click_update_triage_outcome(self) -> None:

mavis/test/pages/sessions/sessions_vaccination_wizard_page.py

@@ -1,7 +1,7 @@
 from playwright.sync_api import Page, expect
 
 from mavis.test.annotations import step
-from mavis.test.constants import MAVIS_NOTE_LENGTH_LIMIT
+from mavis.test.constants import MAVIS_NOTE_LENGTH_LIMIT, Programme
 from mavis.test.data_models import (
     Parent,
     VaccinationRecord,
@@ -81,7 +81,13 @@ def record_vaccination(
                 self.vaccination_notes.fill("Confirmation notes")
                 self.click_confirm_button()
 
+            expected_outcome = (
+                "MMR"
+                if vaccination_record.programme is Programme.MMR
+                else str(vaccination_record.programme)
+            )
+
             expect_alert_text(
                 self.page,
-                f"Vaccination outcome recorded for {vaccination_record.programme}",
+                f"Vaccination outcome recorded for {expected_outcome}",
             )