Merge branch 'feature/BCSS-22016-surveillanceregressiontests-scenario-4' into feature/BCSS-22017-surveillanceregressiontests-scenario-5

Author: mepr1

pages/datasets/subject_datasets_page.py

@@ -1,4 +1,4 @@
-from playwright.sync_api import Page, expect
+from playwright.sync_api import Page, expect, Locator
 from pages.base_page import BasePage
 
 
@@ -24,20 +24,36 @@ def __init__(self, page: Page):
         self.add_link = self.page.get_by_role("link", name="Add")
 
     def click_add_link(self) -> None:
-        """Clicks on the 'Add' link on the Subject Datasets Page."""
-        self.click(self.add_link)
+        """Clicks on the first 'Add' link on the Subject Datasets Page."""
+        self.click(self.add_link.first)
 
     def click_colonoscopy_show_datasets(self) -> None:
-        """Clicks on the 'Show Dataset' button for the Colonoscopy Assessment row on the Subject Datasets Page."""
-        self.click(self.colonoscopy_show_dataset_button)
+        """
+        Clicks on the 'Show Dataset(s)' button for the Colonoscopy Assessment row on the Subject Datasets Page.
+        If the button text is "Show Datasets", also clicks the first 'Add' link.
+        """
+        # Find the DatasetHeader div with Investigation
+        header = self.page.locator(
+            "div.DatasetHeader h4:has-text('Colonoscopy Assessment')"
+        )
+        self.click_show_datasets_button(header)
 
     def click_investigation_show_datasets(self) -> None:
         """
         Clicks on the 'Show Dataset(s)' link for the Investigation row on the Subject Datasets Page.
-        If the button text is "Show Datasets", also clicks the 'Add' link.
+        If the button text is "Show Datasets", also clicks the first 'Add' link.
         """
         # Find the DatasetHeader div with Investigation
         header = self.page.locator("div.DatasetHeader h4:has-text('Investigation')")
+        self.click_show_datasets_button(header)
+
+    def click_show_datasets_button(self, header: Locator) -> None:
+        """
+        Clicks on the 'Show Dataset(s)' link for the specified header.
+        If the button text is "Show Datasets", also clicks the first 'Add' link.
+        Args:
+            header (Locator): The Locator for the DatasetHeader h4 element.
+        """
         header.wait_for(state="visible", timeout=10000)
         # Get the dataset count text from the span inside the h4
         dataset_count_text = header.locator("span.DatasetSubLabel").text_content()
@@ -49,7 +65,7 @@ def click_investigation_show_datasets(self) -> None:
         show_link.wait_for(state="visible", timeout=10000)
         self.click(show_link)
         # If plural, also click Add
-        if dataset_count_text and "2 Datasets" in dataset_count_text:
+        if dataset_count_text and "Datasets" in dataset_count_text:
             self.click_add_link()
 
     def check_investigation_dataset_complete(self) -> None:

pages/screening_subject_search/advance_surveillance_episode_page.py

@@ -21,6 +21,13 @@ def __init__(self, page: Page):
                 name="Discharge from Screening and Surveillance - Clinical Decision",
             )
         )
+        self.discharge_from_screening_and_surveillance_patient_choice_button = (
+            self.page.get_by_role(
+                "button",
+                name="Discharge from Screening and Surveillance - Patient Choice",
+            )
+        )
+
         self.book_surveillance_appointment_button = self.page.get_by_role(
             "button", name="Book Surveillance Appointment"
         )
@@ -41,6 +48,12 @@ def click_discharge_from_screening_and_surveillance_clinical_decision_button(
             self.discharge_from_screening_and_surveillance_clinical_decision_button
         )
 
+    def click_discharge_from_screening_and_surveillance_patient_choice_button(
+        self,
+    ) -> None:
+        """Click on the 'Discharge from Screening and Surveillance - Patient Choice' button."""
+        self.click(self.discharge_from_screening_and_surveillance_patient_choice_button)
+
     def click_book_surveillance_appointment_button(self) -> None:
         """Click on the 'Book Surveillance Appointment' button."""
         self.safe_accept_dialog(self.book_surveillance_appointment_button)