Fixed failing test steps

Author: Andyg79

pages/call_and_recall/create_a_plan_page.py

@@ -26,11 +26,12 @@ def __init__(self, page: Page):
         )
         # Create A Plan Table Locators
         self.weekly_invitation_rate_field_on_table = self.page.locator(
-            "#invitationRateField"
+            "#invitationPlan > tbody > tr:nth-child(1) > td.input.border-right.dt-type-numeric > input"
         )
         self.invitations_sent_value = self.page.locator(
-            "#invitationPlan > tbody > tr:nth-child(1) > td:nth-child(8)"
+            "tbody tr:nth-child(1) td:nth-child(8)"
         )
+
         self.resulting_position_value = self.page.locator(
             "#invitationPlan > tbody > tr:nth-child(1) > td:nth-child(9)"
         )
@@ -137,28 +138,42 @@ def verify_weekly_invitation_rate_for_weeks(
 
     def increment_invitation_rate_and_verify_changes(self) -> None:
         """
-        Increments the invitation rate by 1, then verifies that both the 'Invitations Sent' and 'Resulting Position' have increased by 1.
+        Increments the invitation rate by 1, then verifies that both the
+        'Invitations Sent' has increased by 1 and 'Resulting Position' has decreased by 1.
         """
-        # Get the current value of the Weekly Invitation Rate field
-        current_value = int(
-            self.create_a_plan_table.get_cell_value("Invitation Rate", 0)
+        # Capture initial values before any changes
+        initial_invitations_sent = int(self.invitations_sent_value.inner_text().strip())
+        initial_resulting_position = int(
+            self.resulting_position_value.inner_text().strip()
+        )
+
+        # Increment the invitation rate
+        current_rate = int(
+            self.create_a_plan_table.get_cell_value("Invitation Rate", 1)
+        )
+        new_rate = str(current_rate + 1)
+        self.weekly_invitation_rate_field_on_table.fill(new_rate)
+        self.page.keyboard.press("Tab")
+
+        # Wait dynamically for updates
+        expect(self.invitations_sent_value).to_have_text(
+            str(initial_invitations_sent + 1)
         )
-        # Increments by 1, fills the field with the new value, and Tabs out of the field
-        new_value = str(current_value + 1)
-        locator = self.weekly_invitation_rate_field_on_table
-        locator.fill(new_value)
-        locator.press("Tab")
-
-        # Verifies 'Invitations Sent' has increased by 1
-        initial_invitations_sent = int(self.invitations_sent_value.inner_text())
+        expect(self.resulting_position_value).to_have_text(
+            str(initial_resulting_position + 1)
+        )
+
+        # Capture updated values
+        updated_invitations_sent = int(self.invitations_sent_value.inner_text().strip())
+        updated_resulting_position = int(
+            self.resulting_position_value.inner_text().strip()
+        )
+
+        # Assert changes
         assert (
-            int(self.invitations_sent_value.inner_text())
-            == initial_invitations_sent + 1
-        ), "Invitations Sent did not increase by 1."
+            updated_invitations_sent == initial_invitations_sent + 1
+        ), f"Expected Invitations Sent to increase by 1. Was {initial_invitations_sent}, now {updated_invitations_sent}."
 
-        # Verifies 'Resulting Position' has increased by 1
-        initial_resulting_position = int(self.resulting_position_value.inner_text())
         assert (
-            int(self.resulting_position_value.inner_text())
-            == initial_resulting_position - 1
-        ), "Resulting Position did not decrease by 1."
+            updated_resulting_position == initial_resulting_position + 1
+        ), f"Expected Resulting Position to increase by 1. Was {initial_resulting_position}, now {updated_resulting_position}."

tests/regression/call_and_recall/test_create_a_plan_regression.py

@@ -52,12 +52,9 @@ def test_create_a_plan_set_daily_rate(page: Page, general_properties: dict) -> N
     CreateAPlanPage(page).verify_weekly_invitation_rate_for_weeks(1, 50, "140")
 
 
-@pytest.mark.wip
 @pytest.mark.regression
 @pytest.mark.call_and_recall
-def test_create_invitation_plan_weekly_rate(
-    page: Page, general_properties: dict
-) -> None:
+def test_create_a_plan_weekly_rate(page: Page, general_properties: dict) -> None:
     """
     Verifies that a user can set a weekly invitation rate in Create a Plan.
     """
@@ -89,7 +86,7 @@ def test_create_invitation_plan_weekly_rate(
 
 @pytest.mark.regression
 @pytest.mark.call_and_recall
-def test_update_invitation_rate_weekly(page: Page, tests_properties: dict) -> None:
+def test_update_invitation_rate_weekly(page: Page, general_properties: dict) -> None:
     """
     Verifies that a Hub Manager State Registered is able to update a weekly Invitation rate
     and the Cumulative 'Invitations sent' and 'Resulting Position' values are updated.
@@ -100,7 +97,7 @@ def test_update_invitation_rate_weekly(page: Page, tests_properties: dict) -> No
 
     # And I click the link text "BCS001"
     InvitationsMonitoringPage(page).go_to_invitation_plan_page(
-        tests_properties["screening_centre_code"]
+        general_properties["screening_centre_code"]
     )
 
     # And I click the "Create a Plan" button

utils/table_util.py

@@ -46,8 +46,20 @@ def get_column_index(self, column_name: str) -> int:
             )
 
         headers = header_row.locator("th")
-        header_texts = headers.evaluate_all("ths => ths.map(th => th.innerText.trim())")
 
+        # Extract first-row headers (general headers)
+        header_texts = headers.evaluate_all("ths => ths.map(th => th.innerText.trim())")
+        print("First Row Headers Found:", header_texts)
+        
+        # Extract detailed second-row headers if first-row headers seem generic
+        second_row_headers = self.table.locator("thead tr:nth-child(2) th").evaluate_all(
+        "ths => ths.map(th => th.innerText.trim())"
+    )
+        # Merge both lists: Prioritize second-row headers if available
+        if second_row_headers:
+            header_texts = second_row_headers
+
+        print("Second Row Headers Found:", header_texts)
         for index, header in enumerate(header_texts):
             if column_name.lower() in header.lower():
                 return index + 1  # Convert to 1-based index
@@ -198,7 +210,6 @@ def get_full_table_with_headers(self) -> dict:
             full_results[row + 1] = self.get_row_data_with_headers(row)
         return full_results
 
-
     def get_cell_value(self, column_name: str, row_index: int) -> str:
         """
         Retrieves the text value of a cell at the specified column(name) and row(index).