Merge branch 'main' into feature/BCSS-21320-fobtregressiontests-scenario-17

Author: mepr1

pages/screening_subject_search/advance_fobt_screening_episode_page.py

@@ -131,6 +131,11 @@ def __init__(self, page: Page):
                 name="Redirect to Establish Suitability for Diagnostic Tests",
             )
         )
+        self.redirect_to_establish_attendance_at_appointment_button = (
+            self.page.get_by_role(
+                "button", name="Redirect to Establish Attendance at Appointment"
+            )
+        )
         # Contact recording locators
         self.contact_direction_dropdown = self.page.get_by_label("Contact Direction")
         self.contact_made_between_dropdown = self.page.get_by_label(
@@ -485,3 +490,11 @@ def click_redirect_to_establish_suitability_for_diagnostic_tests_button(
         self.safe_accept_dialog(
             self.redirect_to_establish_suitability_for_diagnostic_tests_button
         )
+
+    def click_redirect_to_establish_attendance_at_appointment_button(
+        self,
+    ) -> None:
+        """Click the 'Redirect to Establish Attendance at Appointment' button"""
+        self.safe_accept_dialog(
+            self.redirect_to_establish_attendance_at_appointment_button
+        )

pages/screening_subject_search/contact_with_patient_page.py

@@ -128,6 +128,7 @@ def record_contact(self, outcome: str, patient_contacted: str = "Yes") -> None:
                 - 'Suitable for Radiological Test'
                 - 'Close Episode - Patient Choice'
                 - 'SSP Appointment Required'
+                - 'Close Episode with Existing result'
             patient_contacted (str): Indicates if the patient was contacted. Default is 'Yes'. Options include:
                 - 'Yes'
                 - 'No'

tests/regression/regression_tests/fobt_regression_tests/test_scenario_14.py

@@ -268,7 +268,7 @@ def test_scenario_14(page: Page) -> None:
         "latest episode diagnosis date reason": "Null",
         "latest episode has diagnosis date": "Yes",
         "latest episode includes event status": "A50 Diagnosis date recorded",
-        "latest event status": "A183 1st Colonoscopy Assessment Appointment Requested ",
+        "latest event status": "A183 1st Colonoscopy Assessment Appointment Requested",
     }
     subject_assertion(nhs_number=nhs_no, criteria=criteria)