Addressing comments in #29

Author: adrianoaru-nhs

pages/base_page.py

@@ -176,12 +176,13 @@ def _accept_dialog(self, dialog: Dialog) -> None:
         try:
             dialog.accept()
         except Exception:
-            logging.info("Dialog already accepted")
+            logging.warning("Dialog already handled")
 
     def safe_accept_dialog(self, locator: Locator) -> None:
         """
-        This is used to accept dialogs multiple times without getting the error:
+        Safely accepts a dialog triggered by a click, avoiding the error:
         playwright._impl._errors.Error: Dialog.accept: Cannot accept dialog which is already handled!
+        If no dialog appears, continues without error.
         """
         self.page.once("dialog", self._accept_dialog)
         try:

tests/smokescreen/bcss_smokescreen_tests.properties

@@ -27,13 +27,10 @@
 #   compartment 4
 # ----------------------------------
     c4_eng_weeks_to_make_available = 6
-#    c4_eng_centre_name=Wolverhampton
-#    c4_eng_site_name=Royal Hospital
-#    c4_eng_practitioner_id=243
-#    c4_eng_practitioner_name=Arvind, Vanaja
-#    c4_eng_practitioner_name=Macarena, Gave  #use this for anonymised
-#    c4_eng_practitioner_id_for_rebooking=870
-#    c4_eng_practitioner_name_for_rebookings=Burns, Harriet
+    c4_eng_centre_name=BCS001 - Wolverhampton Bowel Cancer Screening Centre
+    c4_eng_site_name1=THE ROYAL HOSPITAL (WOLVERHAMPTON)
+    c4_eng_site_name2=The Royal Hospital (Wolverhampton)
+    c4_eng_practitioner_name=Astonish, Ethanol
 
 # ----------------------------------
 #   compartment 6

tests/smokescreen/test_compartment_4.py

@@ -55,17 +55,18 @@ def test_compartment_4(page: Page, smokescreen_properties: dict) -> None:
         smokescreen_properties["c4_eng_number_of_appointments_to_book"]
     )
 
-    logging.info("Compartment 4 - Setting up appointments")
-    logging.info("Logging in as Screening Centre Manager at BCS001")
+    logging.info(
+        f"Compartment 4 - Setting up appointments for {smokescreen_properties["c4_eng_weeks_to_make_available"]} Weeks"
+    )
     UserTools.user_login(page, "Screening Centre Manager at BCS001")
     BasePage(page).go_to_screening_practitioner_appointments_page()
     ScreeningPractitionerAppointmentsPage(page).go_to_set_availability_page()
     SetAvailabilityPage(page).go_to_practitioner_availability_page()
     PractitionerAvailabilityPage(page).select_site_dropdown_option(
-        "THE ROYAL HOSPITAL (WOLVERHAMPTON)"
+        smokescreen_properties["c4_eng_site_name1"]
     )
     PractitionerAvailabilityPage(page).select_practitioner_dropdown_option(
-        "Astonish, Ethanol"
+        smokescreen_properties["c4_eng_practitioner_name"]
     )
     PractitionerAvailabilityPage(page).click_calendar_button()
     CalendarPicker(page).select_day(datetime.today())
@@ -82,9 +83,10 @@ def test_compartment_4(page: Page, smokescreen_properties: dict) -> None:
     )
     Logout(page).log_out(close_page=False)
 
-    logging.info("Compartment 4 - Booking subjects to appointments")
+    logging.info(
+        f"Compartment 4 - Booking {smokescreen_properties["c4_eng_number_of_appointments_to_book"]} subjects to appointments"
+    )
     ScreeningPractitionerAppointmentsPage(page).go_to_log_in_page()
-    logging.info("Logging in as Hub Manager State Registered at BCS01")
     UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     BasePage(page).go_to_screening_practitioner_appointments_page()
@@ -100,12 +102,12 @@ def test_compartment_4(page: Page, smokescreen_properties: dict) -> None:
         ColonoscopyAssessmentAppointments(page).filter_by_nhs_number(nhs_number)
         ColonoscopyAssessmentAppointments(page).click_nhs_number_link(nhs_number_spaced)
         BookAppointmentPage(page).select_screening_centre_dropdown_option(
-            "BCS001 - Wolverhampton Bowel Cancer Screening Centre"
+            smokescreen_properties["c4_eng_centre_name"]
         )
         BookAppointmentPage(page).select_site_dropdown_option(
             [
-                "The Royal Hospital (Wolverhampton) (? km)",
-                "The Royal Hospital (Wolverhampton) (? km) (attended)",
+                f"{smokescreen_properties["c4_eng_site_name2"]} (? km)",
+                f"{smokescreen_properties["c4_eng_site_name2"]} (? km) (attended)",
             ]
         )
 

utils/batch_processing.py

@@ -98,7 +98,7 @@ def prepare_and_print_batch(page: Page, link_text) -> None:
     page.wait_for_timeout(
         1000
     )  # This one second timeout does not affect the time to execute, as it is just used to ensure the reprepare batch button is clicked and does not instantly advance to the next step
-    ManageActiveBatch(page).reprepare_batch_text.wait_for(timeout=100000)
+    ManageActiveBatch(page).reprepare_batch_text.wait_for(timeout=60000)
 
     # This loops through each Retrieve button and clicks each one
     retrieve_button_count = 0
@@ -124,7 +124,7 @@ def prepare_and_print_batch(page: Page, link_text) -> None:
             logging.info(
                 f"Clicking confirm printed button {confirm_printed_button + 1}"
             )
-            BasePage(page).safe_accept_dialog(
+            ManageActiveBatch(page).safe_accept_dialog(
                 ManageActiveBatch(page).confirm_button.nth(0)
             )
     except Exception as e:

utils/user_tools.py

@@ -24,6 +24,7 @@ def user_login(page: Page, username: str) -> None:
             page (playwright.sync_api.Page): The Playwright page object to interact with.
             username (str): Enter a username that exists in the users.json file.
         """
+        logging.info(f"Logging in as {username}")
         # Load dotenv to enable retrieval of a password from .env file
         load_dotenv()
         # Go to base url