FixiSonarQube duplication in scenario 12

Merge branch 'main' of github.com:NHSDigital/bcss-playwright into feature/BCSS-21315-fobtregressiontests-scenario-12

Author: adrianoaru-nhs

pages/alerts/alerts_page.py

@@ -0,0 +1,16 @@
+from playwright.sync_api import Page
+from pages.base_page import BasePage
+
+
+class AlertsPage(BasePage):
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.refresh_alerts_link = self.page.get_by_role("link", name="Refresh alerts")
+
+    def click_refresh_alerts(self) -> None:
+        """Clicks the 'Refresh Alerts' link to trigger an update of alert messages."""
+        self.refresh_alerts_link.click()
+
+    def is_refresh_alerts_visible(self, timeout=5000) -> bool:
+        """Returns True if the 'Refresh Alerts' link is visible within the given timeout."""
+        return self.refresh_alerts_link.is_visible(timeout=timeout)

pages/gfobt_test_kits/gfobt_test_kits_page.py

@@ -8,7 +8,7 @@ class GFOBTTestKitsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-
+        self.test_kits_header = self.page.get_by_text("gFOBT Test Kits")
         self.test_kit_logging_page = self.page.get_by_role(
             "link", name="Test Kit Logging"
         )
@@ -35,3 +35,9 @@ def go_to_test_kit_result_page(self) -> None:
     def go_to_create_qc_kit_page(self) -> None:
         """Navigate to the Create QC Kit page."""
         self.click(self.create_qc_kit_page)
+
+    def open_test_kits_report(self) -> None:
+        """Clicks the 'Test Kits' header to open the corresponding report section."""
+        self.click(self.test_kits_header)
+
+

pages/organisations/organisations_page.py

@@ -2,11 +2,29 @@
 from pages.base_page import BasePage
 from typing import List
 
+
 class OrganisationsPage(BasePage):
     """Organisations Page locators, and methods for interacting with the page."""
 
     def __init__(self, page: Page):
         super().__init__(page)
