Merge branch 'main' of github.com:NHSDigital/bcss-playwright into feature/BCSS-21168-repo-improvements

# Conflicts:
#	utils/oracle/subject_creation_util.py

Author: adrianoaru-nhs

.gitleaksignore

@@ -224,5 +224,6 @@ cd9c0efec38c5d63053dd865e5d4e207c0760d91:docs/guides/Perform_static_analysis.md:
 cae84544e2852202f5d0abb9ad18f9d83a0c6d80:subject_criteria_builder/criteria.json:generic-api-key:4210
 203cd8811be75d33859eb7c7cc8a48beb5a2b8b2:subject_criteria_builder/criteria.json:generic-api-key:4210
 60468a7d6f3ff3259616757be85d6f07e62d00b6:subject_criteria_builder/criteria.json:generic-api-key:4210
+145171b9e9d169acb136fc527708c997c9ad9f61:subject_criteria_builder/criteria.json:generic-api-key:4210
 2ccb5e91033934d4818c1efa2eb1696b5511ebc9:subject_criteria_builder/criteria.json:generic-api-key:4210
 145171b9e9d169acb136fc527708c997c9ad9f61:subject_criteria_builder/criteria.json:generic-api-key:4210

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_3.py

@@ -254,7 +254,7 @@ def test_scenario_3(page: Page) -> None:
     SubjectScreeningSummaryPage(page).click_first_fobt_episode_link()
 
     # And I view the latest practitioner appointment in the subject's episode
-    EpisodeEventsAndNotesPage(page).click_view_appointment_link()
+    EpisodeEventsAndNotesPage(page).click_most_recent_view_appointment_link()
 
     # And The Screening Centre cancels the practitioner appointment with reason "Screening Centre Cancelled - Other Reason"
     AppointmentDetailPage(page).check_cancel_radio()
@@ -482,7 +482,7 @@ def cancel_appointment_and_processes_batches(page: Page, nhs_no: str) -> None:
     SubjectScreeningSummaryPage(page).click_first_fobt_episode_link()
 
     # And I view the latest practitioner appointment in the subject's episode
-    EpisodeEventsAndNotesPage(page).click_view_appointment_link()
+    EpisodeEventsAndNotesPage(page).click_most_recent_view_appointment_link()
 
     # And The subject cancels the practitioner appointment with reason "Patient Cancelled to Consider"
     AppointmentDetailPage(page).check_cancel_radio()

tests/regression/regression_tests/fobt_regression_tests/test_scenario_4.py

@@ -332,7 +332,7 @@ def test_scenario_4(page: Page) -> None:
     SubjectScreeningSummaryPage(page).click_first_fobt_episode_link()
 
     # And I view the latest practitioner appointment in the subject's episode
-    EpisodeEventsAndNotesPage(page).click_view_appointment_link()
+    EpisodeEventsAndNotesPage(page).click_most_recent_view_appointment_link()
 
     # And the subject cancels the practitioner appointment with reason "Patient Cancelled to Consider"
     AppointmentDetailPage(page).check_cancel_radio()
@@ -412,7 +412,7 @@ def test_scenario_4(page: Page) -> None:
     SubjectScreeningSummaryPage(page).click_first_fobt_episode_link()
 
     # And I view the latest practitioner appointment in the subject's episode
-    EpisodeEventsAndNotesPage(page).click_view_appointment_link()
+    EpisodeEventsAndNotesPage(page).click_most_recent_view_appointment_link()
 
     # And the subject cancels the practitioner appointment with reason "Patient Unsuitable - Recently Screened"
     AppointmentDetailPage(page).check_cancel_radio()