Removing hard coded locators from tests/test_Screening_subject_searcg_page.py and moving them into utils/screening_subject_page_searcher.py

Creating new POMs were necessary

Author: adrianoaru-nhs

pages/subject_screening_search_page.py

@@ -25,11 +25,17 @@ def __init__(self, page: Page):
         self.laboratory_test_date_filter = self.page.get_by_role("textbox", name="Laboratory Test Date")
         self.diagnostic_test_actual_date_filter = self.page.get_by_role("textbox", name="Diagnostic Test Actual Date")
         self.search_button = self.page.get_by_role("button", name="Search")
+        self.clear_filters_button = self.page.get_by_role("button", name="Clear Filters")
+        self.appropriate_code_filter = self.page.get_by_label("Appropriate Code")
+        self.gp_practice_in_ccg_filter = self.page.get_by_label("GP Practice in CCG")
 
         self.select_screening_status = self.page.locator("#A_C_ScreeningStatus")
         self.select_episode_status = self.page.locator("#A_C_EpisodeStatus")
         self.select_search_area = self.page.locator("#A_C_SEARCH_DOMAIN")
 
+    def click_clear_filters_button(self) -> None:
+        self.click(self.clear_filters_button)
+
     def click_search_button(self)->None:
         self.click(self.search_button)
 

pages/subject_screening_summary.py

@@ -20,8 +20,16 @@ def __init__(self, page: Page):
         self.reason = self.page.get_by_label("Reason", exact=True)
         self.update_subject_data = self.page.get_by_role("button", name="Update Subject Data")
         self.close_fobt_screening_episode = self.page.get_by_role("button", name="Close FOBT Screening Episode")
-        self.go_to_a_page_to_advance_the_episode = self.page.get_by_text("go to a page to Advance the")
-        self.go_to_a_page_to_close_the_episode = self.page.get_by_text("go to a page to Close the")
+        self.a_page_to_advance_the_episode = self.page.get_by_text("go to a page to Advance the")
+        self.a_page_to_close_the_episode = self.page.get_by_text("go to a page to Close the")
+        self.subject_search_results_title = self.page.locator("#ntshPageTitle")
+        self.display_rs = self.page.locator("#displayRS")
+
+    def verify_result_contains_text(self, text) -> None:
+        expect(self.display_rs).to_contain_text(text)
+
+    def verify_subject_search_results_title(self, text) -> None:
+        expect(self.subject_search_results_title).to_contain_text(text)
 
     def get_latest_event_status_cell(self, latest_event_status: str)-> Locator:
         return self.page.get_by_role("cell", name=latest_event_status, exact=True)
@@ -64,10 +72,10 @@ def click_close_fobt_screening_episode(self)-> None:
         self.click(self.close_fobt_screening_episode)
 
     def go_to_a_page_to_advance_the_episode(self)-> None:
-        self.click(self.go_to_a_page_to_advance_the_episode)
+        self.click(self.a_page_to_advance_the_episode)
 
     def go_to_a_page_to_close_the_episode(self)-> None:
-        self.click(self.go_to_a_page_to_close_the_episode)
+        self.click(self.a_page_to_close_the_episode)
 
     def select_change_screening_status(self, option: str)-> None:
         self.change_screening_status.select_option(option)