Addressed PR comments.

Author: Andyg79

pages/alerts/alerts_page.py

@@ -2,9 +2,9 @@
 from pages.base_page import BasePage
 
 
-class AlertsPage:
+class AlertsPage(BasePage):
     def __init__(self, page: Page):
-        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:
@@ -14,5 +14,3 @@ def click_refresh_alerts(self) -> None:
     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/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):
@@ -213,17 +214,36 @@ def complete_send_kit_form(
 
         logging.info("[KIT REQUEST] 'Send a kit' form submitted successfully")
 
-    def search_subject_with_args(self, surname: str, forename: str, screening_status: str, episode_status: str) -> None:
-        """Searches for a subject using the provided criteria."""
-        self.surname_field.fill(surname)
-        self.forename_field.fill(forename)
-        self.screening_status_dropdown.select_option(screening_status)
-        self.screening_status_dropdown.click()
-        self.search_button.click()
-        self.back_link.click()
-        self.episode_status_dropdown.select_option(episode_status)
-        self.search_button.click()
-        self.back_link.click()
+    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.
+        """
+        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.screening_status_dropdown.click()
+        if surname or forename or screening_status:
+            self.click(self.search_button)
+            self.back_link.click()
+        if episode_status:
+            self.episode_status_dropdown.select_option(episode_status)
+            self.click(self.search_button)
+            self.back_link.click()
 
 
 class ScreeningStatusSearchOptions(Enum):

pages/screening_subject_search/subject_search_page.py

@@ -1,37 +1,39 @@
-from playwright.sync_api import Page, expect
+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,
-        org_and_site_details_link_text,
-        list_all_orgs_link_text,
-        list_all_sites_link_text,
-        surveillance_link_text,
-        manage_surveillance_review_link_text,
-        surveillance_review_summary_header_text,
-        back_link_text="Back"
-    ):
-        self.page = page
-        self.org_and_site_details_link = self.page.get_by_role("link", name=org_and_site_details_link_text)
-        self.list_all_orgs_link = self.page.get_by_role("link", name=list_all_orgs_link_text)
-        self.list_all_sites_link = self.page.get_by_role("link", name=list_all_sites_link_text)
-        self.surveillance_link = self.page.get_by_role("link", name=surveillance_link_text, exact=True)
-        self.manage_surveillance_review_link = self.page.get_by_role("link", name=manage_surveillance_review_link_text)
-        self.surveillance_review_summary_header = self.page.get_by_text(surveillance_review_summary_header_text)
-        self.back_link = self.page.get_by_role("link", name=back_link_text, exact=True)
+
+    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.org_and_site_details_link.click()
         self.list_all_orgs_link.click()
-        self.back_button = self.page.get_by_role("link", name="Back", exact=True)
-        self.back_button.click()
+        self.back_link.click()
         self.list_all_sites_link.click()
         for _ in range(3):
-            self.back_button.click()
+            self.back_link.click()
         self.surveillance_link.click()
         self.manage_surveillance_review_link.click()

pages/surveillance/surveillance_summary_review_page.py

@@ -4,11 +4,17 @@
 from pages.base_page import BasePage
 from pages.alerts.alerts_page import AlertsPage
 from pages.gfobt_test_kits.gfobt_test_kits_page import GFOBTTestKitsPage
-from pages.screening_practitioner_appointments.screening_practitioner_appointments_page import ScreeningPractitionerAppointmentsPage
-from pages.screening_subject_search.subject_screening_search_page import SubjectScreeningPage
+from pages.screening_practitioner_appointments.screening_practitioner_appointments_page import (
+    ScreeningPractitionerAppointmentsPage,
+)
+from pages.screening_subject_search.subject_screening_search_page import (
+    SubjectScreeningPage,
+)
 from pages.surveillance.surveillance_summary_review_page import SurveillanceSummaryPage
 
+
 # Scenario 1
+@pytest.mark.wip
 @pytest.mark.regression
 @pytest.mark.hub_user_tests
 def test_hub_user_alerts_populated(page: Page) -> None:
@@ -25,7 +31,9 @@ def test_hub_user_alerts_populated(page: Page) -> None:
     alerts_page.click_refresh_alerts()
     expect(alerts_page.refresh_alerts_link).to_be_visible(timeout=5000)
 
+
 # Scenario 2
+@pytest.mark.wip
 @pytest.mark.regression
 @pytest.mark.hub_user_tests
 def test_hub_user_kits_logged_not_read_report(page: Page) -> None:
@@ -42,7 +50,9 @@ def test_hub_user_kits_logged_not_read_report(page: Page) -> None:
     test_kits_page.open_test_kits_report()
     expect(test_kits_page.test_kits_header).to_be_visible(timeout=5000)
 
+
 # Scenario 3
+@pytest.mark.wip
 @pytest.mark.regression
 @pytest.mark.hub_user_tests
 def test_hub_user_people_requiring_colonoscopy_assessment_report(page: Page) -> None:
@@ -59,7 +69,9 @@ def test_hub_user_people_requiring_colonoscopy_assessment_report(page: Page) ->
     appointments_page.open_appointments_report()
     expect(appointments_page.appointments_header).to_be_visible(timeout=5000)
 
+
 # Scenario 4
+@pytest.mark.wip
 @pytest.mark.regression
 @pytest.mark.hub_user_tests
 def test_screening_centre_user_subject_search_and_summary(page: Page) -> None:
@@ -74,9 +86,13 @@ def test_screening_centre_user_subject_search_and_summary(page: Page) -> None:
     # Step 2: Use POM for subject search
     search_page = SubjectScreeningPage(page)
     """screening_status=4004 value represents 'Recall' & episode_status=2 value represents 'Closed'"""
-    search_page.search_subject_with_args(surname="A*", forename="A*", screening_status="4004", episode_status="2")
+    search_page.search_subject_with_args(
+        surname="A*", forename="A*", screening_status="4004", episode_status="2"
+    )
+
 
 # Scenario 5
+@pytest.mark.wip
 @pytest.mark.regression
 @pytest.mark.hub_user_tests
 def test_screening_centre_user_subject_search_and_surveillance(page: Page) -> None:
@@ -89,15 +105,6 @@ def test_screening_centre_user_subject_search_and_surveillance(page: Page) -> No
     BasePage(page).go_to_organisations_page()
 
     # Step 2: Use POM for navigation and assertion
-    sur_page = SurveillanceSummaryPage(
-    page,
-    org_and_site_details_link_text="Organisation and Site Details",
-    list_all_orgs_link_text="List All Organisations",
-    list_all_sites_link_text="List All Sites",
-    surveillance_link_text="Surveillance",
-    manage_surveillance_review_link_text="Manage Surveillance Review",
-    surveillance_review_summary_header_text="Surveillance Review Summary"
-)
+    sur_page = SurveillanceSummaryPage(page)
     sur_page.navigate_to_surveillance_review_summary()
     expect(sur_page.surveillance_review_summary_header).to_be_visible(timeout=5000)
-