Merge branch 'main' of github.com:NHSDigital/bcss-playwright into feature/BCSS-20363-compartment-5-pom-advance-fobt-screening-episode-page

# Conflicts:
#	tests/smokescreen/test_compartment_5.py

Author: adrianoaru-nhs

pages/screening_subject_search/subject_screening_summary.py

@@ -48,6 +48,10 @@ def __init__(self, page: Page):
         self.first_fobt_episode_link = page.get_by_role(
             "link", name="FOBT Screening"
         ).first
+        self.datasets_link = self.page.get_by_role("link", name="Datasets")
+        self.advance_fobt_screening_episode_button = self.page.get_by_role(
+            "button", name="Advance FOBT Screening Episode"
+        )
 
     def verify_result_contains_text(self, text) -> None:
         expect(self.display_rs).to_contain_text(text)
@@ -122,6 +126,12 @@ def expand_episodes_list(self) -> None:
     def click_first_fobt_episode_link(self) -> None:
         self.click(self.first_fobt_episode_link)
 
+    def click_datasets_link(self) -> None:
+        self.click(self.datasets_link)
+
+    def click_advance_fobt_screening_episode_button(self) -> None:
+        self.click(self.advance_fobt_screening_episode_button)
+
 
 class ChangeScreeningStatusOptions(Enum):
     SEEKING_FURTHER_DATA = "4007"

tests/smokescreen/test_compartment_5.py

@@ -55,11 +55,11 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
 
     page.get_by_role("button", name="View appointments on this day").click()
     page.get_by_role("button", name="Calendar").click()
-    date_from_util = datetime(2025, 4, 28)
+    date_from_util = datetime(2025, 4, 29)
     CalendarPicker(page).v1_calender_picker(date_from_util)
 
     # Select subject from inital test data util
-    page.get_by_role("link", name="HAT-PIN UNTRUTH").click()
+    page.get_by_role("link", name="DELIRIOUS DELUXE").click()
 
     # Select Attendance radio button, tick Attended checkbox, set Attended Date to yesterday's (system) date and then press Save
     page.get_by_role("radio", name="Attendance").check()
@@ -72,13 +72,13 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
     # Repeat for x Abnormal  patients
 
     # Navigate to the 'Subject Screening Summary' screen for the 1st Abnormal patient
-    nhs_no = "9543076472"  # Test NHS NO for Scaliding Cod
+    nhs_no = "9937265193"  # Test NHS NO for Scaliding Cod
     verify_subject_event_status_by_nhs_no(
         page, nhs_no, "J10 - Attended Colonoscopy Assessment Appointment"
     )
 
     # Click on 'Datasets' link
-    page.get_by_role("link", name="Datasets").click()
+    SubjectScreeningSummary(page).click_datasets_link()
 
     # Click on 'Show Dataset' next to the Colonoscopy Assessment
 
@@ -103,7 +103,7 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
 
     # On the Subject Screening Summary click on the 'Advance FOBT Screening Episode' button and then click on the 'Suitable for Endoscopic Test' button
     # Click OK after message
-    page.get_by_role("button", name="Advance FOBT Screening Episode").click()
+    SubjectScreeningSummary(page).click_advance_fobt_screening_episode_button()
     AdvanceFOBTScreeningEpisode(page).click_suitable_for_escopic_test_button()
 
     # Enter a 'First Offered Appointment Date' (enter a date after the attended appt)
@@ -137,7 +137,7 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
     verify_subject_event_status_by_nhs_no(
         page, nhs_no, "A259 - Attended Diagnostic Test"
     )
-    page.get_by_role("button", name="Advance FOBT Screening Episode").click()
+    SubjectScreeningSummary(page).click_advance_fobt_screening_episode_button()
 
     # Click 'Other Post-investigation Contact Required' button
     # Click 'OK'