wip

Author: Andyg79

pages/screening_subject_search/episode_events_and_notes_page.py

@@ -9,16 +9,16 @@ def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
         # List of episode events and notes - page locators
-        self.view_appointment_link = self.page.get_by_role(
-            "link", name="View Appointment"
-        )
+        self.most_recent_view_appointment_link = self.page.get_by_role(
+            "link", name="View Appointment"
+        ).nth(0)
 
     def expected_episode_event_is_displayed(self, event_description: str) -> None:
         """Check if the expected episode event is displayed on the page."""
         expect(
             self.page.get_by_role("cell", name=event_description, exact=True)
         ).to_be_visible()
 
-    def click_view_appointment_link(self) -> None:
+    def click_most_recent_view_appointment_link(self) -> None:
         """Click the 'View Appointment' link"""
-        self.click(self.view_appointment_link)
+        self.click(self.most_recent_view_appointment_link)

tests/regression/regression_tests/fobt_regression_tests/test_scenario_5.py

@@ -242,7 +242,7 @@ def test_scenario_5(page: Page) -> None:
         page,
         "J11",
         "Practitioner Clinic 1st Appointment Non Attendance (Patient)",
-        "J27 Appointment Non-attendance Letter Sent (Patient)",
+        "J27 - Appointment Non-attendance Letter Sent (Patient)",
     )
 
     # When I view the subject
@@ -301,7 +301,7 @@ def test_scenario_5(page: Page) -> None:
         page,
         "A185",
         "Patient Discharge (Non Attendance of Practitioner Clinic)",
-        "A37 Patient Discharge Sent (Non-attendance at Colonoscopy Assessment Appointment)",
+        "A37 - Patient Discharge Sent (Non-attendance at Colonoscopy Assessment Appointment)",
     )
 
     # When I switch users to BCSS "England" as user role "Hub Manager"
@@ -316,7 +316,7 @@ def test_scenario_5(page: Page) -> None:
         page,
         "A37",
         "GP Discharge (Non Attendance of Practitioner Clinic)",
-        "P202 Waiting Completion of Outstanding Events",
+        "P202 - Waiting Completion of Outstanding Events",
     )
 
     # When I view the subject
@@ -351,7 +351,7 @@ def test_scenario_5(page: Page) -> None:
         page,
         "A183",
         "GP Result (Abnormal)",
-        "A166 GP Discharge Sent (No show for Colonoscopy Assessment Appointment)",
+        "A166 - GP Discharge Sent (No show for Colonoscopy Assessment Appointment)",
     )
 
     subject_assertion(

utils/appointments.py

@@ -160,7 +160,7 @@ def mark_appointment_as_dna(page: Page, non_attendance_reason: str) -> None:
     )
     subject_screening_summary_page.click_list_episodes()
     subject_screening_summary_page.click_view_events_link()
-    episode_events_and_notes_page.click_view_appointment_link()
+    episode_events_and_notes_page.click_most_recent_view_appointment_link()
     appointment_detail_page.check_attendance_radio()
     page.locator("#UI_NON_ATTENDANCE_REASON").select_option(label=non_attendance_reason)
     appointment_detail_page.click_save_button(accept_dialog=True)