refactoring

Author: Andyg79

pages/communication_production/batch_list_page.py

@@ -101,7 +101,6 @@ def enter_type_filter(self, option_text: str) -> None:
         self.type_filter.select_option(label=option_text)
         logging.info(f"[FILTER] Type filter set to '{option_text}'")
 
-
     def enter_original_filter(self, search_text: str) -> None:
         self.original_filter.fill(search_text)
         self.original_filter.press("Enter")
@@ -200,19 +199,19 @@ def get_open_original_batch_row(self) -> Locator | None:
         Returns:
             Locator of the matching <tr> element, or None if not found.
         """
-        rows = self.page.locator(f"{self.table_selector} tbody tr")
-        for i in range(rows.count()):
-            row = rows.nth(i)
-            type_cell = row.locator("td").nth(1)  # Assuming Type is 2nd column
-            status_cell = row.locator("td").nth(8)  # Assuming Status is 9th column
+        table = TableUtils(self.page, "table#batchList")
+        row_count = table.get_row_count()
 
+        for i in range(row_count):
+            row_data = table.get_row_data_with_headers(i)
             if (
-                "Original" in type_cell.inner_text()
-                and "Open" in status_cell.inner_text()
+                row_data.get("Type", "").strip() == "Original"
+                and row_data.get("Status", "").strip() == "Open"
             ):
-                return row
+                return table.pick_row(i)
         return None
 
+
     def assert_s83f_batch_present(self) -> None:
         self.enter_type_filter("Original")
         self.enter_event_code_filter("S83")
@@ -232,9 +231,8 @@ def __init__(self, page: Page):
 
     def select_first_archived_batch(self) -> None:
         """Clicks the first batch ID link in the archived batch list."""
-        first_batch_link = self.page.locator(
-            f"{self.table_selector} tbody tr td.id a"
-        ).first
+        first_batch_link = self.page.locator("table#batchList tbody tr td.id a").first
+        first_batch_link.wait_for(timeout=10000)
         assert first_batch_link.count() > 0, "No archived batch links found"
         first_batch_link.click()
 
@@ -310,8 +308,9 @@ def assert_letter_component_present(self, letter_type: str, format: str) -> None
                 match_found = True
                 break
 
-        assert match_found, f"Letter type '{letter_type}' with format '{format}' not found"
-
+        assert (
+            match_found
+        ), f"Letter type '{letter_type}' with format '{format}' not found"
 
     def get_first_subject_nhs_number(self) -> str:
         """
@@ -322,11 +321,12 @@ def get_first_subject_nhs_number(self) -> str:
         """
         table_utils = TableUtils(self.page, "table#letterBatchDetails")
         row_data = table_utils.get_row_data_with_headers(0)  # First row (0-based index)
-        
+
         nhs_number = row_data.get("NHS Number")
         if not nhs_number:
-            raise RuntimeError("NHS Number not found in the first row of the letter batch table")
+            raise RuntimeError(
+                "NHS Number not found in the first row of the letter batch table"
+            )
 
         logging.info(f"Retrieved NHS number from batch: {nhs_number}")
         return nhs_number
-

pages/communication_production/manage_active_batch_page.py

@@ -35,6 +35,7 @@ def click_confirm_button(self) -> None:
     def assert_active_batch_details_visible(self) -> None:
         """Asserts that the Manage Active Batch screen has loaded by checking the page title."""
         page_title = self.page.locator("#page-title")
+        page_title.wait_for(timeout=10000)
         expect(page_title).to_have_text("Manage Active Batch")
 
     def retrieve_and_confirm_letters(self) -> None:

tests/regression/communications_production/test_basic_active_batch_list_functionality.py

@@ -82,4 +82,4 @@ def test_navigation_to_manage_active_batch_screen(select_user) -> None:
 
     # Step 3: Assert navigation to the Manage Active Batch page
     manage_batch_page = ManageActiveBatchPage(page)
-    manage_batch_page.assert_batch_details_visible()
+    manage_batch_page.assert_active_batch_details_visible()

tests/regression/communications_production/test_basic_manage_archived_batch_functionality.py

@@ -29,7 +29,7 @@ def _login_as(user_role: str):
 
     return _login_as
 
-
+@pytest.mark.wip
 @pytest.mark.letters_tests
 @pytest.mark.regression
 def test_reprint_and_archive_letter_batch(select_user) -> None:
@@ -89,6 +89,7 @@ def test_reprint_and_archive_letter_batch(select_user) -> None:
     manage_archived_page.confirm_archived_message_visible()
 
 
+@pytest.mark.wip
 @pytest.mark.letters_tests
 @pytest.mark.regression
 def test_check_that_s1_has_supplementary_batches(select_user) -> None: