added page object module for screening practitioner appointments page

Author: ihsanulmirza

pages/active_batch_list_page.py

@@ -11,5 +11,48 @@ def __init__(self, page: Page):
         self.description_filter = self.page.locator("#eventDescriptionFilter")
         self.batch_split_by_filter = self.page.locator("#splitByFilter")
         self.screening_centre_filter = self.page.locator("#screeningCentreFilter")
-        self.status_filter = self.page.locator("#batchStatusFilter")
         self.count_filter = self.page.locator("#countFilter")
+    #     self.td = self.page.locator("td")
+
+    # def filter_td(self, filter):
+    #     self.td.
+
+    def enter_id_filter(self, search_text: str):
+        self.id_filter.click()
+        self.id_filter.fill(search_text)
+        self.id_filter.press("Enter")
+
+    def enter_type_filter(self, search_text: str):
+        self.type_filter.click()
+        self.type_filter.fill(search_text)
+        self.type_filter.press("Enter")
+
+    def enter_original_filter(self, search_text: str):
+        self.original_filter.click()
+        self.original_filter.fill(search_text)
+        self.original_filter.press("Enter")
+
+    def enter_event_code_filter(self, search_text: str):
+        self.event_code_filter.click()
+        self.event_code_filter.fill(search_text)
+        self.event_code_filter.press("Enter")
+
+    def enter_description_filter(self, search_text: str):
+        self.description_filter.click()
+        self.description_filter.fill(search_text)
+        self.description_filter.press("Enter")
+
+    def enter_batch_split_by_filter(self, search_text: str):
+        self.batch_split_by_filter.click()
+        self.batch_split_by_filter.fill(search_text)
+        self.batch_split_by_filter.press("Enter")
+
+    def enter_screening_centre_filter(self, search_text: str):
+        self.screening_centre_filter.click()
+        self.screening_centre_filter.fill(search_text)
+        self.screening_centre_filter.press("Enter")
+
+    def enter_count_filter(self, search_text: str):
+        self.count_filter.click()
+        self.count_filter.fill(search_text)
+        self.count_filter.press("Enter")

pages/archived_batch_list_page.py

@@ -11,5 +11,44 @@ def __init__(self, page: Page):
         self.description_filter = self.page.locator("#eventDescriptionFilter")
         self.batch_split_by_filter = self.page.locator("#splitByFilter")
         self.screening_centre_filter = self.page.locator("#screeningCentreFilter")
-        self.status_filter = self.page.locator("#batchStatusFilter")
         self.count_filter = self.page.locator("#countFilter")
+
+    def enter_id_filter(self, search_text: str):
+        self.id_filter.click()
+        self.id_filter.fill(search_text)
+        self.id_filter.press("Enter")
+
+    def enter_type_filter(self, search_text: str):
+        self.type_filter.click()
+        self.type_filter.fill(search_text)
+        self.type_filter.press("Enter")
+
+    def enter_original_filter(self, search_text: str):
+        self.original_filter.click()
+        self.original_filter.fill(search_text)
+        self.original_filter.press("Enter")
+
+    def enter_event_code_filter(self, search_text: str):
+        self.event_code_filter.click()
+        self.event_code_filter.fill(search_text)
+        self.event_code_filter.press("Enter")
+
+    def enter_description_filter(self, search_text: str):
+        self.description_filter.click()
+        self.description_filter.fill(search_text)
+        self.description_filter.press("Enter")
+
+    def enter_batch_split_by_filter(self, search_text: str):
+        self.batch_split_by_filter.click()
+        self.batch_split_by_filter.fill(search_text)
+        self.batch_split_by_filter.press("Enter")
+
+    def enter_screening_centre_filter(self, search_text: str):
+        self.screening_centre_filter.click()
+        self.screening_centre_filter.fill(search_text)
+        self.screening_centre_filter.press("Enter")
+
+    def enter_count_filter(self, search_text: str):
+        self.count_filter.click()
+        self.count_filter.fill(search_text)
+        self.count_filter.press("Enter")

pages/navigation_bar_links.py

@@ -12,11 +12,10 @@ def __init__(self, page: Page):
 
     def click_main_menu_link(self):
         for _ in range(3):  # Try up to 3 times
+            self.page.wait_for_timeout(2000) # Wait for 2 seconds before trying (as sometimes this button is clicked as a redirect happens)
             if self.main_menu_link.is_visible():
                 self.main_menu_link.click()
                 return  # Exit if successful
-            self.page.wait_for_timeout(200)  # Wait for 0.2 seconds before retrying
-        print("Already on Main Menu")
 
     def click_back_link(self):
         self.back_link.click()

pages/screening_practitioner_appointments.py

@@ -15,18 +15,42 @@
 from pages.navigation_bar_links import *
 from pages.subject_screening_page import *
 
