Updated ColonoscopyDatasetsPage

Added methods to AdvanceFOBTScreeningEpisodePage
Updated scenario 3 and 6, and test compartment 5 to use new implementation of FitForColonoscopySspOptions
Bug fix for SubjectSelectionQueryBuilder
wip for scenario 6

Author: Andyg79

pages/datasets/colonoscopy_dataset_page.py

@@ -3,6 +3,12 @@
 from enum import Enum
 
 
+class FitForColonoscopySspOptions(Enum):
+    YES = "17058"
+    NO = "17059"
+    UNABLE_TO_ASSESS = "17954"
+
+
 class ColonoscopyDatasetsPage(BasePage):
     """Colonoscopy Datasets Page locators, and methods for interacting with the page"""
 
@@ -44,16 +50,19 @@ def select_asa_grade_option(self, option: str) -> None:
         """
         self.select_asa_grade_dropdown.select_option(option)
 
-    def select_fit_for_colonoscopy_option(self, option: str) -> None:
+    def select_fit_for_colonoscopy_option(
+        self, option: FitForColonoscopySspOptions
+    ) -> None:
         """
-        This method is designed to select a specific option from the colonoscopy dataset page, Fit for Colonoscopy (SSP) dropdown menu.
+        Selects a specific option from the 'Fit for Colonoscopy (SSP)' dropdown.
+
         Args:
-            option (str): The option to be selected. This should be a string that matches one of the available options in the dropdown menu.
-                Valid options are: "YES", "NO", or "UNABLE_TO_ASSESS".
+            option (FitForColonoscopySspOptions): Enum member representing the desired option.
+
         Returns:
             None
         """
-        self.select_fit_for_colonoscopy_dropdown.select_option(option)
+        self.select_fit_for_colonoscopy_dropdown.select_option(option.value)
 
     def click_dataset_complete_radio_button_yes(self) -> None:
         """Clicks the 'Yes' radio button for the dataset complete option."""
@@ -72,9 +81,3 @@ class AsaGradeOptions(Enum):
     MORIBUND = "17013"
     NOT_APPLICABLE = "17014"
     NOT_KNOWN = "17015"
-
-
-class FitForColonoscopySspOptions(Enum):
-    YES = "17058"
-    NO = "17059"
-    UNABLE_TO_ASSESS = "17954"

pages/screening_subject_search/advance_fobt_screening_episode_page.py

@@ -17,7 +17,9 @@ def __init__(self, page: Page):
         self.calendar_button = self.page.get_by_role("button", name="Calendar")
         self.test_type_dropdown = self.page.locator("#UI_EXT_TEST_TYPE_2233")
         self.test_type_dropdown_2 = self.page.locator("#UI_EXT_TEST_TYPE_4325")
-        self.advance_checkbox = self.page.get_by_label("There are some events available which should only be used in exceptional circumstances. If you wish to see them, check this box")
+        self.advance_checkbox = self.page.get_by_label(
+            "There are some events available which should only be used in exceptional circumstances. If you wish to see them, check this box"
+        )
         self.invite_for_diagnostic_test_button = self.page.get_by_role(
             "button", name="Invite for Diagnostic Test >>"
         )
@@ -42,6 +44,14 @@ def __init__(self, page: Page):
         self.record_contact_with_patient_button = self.page.get_by_role(
             "button", name="Record Contact with Patient"
         )
+        self.suitable_for_radiological_test_button = self.page.get_by_role(
+            "button", name="Suitable for Radiological Test"
+        )
+        self.decision_not_to_continue_with_diagnostic_test_button = (
+            self.page.get_by_role(
+                "button", name="Decision not to Continue with Diagnostic Test"
+            )
+        )
 
     def click_suitable_for_endoscopic_test_button(self) -> None:
         """Click the 'Suitable for Endoscopic Test' button."""
@@ -116,3 +126,15 @@ def click_record_contact_with_patient_button(self) -> None:
     def check_advance_checkbox(self) -> None:
         """Selects the 'Advance FOBT' checkbox"""
         self.advance_checkbox.check()
+
+    def click_suitable_for_radiological_test_button(self) -> None:
+        """Click the 'Suitable for Radiological Test' button."""
+        AdvanceFOBTScreeningEpisodePage(self.page).safe_accept_dialog(
+            self.suitable_for_radiological_test_button
+        )
+
+    def click_decision_not_to_continue_with_diagnostic_test(self) -> None:
+        """Click the 'Decision not to Continue with Diagnostic Test' button."""
+        AdvanceFOBTScreeningEpisodePage(self.page).safe_accept_dialog(
+            self.decision_not_to_continue_with_diagnostic_test_button
+        )

tests/regression/regression_tests/fobt_regression_tests/test_scenario_3.py

@@ -8,7 +8,6 @@
 from utils.batch_processing import batch_processing
 from utils.fit_kit import FitKitGeneration, FitKitLogged
 from utils import screening_subject_page_searcher
-from utils.calendar_picker import CalendarPicker
 from utils.sspi_change_steps import SSPIChangeSteps
 from utils.appointments import book_appointments
 from pages.base_page import BasePage
@@ -22,9 +21,6 @@
 from pages.screening_subject_search.advance_fobt_screening_episode_page import (
     AdvanceFOBTScreeningEpisodePage,
 )
-from pages.screening_practitioner_appointments.book_appointment_page import (
-    BookAppointmentPage,
-)
 from pages.screening_subject_search.record_diagnosis_date_page import (
     RecordDiagnosisDatePage,
 )