+        self.page = page
+        self.org_and_site_details_link = self.page.get_by_role(
+            "link", name="Organisation and Site Details"
+        )
+        self.list_all_orgs_link = self.page.get_by_role(
+            "link", name="List All Organisations"
+        )
+        self.list_all_sites_link = self.page.get_by_role("link", name="List All Sites")
+        self.surveillance_link = self.page.get_by_role(
+            "link", name="Surveillance", exact=True
+        )
+        self.manage_surveillance_review_link = self.page.get_by_role(
+            "link", name="Manage Surveillance Review"
+        )
+        self.surveillance_review_summary_header = self.page.get_by_text(
+            "Surveillance Review Summary"
+        )
 
         # Organisations page links
         self.screening_centre_parameters_page = self.page.get_by_role(
@@ -50,6 +68,21 @@ def go_to_bureau_page(self) -> None:
         """Clicks the 'Bureau' link."""
         self.click(self.bureau_page)
 
+    def navigate_to_surveillance_review_summary(self) -> None:
+        """Navigates through the organisation pages to the Surveillance Review Summary."""
+        self.click(self.org_and_site_details_link)
+        self.click(self.list_all_orgs_link)
+        self.click_back_button()
+        self.click(self.list_all_sites_link)
+        for _ in range(3):
+            self.click_back_button()
+        self.click(self.surveillance_link)
+        self.click(self.manage_surveillance_review_link)
+        self.page.goto(
+            "https://bcss-bcss-18680-ddc-bcss.k8s-nonprod.texasplatform.uk/surveillance/review/summary"
+        )
+
+
 class OrganisationSwitchPage:
     """Page Object Model for interacting with the Organisation Switch page."""
 
@@ -120,5 +153,3 @@ def get_logged_in_text(self) -> str:
             str: The text indicating the logged-in user's role or name.
         """
         return self.login_info.inner_text()
-
-

pages/screening_practitioner_appointments/screening_practitioner_appointments_page.py

@@ -10,6 +10,8 @@ def __init__(self, page: Page):
         self.page = page
         # ScreeningPractitionerAppointments Page
         self.log_in_page = self.page.get_by_role("button", name="Log in")
+        self.appointments_header = self.page.get_by_text("Screening Practitioner Appointments")
+
         self.view_appointments_page = self.page.get_by_role(
             "link", name="View appointments"
         )
@@ -43,3 +45,9 @@ def go_to_patients_that_require_page(self) -> None:
     def go_to_set_availability_page(self) -> None:
         """Click on the Set Availability link to navigate to the set availability page."""
         self.click(self.set_availability_link)
+
+    def open_appointments_report(self) -> None:
+        """Clicks the 'Appointments' header to open the related report section."""
+        self.click(self.appointments_header)
+
+

pages/screening_subject_search/subject_screening_search_page.py

@@ -3,6 +3,7 @@
 from pages.base_page import BasePage
 from enum import Enum
 from utils.calendar_picker import CalendarPicker
+from typing import Optional
 
 
 class SubjectScreeningPage(BasePage):
@@ -65,6 +66,13 @@ def __init__(self, page: Page):
             "textarea[data-testid='reasonNote']"
         )
 
+        self.surname_field = self.page.locator("#A_C_Surname")
+        self.forename_field = self.page.locator("#A_C_Forename")
+        self.screening_status_dropdown = self.page.locator("#A_C_ScreeningStatus")
+        self.episode_status_dropdown = self.page.locator("#A_C_EpisodeStatus")
+        self.search_button = self.page.get_by_role("button", name="Search")
+        self.back_link = self.page.get_by_role("link", name="Back", exact=True)
+
     def click_clear_filters_button(self) -> None:
         """Click the 'Clear Filters' button."""
         self.click(self.clear_filters_button)
@@ -206,6 +214,38 @@ def complete_send_kit_form(
 
         logging.info("[KIT REQUEST] 'Send a kit' form submitted successfully")
 
+    def search_subject_with_args(
+        self,
+        surname: Optional[str] = None,
+        forename: Optional[str] = None,
+        screening_status: Optional[str] = None,
+        episode_status: Optional[str] = None,
+    ) -> None:
+        """
+        Searches for a subject using any combination of the provided criteria.
+
+        Args:
+            surname (Optional[str]): Subject's surname.
+            forename (Optional[str]): Subject's forename.
+            screening_status (Optional[str]): Screening status code.
+            episode_status (Optional[str]): Episode status code.
+        """
+        # Fill in all provided fields before triggering any search
+        if surname:
+            self.surname_field.fill(surname)
+        if forename:
+            self.forename_field.fill(forename)
+        if screening_status:
+            self.screening_status_dropdown.select_option(screening_status)
+            self.click(self.screening_status_dropdown)
+        if episode_status:
+            self.episode_status_dropdown.select_option(episode_status)
+
+        # Only click search if at least one field was filled
+        if any([surname, forename, screening_status, episode_status]):
+            self.click(self.search_button)
+            self.click(self.back_link)
+
 
 class ScreeningStatusSearchOptions(Enum):
     """Enum for Screening Status Search Options"""

pages/surveillance/surveillance_summary_review_page.py

@@ -0,0 +1,39 @@
+from playwright.sync_api import Page
+from pages.base_page import BasePage
+
+
+class SurveillanceSummaryPage(BasePage):
+    """Page object for navigating to and interacting with the Surveillance Review Summary section."""
+
+    def __init__(self, page: Page):
+        super().__init__(page)
+
+        # Locators
+        self.org_and_site_details_link = self.page.get_by_role(
+            "link", name="Organisation and Site Details"
+        )
+        self.list_all_orgs_link = self.page.get_by_role(
+            "link", name="List All Organisations"
+        )
+        self.list_all_sites_link = self.page.get_by_role("link", name="List All Sites")
+        self.surveillance_link = self.page.get_by_role(
+            "link", name="Surveillance", exact=True
+        )
+        self.manage_surveillance_review_link = self.page.get_by_role(
+            "link", name="Manage Surveillance Review"
+        )
+        self.surveillance_review_summary_header = self.page.get_by_text(
+            "Surveillance Review Summary"
+        )
+        self.back_link = self.page.get_by_role("link", name="Back", exact=True)
+
+    def navigate_to_surveillance_review_summary(self):
+        """Navigates through multiple UI steps to reach the Surveillance Review Summary section."""
+        self.click(self.org_and_site_details_link)
+        self.click(self.list_all_orgs_link)
+        self.click(self.back_link)
+        self.click(self.list_all_sites_link)
+        for _ in range(3):
+            self.click(self.back_link)
+        self.click(self.surveillance_link)
+        self.click(self.manage_surveillance_review_link)

pytest.ini

@@ -53,4 +53,5 @@ markers =
     colonoscopy_dataset_tests: tests that are part of the colonoscopy datasets test suite
     fobt_diagnosis_date_entry_tests: tests that are part of fobt subject episodes record diagnosis date
     spine_retrieval_search_tests: tests that are part of subject spine retrieval demographics
+    hub_user_tests: tests that are part of the hub user test suite
     fobt_regression_tests: tests that are part of the fobt regression test suite

tests/regression/regression_tests/fobt_regression_tests/test_scenario_12.py

@@ -167,7 +167,10 @@ def test_scenario_12(page: Page) -> None:
     # Then there is a "S9" letter batch for my subject with the exact title "Invitation & Test Kit (FIT)"
     # When I process the open "S9" letter batch for my subject
     batch_processing(
-        page, "S9", "Invitation & Test Kit (FIT)", "S10 - Invitation & Test Kit Sent"
+        page=page,
+        batch_type="S9",
+        batch_description="Invitation & Test Kit (FIT)",
+        latest_event_status="S10 - Invitation & Test Kit Sent",
     )
 
     # When I log my subject's latest unlogged FIT kit
@@ -181,7 +184,9 @@ def test_scenario_12(page: Page) -> None:
     )
 
     # When I read my subject's latest logged FIT kit as "ABNORMAL"
-    FitKitLogged().read_latest_logged_kit(user_role, 2, fit_kit, "ABNORMAL")
+    FitKitLogged().read_latest_logged_kit(
+        user=user_role, kit_type=2, kit=fit_kit, kit_result="ABNORMAL"
+    )
 
     # Then my subject has been updated as follows:
     subject_assertion(nhs_no, {"latest event status": "A8 Abnormal"})
@@ -196,9 +201,9 @@ def test_scenario_12(page: Page) -> None:
     # And I set the practitioner appointment date to "today"
     # And I book the "earliest" available practitioner appointment on this date
     book_appointments(
-        page,
-        "BCS001 - Wolverhampton Bowel Cancer Screening Centre",
-        "The Royal Hospital (Wolverhampton)",
+        page=page,
+        screening_centre="BCS001 - Wolverhampton Bowel Cancer Screening Centre",
+        site="The Royal Hospital (Wolverhampton)",
     )
 
     # Then my subject has been updated as follows:
@@ -308,7 +313,7 @@ def test_scenario_12(page: Page) -> None:
 
     # Then my subject has been updated as follows:
     AdvanceFOBTScreeningEpisodePage(page).verify_latest_event_status_value(
-        "A59 - Invited for Diagnostic Test"
+        latest_event_status="A59 - Invited for Diagnostic Test"
     )
 
     # When I select the advance episode option for "Attend Diagnostic Test"
@@ -323,8 +328,8 @@ def test_scenario_12(page: Page) -> None:
 
     # Then my subject has been updated as follows:
     subject_assertion(
-        nhs_no,
-        {
+        nhs_number=nhs_no,
+        criteria={
             "latest event status": "A259 Attended Diagnostic Test",
         },
     )
@@ -705,7 +710,7 @@ def test_scenario_12(page: Page) -> None:
         "symptomatic procedure result": "Null",
         "screening referral type": "Null",
     }
-    subject_assertion(nhs_no, criteria)
+    subject_assertion(nhs_number=nhs_no, criteria=criteria)
 
     # When I view the subject
     screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
@@ -715,7 +720,7 @@ def test_scenario_12(page: Page) -> None:
 
     # And I select the advance episode option for "Non-neoplastic and Other Non-bowel Cancer Result"
     AdvanceFOBTScreeningEpisodePage(
-        page
+        page=page
     ).click_non_neoplastic_and_other_non_bowel_cancer_result_button()
 
     # And I set the Date of Symptomatic Procedure to "today"
@@ -725,7 +730,7 @@ def test_scenario_12(page: Page) -> None:
 
     # And the Screening Interval is 24 months
     NonNeoplasticResultFromSymptomaticProcedurePage(page).assert_text_in_alert_textbox(
-        "recall interval of 24 months"
+        expected_text="recall interval of 24 months"
     )
 
     # And I select test number 1