Addressing PR comments

Author: adrianoaru-nhs

conftest.py

@@ -116,29 +116,34 @@ def subjects_to_run_for(request: FixtureRequest) -> int:
 
 
 @pytest.fixture(scope="function")
-def setup_org_and_appointments(page: Page, request: FixtureRequest) -> None:
+def setup_org_and_appointments(
+    page: Page, request: FixtureRequest, general_properties: dict
+) -> None:
     """
     Ensures required org parameters and appointments are set up.
     Only runs once per day per environment, regardless of which test calls it.
 
     This fixture is designed to be used in tests that require a specific setup of the organisation and appointments.
+
     Example usage:
-        @pytest.mark.usefixtures("setup_org_and_appointments")
-        def test_my_function(page: Page):
-            # Your test code here
 
-        def test_my_function(page: Page, setup_org_and_appointments):
-            # Your test code here
+    @pytest.mark.usefixtures("setup_org_and_appointments")
+    def test_my_function(page: Page):
+        # Your test code here
+
+    def test_my_function(page: Page, setup_org_and_appointments):
+        # Your test code here
     """
-    param_12_set_correctly = check_parameter(12, "23162", "10")
-    param_28_set_correctly = check_parameter(28, "23162", "07:00")
-    param_29_set_correctly = check_parameter(29, "23162", "20:00")
+    org_id = general_properties["eng_screening_centre_id"]
+    param_12_set_correctly = check_parameter(12, org_id, "10")
+    param_28_set_correctly = check_parameter(28, org_id, "07:00")
+    param_29_set_correctly = check_parameter(29, org_id, "20:00")
     if not param_12_set_correctly:
-        set_org_parameter_value(12, "10", "23162")
+        set_org_parameter_value(12, "10", org_id)
     if not param_28_set_correctly:
-        set_org_parameter_value(28, "07:00", "23162")
+        set_org_parameter_value(28, "07:00", org_id)
     if not param_29_set_correctly:
-        set_org_parameter_value(29, "20:00", "23162")
+        set_org_parameter_value(29, "20:00", org_id)
 
     base_url = request.config.getoption("--base-url")
     fixture_name = "setup_org_and_appointments"

utils/appointments.py

@@ -29,12 +29,7 @@ def setup_appointments(page: Page, no_of_practitioners: int, max: bool = False)
     UserTools.user_login(page, "Screening Centre Manager at BCS001")
 
     if max:
-        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)"
-        )
+        go_to_appointments_page_and_select_site(page)
         total_practitioners = (
             PractitionerAvailabilityPage(page)
             .screening_practitioner_dropdown.locator("option")
@@ -46,12 +41,7 @@ def setup_appointments(page: Page, no_of_practitioners: int, max: bool = False)
     logging.info(f"Setting up appointments for {no_of_practitioners} practitioners")
     for index in range(no_of_practitioners):
         logging.info(f"Setting up appointments for practitioner {index + 1}")
-        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)"
-        )
+        go_to_appointments_page_and_select_site(page)
         PractitionerAvailabilityPage(
             page
         ).select_practitioner_dropdown_option_from_index(index + 1)
@@ -66,3 +56,18 @@ def setup_appointments(page: Page, no_of_practitioners: int, max: bool = False)
         logging.info(f"Appointments set for practitioner {index + 1} at BCS001")
         BasePage(page).click_main_menu_link()
     LogoutPage(page).log_out()
+
+
+def go_to_appointments_page_and_select_site(page: Page) -> None:
+    """
+    Navigate to the Screening Practitioner Appointments page.
+
+    Args:
+        page (Page): The Playwright page object.
+    """
+    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)"
+    )