+# @pytest.mark.wip2 # Not working at the moment
+# def test_prereq():
+#     database_connection_exec("prereq_check")
+
+#     paramater_32 = database_connection_query("select DEFAULT_VALUE from PARAMETERS where PARAM_ID = 32")
+#     print(f"paramater_32: {paramater_32}")
+#     if paramater_32[0] != "-1":
+#         database_connection_query("UPDATE PARAMETERS SET DEFAULT_VALUE = -1 WHERE PARAM_ID = 32")
+#         database_connection_query("COMMIT")
+#     paramater_31 = database_connection_query("select DEFAULT_VALUE from PARAMETERS where PARAM_ID = 31")
+#     print(f"paramater_31: {paramater_31}")
+#     if paramater_31[0] != "-1":
+#         database_connection_query("UPDATE PARAMETERS SET DEFAULT_VALUE = -1 WHERE PARAM_ID = 31")
+#         database_connection_query("COMMIT")
+
+
+# To Do:
+# Create more POM
+# Remove as many hard coded timeouts as possible
+# Add more fail states
+# Add more logging to understand what is going on
+# Convert import pages * into 1 line
+# Move functions to utils
+
 @pytest.mark.wip
 def test_example(page: Page) -> None:
     page.goto("/")
     BcssLoginPage(page).login_as_user_bcss401()
 
-    # Create plan
+    # 2 - Create plan
     MainMenu(page).go_to_call_and_recall_page()
     CallAndRecall(page).go_to_planning_and_monitoring_page()
     page.get_by_role("link", name="BCS001").click()
     page.get_by_role("button", name="Create a Plan").click()
     page.get_by_role("link", name="Set all").click()
-    page.get_by_placeholder("Enter weekly invitation rate").fill("1")
+    page.get_by_placeholder("Enter daily invitation rate").fill("1")
     page.get_by_role("button", name="Update").click()
     page.get_by_role("button", name="Confirm").click()
     page.get_by_role("link", name="Set all").click()
@@ -54,7 +78,7 @@ def test_example(page: Page) -> None:
     # Loop until the table no longer contains "Queued"
     while elapsed < timeout:
         table_text = page.locator("#displayRS").text_content()
-        if "Queued" in table_text:
+        if "Queued" in table_text or "In Progress" in table_text:
             # Click the Refresh button
             page.get_by_role("button", name="Refresh").click()
             page.wait_for_timeout(wait_interval)
@@ -87,25 +111,30 @@ def batch_processing(page: Page, batch_type: str, batch_description: str, latest
     NavigationBar(page).click_main_menu_link()
     MainMenu(page).go_to_communications_production_page()
     CommunicationsProduction(page).go_to_active_batch_list_page()
-    ActiveBatchList(page).event_code_filter.click()
-    ActiveBatchList(page).event_code_filter.fill(batch_type)
+    ActiveBatchList(page).enter_event_code_filter(batch_type)
     pre_invitation_cells = page.locator(f"//td[text()='{batch_description}']")
 
+    if pre_invitation_cells.count() == 0 and batch_description == "Pre-invitation (FIT) (digital leaflet)":
+        print(f"No S1 Pre-invitation (FIT) (digital leaflet) batch found. Skipping to next step")
+        return
+    elif pre_invitation_cells.count() == 0 and page.locator("td", has_text="No matching records found"):
+        pytest.fail(f"No {batch_type} {batch_description} batch found")
+
     for i in range(pre_invitation_cells.count()):
         row = pre_invitation_cells.nth(i).locator("..")  # Get the parent row
 
         # Check if the row contains "Prepared" or "Open"
-        if row.locator("td", has_text="Prepared").count() > 0 or row.locator("td", has_text="Open").count() > 0 or row.locator("td", has_text="Closed").count() > 0:
+        if row.locator("td", has_text="Prepared").count() > 0 or row.locator("td", has_text="Open").count() > 0:
             # Find the first link in that row and click it
             link = row.locator("a").first
             link_text = link.inner_text()  # Get the batch id dynamically
             link.click()
             break
         else:
-            pytest.fail(f"No open/prepared {batch_type} batch found")
+            pytest.fail(f"No open/prepared '{batch_type} - {batch_description}' batch found")
 
     # Checks to see if batch is already prepared
-    page.wait_for_timeout(1000) # Without this timeout prepare_button is always set to false
+    page.wait_for_timeout(3000) # Without this timeout prepare_button is always set to false
     prepare_button = page.get_by_role("button", name="Prepare Batch").is_visible()
 
     #If not prepared it will click on the prepare button
@@ -142,11 +171,12 @@ def batch_processing(page: Page, batch_type: str, batch_description: str, latest
         page.get_by_role("button", name="Confirm Printed").nth(0).click()
         page.wait_for_timeout(1000)
 
+    # Add wait for batch successfully archived
+
     NavigationBar(page).click_main_menu_link()
     MainMenu(page).go_to_communications_production_page()
     CommunicationsProduction(page).go_to_archived_batch_list_page()
-    ArchivedBatchList(page).event_code_filter.click()
-    ArchivedBatchList(page).event_code_filter.fill(link_text)
+    ArchivedBatchList(page).enter_id_filter(link_text)
     expect(page.locator("td").filter(has_text=link_text)).to_be_visible() # Checks to see if the batch is now archived
 
     subject_search_by_nhs_no(page, nhs_no, latest_event_status)

tests/Smokescreen/test_compartment_1.py

@@ -19,3 +19,4 @@ def database_connection_query(sql: str): # To use when "select a from b"
         with connection.cursor() as cursor:
             for r in cursor.execute(sql):
                 print(r)
+            return r