Addressing PR comments

Author: adrianoaru-nhs

pages/screening_practitioner_appointments/book_appointment_page.py

@@ -23,8 +23,10 @@ def __init__(self, page: Page):
         self.screening_practitioner_dropdown = self.page.locator("#UI_NEW_PRACTITIONER")
 
         self.appointment_cell_locators = self.page.locator("input.twoColumnCalendar")
-        self.available_background_colour = "rgb(102, 255, 153)"
-        self.some_available_background_colour = "rgb(255, 220, 144)"
+        self.appointment_fully_available_colour = "rgb(102, 255, 153)"  # Mint Green
+        self.appointment_partially_available_colour = (
+            "rgb(255, 220, 144)"  # Peach Orange
+        )
         self.appointment_date_input = self.page.locator("#UI_NEW_APPT_DATE")
         self.appointment_time_start_time_input = self.page.locator(
             "#UI_NEW_APPT_TIME_FROM"

pages/screening_subject_search/advance_fobt_screening_episode_page.py

@@ -16,7 +16,7 @@ def __init__(self, page: Page):
         )
         self.calendar_button = self.page.get_by_role("button", name="Calendar")
         self.test_type_dropdown = self.page.locator("[id^='UI_EXT_TEST_TYPE_']")
-        self.advance_checkbox = self.page.get_by_label(
+        self.advance_checkbox_label = 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(
@@ -46,7 +46,7 @@ def __init__(self, page: Page):
         self.amend_diagnosis_date_button = self.page.get_by_role(
             "button", name="Amend Diagnosis Date"
         )
-        self.advance_checkbox_v2 = self.page.get_by_role("checkbox")
+        self.advance_checkbox_label_v2 = self.page.get_by_role("checkbox")
         self.subsequent_assessment_appointment_required_dropdown = (
             self.page.get_by_role("combobox")
         )
@@ -72,11 +72,6 @@ def __init__(self, page: Page):
         self.cancel_diagnostic_test_button = self.page.get_by_role(
             "button", name="Cancel Diagnostic Test"
         )
-        self.waiting_decision_to_preceed_with_diagnostic_test_button = (
-            self.page.get_by_role(
-                "button", name="Waiting Decision to Proceed with Diagnostic Test"
-            )
-        )
         self.post_investigation_appointment_required_button = self.page.get_by_role(
             "button", name="Post-investigation Appointment Required"
         )
@@ -149,11 +144,11 @@ def click_record_contact_with_patient_button(self) -> None:
 
     def check_advance_checkbox(self) -> None:
         """Selects the 'Advance FOBT' checkbox"""
-        self.advance_checkbox.check()
+        self.advance_checkbox_label.check()
 
     def click_amend_diagnosis_date_button(self) -> None:
         """Checks the 'Advance FOBT' checkbox and clicks the 'Amend Diagnosis Date' button."""
-        self.advance_checkbox_v2.check()
+        self.advance_checkbox_label_v2.check()
         self.click(self.amend_diagnosis_date_button)
 
     def click_and_select_subsequent_assessment_appointment_required(
@@ -197,12 +192,6 @@ def click_cancel_diagnostic_test_button(self) -> None:
         """Click the 'Cancel Diagnostic Test' button."""
         self.safe_accept_dialog(self.cancel_diagnostic_test_button)
 
-    def click_waiting_decision_to_preceed_with_diagnostic_test_button(self) -> None:
-        """Click the 'Waiting Decision to Proceed with Diagnostic Test' button."""
-        self.safe_accept_dialog(
-            self.waiting_decision_to_preceed_with_diagnostic_test_button
-        )
-
     def click_post_investigation_appointment_required_button(self) -> None:
         """Click the 'Post-investigation Appointment Required' button."""
         self.safe_accept_dialog(self.post_investigation_appointment_required_button)

pages/screening_subject_search/contact_with_patient_page.py

@@ -151,7 +151,7 @@ def verify_contact_with_patient_page_is_displayed(self) -> None:
 
     def verify_outcome_select_options(self, options: list) -> None:
         """
-        Verifies that the 'Outcome' dropwdown contains the expected options.
+        Verifies that the 'Outcome' dropdown contains the expected options.
         Args:
             options (list): A list containing all of the expected options in the dropdown.
         Raises:

tests/regression/regression_tests/fobt_regression_tests/test_scenario_10.py

@@ -300,7 +300,7 @@ def test_scenario_10(page: Page) -> None:
     SubjectScreeningSummaryPage(page).click_advance_fobt_screening_episode_button()
     AdvanceFOBTScreeningEpisodePage(
         page
-    ).click_waiting_decision_to_preceed_with_diagnostic_test_button()
+    ).click_waiting_decision_to_proceed_with_diagnostic_test()
 
     # Then my subject has been updated as follows:
     AdvanceFOBTScreeningEpisodePage(page).verify_latest_event_status_value(

tests/regression/subject/episodes/datasets/investigation/endoscopy/polypcategories/test_setup.py

@@ -254,8 +254,8 @@ def setup_a99_status(page: Page, df: pd.DataFrame) -> pd.DataFrame:
             current_month_displayed,
             BookAppointmentPage(page).appointment_cell_locators,
             [
-                BookAppointmentPage(page).available_background_colour,
-                BookAppointmentPage(page).some_available_background_colour,
+                BookAppointmentPage(page).appointment_fully_available_colour,
+                BookAppointmentPage(page).appointment_partially_available_colour,
             ],
         )
         BookAppointmentPage(page).appointments_table.click_first_input_in_column(

tests/smokescreen/test_compartment_4.py

@@ -116,8 +116,8 @@ def test_compartment_4(page: Page, smokescreen_properties: dict) -> None:
             current_month_displayed,
             BookAppointmentPage(page).appointment_cell_locators,
             [
-                BookAppointmentPage(page).available_background_colour,
-                BookAppointmentPage(page).some_available_background_colour,
+                BookAppointmentPage(page).appointment_fully_available_colour,
+                BookAppointmentPage(page).appointment_partially_available_colour,
             ],
         )
         BookAppointmentPage(page).appointments_table.click_first_input_in_column(

utils/appointments.py

@@ -112,8 +112,8 @@ def book_appointments(page: Page, screening_centre: str, site: str) -> None:
         current_month_displayed,
         book_appointments_page.appointment_cell_locators,
         [
-            book_appointments_page.available_background_colour,
-            book_appointments_page.some_available_background_colour,
+            book_appointments_page.appointment_fully_available_colour,
+            book_appointments_page.appointment_partially_available_colour,
         ],
     )
     page.wait_for_timeout(500)  # Wait for the appointments to load

utils/datasets/investigation_datasets.py

@@ -253,7 +253,7 @@ def get_default_endoscopy_information() -> dict:
     }
 
 
-def get_normal_smokescreen_information() -> tuple:
+def get_normal_smokescreen_information() -> tuple[dict, dict, dict, dict, dict]:
     """
     Returns a tuple containing default information for a normal smokescreen investigation dataset.
     This includes general information, drug information, endoscopy information,