Adjusting the test logic to skip S1 - digital leaflet if none is found.

Added more page object models and create a few fail scenarios so the test fails with a clear error message

Author: adrianoaru-nhs

pages/active_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/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(1000) # Wait for 1 second 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()

tests/Smokescreen/test_compartment_1.py

@@ -87,25 +87,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 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
@@ -145,8 +150,7 @@ 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_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)