addressing PR comments

Author: Andyg79

pages/organisations/organisations_page.py

@@ -70,14 +70,14 @@ def go_to_bureau_page(self) -> None:
 
     def navigate_to_surveillance_review_summary(self) -> None:
         """Navigates through the organisation pages to the Surveillance Review Summary."""
-        self.org_and_site_details_link.click()
-        self.list_all_orgs_link.click()
+        self.click(self.org_and_site_details_link)
+        self.click(self.list_all_orgs_link)
         self.click_back_button()
-        self.list_all_sites_link.click()
+        self.click(self.list_all_sites_link)
         for _ in range(3):
             self.click_back_button()
-        self.surveillance_link.click()
-        self.manage_surveillance_review_link.click()
+        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"
         )

pages/screening_subject_search/subject_screening_search_page.py

@@ -230,20 +230,21 @@ def search_subject_with_args(
             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.screening_status_dropdown.click()
-        if surname or forename or screening_status:
-            self.click(self.search_button)
-            self.back_link.click()
+            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.back_link.click()
+            self.click(self.back_link)
 
 
 class ScreeningStatusSearchOptions(Enum):

pages/surveillance/surveillance_summary_review_page.py

@@ -29,11 +29,11 @@ def __init__(self, page: Page):
 
     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_link.click()
-        self.list_all_sites_link.click()
+        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.back_link.click()
-        self.surveillance_link.click()
-        self.manage_surveillance_review_link.click()
+            self.click(self.back_link)
+        self.click(self.surveillance_link)
+        self.click(self.manage_surveillance_review_link)

tests/regression/subject_diagnosis_date/test_subject_hub_user_national.py

@@ -14,7 +14,6 @@
 
 
 # Scenario 1
-@pytest.mark.wip
 @pytest.mark.regression
 @pytest.mark.hub_user_tests
 def test_hub_user_alerts_populated(page: Page) -> None:
@@ -33,7 +32,6 @@ def test_hub_user_alerts_populated(page: Page) -> None:
 
 
 # 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:
@@ -52,7 +50,6 @@ def test_hub_user_kits_logged_not_read_report(page: Page) -> None:
 
 
 # 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:
@@ -71,7 +68,6 @@ def test_hub_user_people_requiring_colonoscopy_assessment_report(page: Page) ->
 
 
 # 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:
@@ -92,7 +88,6 @@ def test_screening_centre_user_subject_search_and_summary(page: Page) -> None:
 
 
 # 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: