Merge branch 'feature/BCSS-20574-investigate-use-of-ai-to-assist-code-conversion' into feature/BCSS-20580-selenium-to-playwright-call-and-recall

Andyg79 · Andyg79 · commit ee3caf2effc3 · 2025-06-05T10:48:57.000+01:00
I started working on call and recall as part of the investigate ai... ticket.
Merging into new branch to better link it to the jira ticket for this work
diff --git a/pages/call_and_recall/create_a_plan_page.py b/pages/call_and_recall/create_a_plan_page.py
@@ -1,5 +1,6 @@
 from playwright.sync_api import Page, expect
 from pages.base_page import BasePage
+from utils.table_util import TableUtils
 
 
 class CreateAPlanPage(BasePage):
@@ -23,6 +24,19 @@ def __init__(self, page: Page):
         self.save_note_button = self.page.locator("#saveNote").get_by_role(
             "button", name="Save"
         )
+        # Create A Plan Table Locators
+        self.weekly_invitation_rate_field_on_table = self.page.locator(
+            "#invitationRateField"
+        )
+        self.invitations_sent_value = self.page.locator(
+            "#invitationPlan > 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)"
+        )
+
+        # Initialize TableUtils for different tables
+        self.create_a_plan_table = TableUtils(page, "#invitationPlan")
 
     def click_set_all_button(self) -> None:
         """Clicks the Set all button to set all values"""
@@ -59,3 +73,58 @@ def click_save_note_button(self) -> None:
     def verify_create_a_plan_title(self) -> None:
         """Verifies the Create a Plan page title"""
         self.bowel_cancer_screening_page_title_contains_text("View a plan")
+
+    def verify_weekly_invitation_rate_for_weeks(
+        self, start_week: int, end_week: int, expected_weekly_rate: str
+    ) -> None:
+        """
+        Verifies that the weekly invitation rate is correctly calculated and displayed for the specified range of weeks.
+
+        Args:
+        start_week (int): The starting week of the range.
+        end_week (int): The ending week of the range.
+        expected_weekly_rate (str): The expected weekly invitation rate.
+        """
+        # Get the current weekly invitation rate for the starting week
+        weekly_invitation_rate = self.page.query_selector_all(
+            "css:nth-child(" + str(start_week) + ") .text"
+        )[0].inner_text()
+        assert (
+            weekly_invitation_rate == expected_weekly_rate
+        ), f"Expected weekly invitation rate '{expected_weekly_rate}' for week {start_week} but got '{weekly_invitation_rate}'"
+
+        # Verify the rate for the specified range of weeks
+        for week in range(start_week + 1, end_week + 1):
+            weekly_rate_locator = f".week-{week} .text"
+            assert (
+                self.page.query_selector_all(weekly_rate_locator)[0].inner_text()
+                == expected_weekly_rate
+            ), f"Week {week} invitation rate should be '{expected_weekly_rate}', but found '{self.page.query_selector_all(weekly_rate_locator)[0].inner_text()}'"
+
+    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.
+        """
+        # Get the current value of the Weekly Invitation Rate field
+        current_value = int(
+            self.create_a_plan_table.get_cell_value("Invitation Rate", 0)
+        )
+        # 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())
+        assert (
+            int(self.invitations_sent_value.inner_text())
+            == initial_invitations_sent + 1
+        ), "Invitations Sent did not increase by 1."
+
+        # 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."
diff --git a/pages/call_and_recall/non_invitations_days_page.py b/pages/call_and_recall/non_invitations_days_page.py
@@ -1,5 +1,6 @@
 from playwright.sync_api import Page, expect
 from pages.base_page import BasePage
+from utils.date_time_utils import DateTimeUtils
 
 
 class NonInvitationDaysPage(BasePage):
@@ -9,7 +10,54 @@ def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
         # Non Invitation Days - page locators, methods
+        self.enter_note_field = self.page.get_by_role("textbox", name="note")
+        self.enter_date_field = self.page.get_by_role("textbox", name="date")
+        self.add_non_invitation_day_button = self.page.get_by_role(
+            "button", name="Add Non-Invitation Day"
+        )
+        self.non_invitation_day_delete_button = self.page.get_by_role(
+            "button", name="Delete"
+        )
+        self.created_on_date_locator = self.page.locator("#displayRS")
 
     def verify_non_invitation_days_tile(self) -> None:
         """Verifies the page title of the Non Invitation Days page"""
         self.bowel_cancer_screening_page_title_contains_text("Non-Invitation Days")
+
+    def enter_date(self, date: str) -> None:
+        """Enters a date in the date input field
+        Args:
+            date (str): The date to enter in the field, formatted as 'dd/mm/yyyy'.
+        """
+        self.enter_date_field.fill(date)
+
+    def enter_note(self, note: str) -> None:
+        """Enters a note in the note input field
+        Args:
+            note (str): The note to enter in the field.
+        """
+        self.enter_note_field.fill(note)
+
+    def click_add_non_invitation_day_button(self) -> None:
+        """Clicks the Add Non-Invitation Day button"""
+        self.click(self.add_non_invitation_day_button)
+
+    def click_delete_button(self) -> None:
+        """Clicks the Delete button for a non-invitation day"""
+        self.click(self.non_invitation_day_delete_button)
+
+    def verify_date_is_visible(self) -> None:
+        """Verifies that the specified date is visible on the page
+        Args:
+            date (str): The date to verify, formatted as 'dd/mm/yyyy'.
+        """
+        date = DateTimeUtils.current_datetime("dd/mm/yyyy")
+        expect(self.created_on_date_locator).to_have_text(date)
+
+    def verify_date_is_not_visible(self) -> None:
+        """Verifies that the specified date is not visible on the page
+        Args:
+            date (str): The date to verify, formatted as 'dd/mm/yyyy'.
+        """
+        date = DateTimeUtils.current_datetime("dd/mm/yyyy")
+        expect(self.created_on_date_locator).not_to_have_text(date)
diff --git a/pytest.ini b/pytest.ini
@@ -37,3 +37,4 @@ markers =
     compartment6: only for compartment 6
     compartment1_plan_creation: to run the plan creation for compartment 1
     vpn_required: for tests that require a VPN connection
+    regression: tests that are part of the regression test suite
diff --git a/tests/bcss_tests.properties b/tests/bcss_tests.properties
@@ -21,3 +21,9 @@ forename=Pentagram
 surname=Absurd
 subject_dob=11/01/1934
 episode_closed_date=22/09/2020
+
+# ----------------------------------
+# CALL AND RECALL TEST DATA
+# ----------------------------------
+daily_invitation_rate=28
+weekly_invitation_rate=28
diff --git a/tests/regression/call_and_recall/test_create_a_plan_regression.py b/tests/regression/call_and_recall/test_create_a_plan_regression.py
@@ -0,0 +1,117 @@
+import pytest
+from playwright.sync_api import Page
+from pages.base_page import BasePage
+from pages.call_and_recall.call_and_recall_page import CallAndRecallPage
+from pages.call_and_recall.invitations_monitoring_page import InvitationsMonitoringPage
+from pages.call_and_recall.invitations_plans_page import InvitationsPlansPage
+from pages.call_and_recall.create_a_plan_page import CreateAPlanPage
+from utils.user_tools import UserTools
+
+
+@pytest.fixture(scope="function", autouse=True)
+def before_each(page: Page):
+    """
+    Before every test is executed, this fixture logs in to BCSS as a test user and navigates to the call and recall page
+    """
+    # Log in to BCSS
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
+
+    # Go to call and recall page
+    BasePage(page).go_to_call_and_recall_page()
+
+
+@pytest.mark.regression
+@pytest.mark.call_and_recall
+def test_set_create_a_plan_daily_rate(page: Page, general_properties: dict) -> None:
+    """
+    Verifies that a user is able to click on the Set all button and enter a daily rate.
+    """
+    # When I go to "Invitations Monitoring - Screening Centre"
+    CallAndRecallPage(page).go_to_planning_and_monitoring_page()
+
+    # And I click the link text "BCS001"
+    InvitationsMonitoringPage(page).go_to_invitation_plan_page(
+        general_properties["screening_centre_code"]
+    )
+    # And I click the "Create a Plan" button
+    InvitationsPlansPage(page).go_to_create_a_plan_page()
+
+    # And I click the set all button
+    CreateAPlanPage(page).click_set_all_button()
+
+    # And I enter "28" in the input box with id "dailyRate"
+    CreateAPlanPage(page).fill_daily_invitation_rate_field(
+        general_properties["daily_invitation_rate"]
+    )
+
+    # And I click the "Update" button
+    CreateAPlanPage(page).click_update_button()
+
+    # And I click the "Save" button
+    CreateAPlanPage(page).click_save_button()
+
+    # Then the Weekly Invitation Rate for weeks 1 to 83 is set correctly
+    # based on a set all daily rate of 28
+    CreateAPlanPage(page).verify_weekly_invitation_rate_for_weeks(1, 83, "28")
+
+
+@pytest.mark.regression
+@pytest.mark.call_and_recall
+def test_create_invitation_plan_weekly_rate(
+    page: Page, general_properties: dict
+) -> None:
+    """
+    Verifies that a user can set a weekly invitation rate in Create a Plan.
+    """
+
+    # When I go to "Invitations Monitoring - Screening Centre"
+    CallAndRecallPage(page).go_to_planning_and_monitoring_page()
+
+    # And I click the link text "BCS001"
+    InvitationsMonitoringPage(page).go_to_invitation_plan_page(
+        general_properties["screening_centre_code"]
+    )
+    # And I click the "Create a Plan" button
+    InvitationsPlansPage(page).go_to_create_a_plan_page()
+
+    # And I click the set all button
+    CreateAPlanPage(page).click_set_all_button()
+
+    # And I enter "130" in the input box with id "weeklyRate"
+    CreateAPlanPage(page).fill_weekly_invitation_rate_field(
+        general_properties["weekly_invitation_rate"]
+    )
+
+    # And I click the "Update" button
+    CreateAPlanPage(page).click_update_button()
+
+    # And I click the "Save" button
+    CreateAPlanPage(page).click_save_button()
+
+    # And the Weekly Invitation Rate for weeks 1 to 83 is set to the set all weekly rate of 130
+    CreateAPlanPage(page).verify_weekly_invitation_rate_for_weeks(1, 83, "130")
+
+
+@pytest.mark.regression
+@pytest.mark.call_and_recall
+def test_update_invitation_rate_weekly(page: Page, tests_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.
+    """
+
+    # When I go to "Invitations Monitoring - Screening Centre"
+    CallAndRecallPage(page).go_to_planning_and_monitoring_page()
+
+    # And I click the link text "BCS001"
+    InvitationsMonitoringPage(page).go_to_invitation_plan_page(
+        tests_properties["screening_centre_code"]
+    )
+
+    # And I click the "Create a Plan" button
+    InvitationsPlansPage(page).go_to_create_a_plan_page()
+
+    # When I increase the Weekly Invitation Rate for week 1 by 1 and tab out of the cell
+    # Then the Cumulative Invitations Sent is incremented by 1 for week 1
+    # And the Cumulative Resulting Position is incremented by 1 for week 1
+    CreateAPlanPage(page).increment_invitation_rate_and_verify_changes()
diff --git a/tests/regression/call_and_recall/test_generate_fobt_invitation_regression.py b/tests/regression/call_and_recall/test_generate_fobt_invitation_regression.py
@@ -0,0 +1,64 @@
+import pytest
+from playwright.sync_api import Page
+from pages.base_page import BasePage
+from pages.call_and_recall.call_and_recall_page import CallAndRecallPage
+from pages.call_and_recall.invitations_monitoring_page import InvitationsMonitoringPage
+from pages.call_and_recall.generate_invitations_page import GenerateInvitationsPage
+from pages.call_and_recall.non_invitations_days_page import NonInvitationDaysPage
+from pages.call_and_recall.invitations_plans_page import InvitationsPlansPage
+from pages.call_and_recall.create_a_plan_page import CreateAPlanPage
+from utils.user_tools import UserTools
+
+
+@pytest.fixture(scope="function", autouse=True)
+def before_each(page: Page):
+    """
+    Before every test is executed, this fixture logs in to BCSS as a test user and navigates to the call and recall page
+    """
+    # Log in to BCSS
+    UserTools.user_login(page, "Hub Manager at BCS01")
+
+    # Go to call and recall page
+    BasePage(page).go_to_call_and_recall_page()
+
+
+# Scenario: Run FOBT invitations and process the S1 letter batch
+# Many feature scenarios need a subject at S9.
+#     When I generate invitations
+#     And I view the active batch list
+#     And I view the "Original" type "Open" status active letter batch for "S1" "Pre-invitation (FIT)"
+#     And I prepare the letter batch
+#     And I retrieve and confirm the letters
+#     Then there is a subject who meets the following criteria:
+#         | Latest episode kit class  | FIT   |
+#         | Latest event status       | S9    |
+#         | Latest episode type       | FOBT  |
+#         | Subject hub code          | BCS01 |
+
+# Scenario: User generates invitations for screening episodes (#3)
+# # Version copied from now-deleted UserPathway.feature - duplicate steps etc need to be sorted out
+#     Given I log in to BCSS "England" as user role "Hub Manager - State Registered"
+#     When I navigate to the Call and Recall > Generate Invitations Page
+#     And I press the Generate Invitations button and generate invitations
+#     Then Invitations are successfully generated
+
+
+@pytest.mark.regression
+@pytest.mark.call_and_recall
+def test_generate_fobt_invitations(page: Page) -> None:
+    """
+    Verifies that a user can generate FOBT invitations and process the S1 letter batch.
+    """
+    CallAndRecallPage(page).go_to_generate_invitations_page()
+    GenerateInvitationsPage(page).click_generate_invitations_button()
+
+    GenerateInvitationsPage(page).view_active_batch_list()
+    GenerateInvitationsPage(page).view_original_open_status_batch(
+        "S1", "Pre-invitation (FIT)"
+    )
+    GenerateInvitationsPage(page).prepare_letter_batch()
+    GenerateInvitationsPage(page).retrieve_and_confirm_letters()
+
+    GenerateInvitationsPage(page).verify_subject_meets_criteria(
+        kit_class="FIT", event_status="S9", episode_type="FOBT", hub_code="BCS01"
+    )
diff --git a/tests/regression/call_and_recall/test_non_invitation_days_regression.py b/tests/regression/call_and_recall/test_non_invitation_days_regression.py
diff --git a/users.json b/users.json
diff --git a/utils/table_util.py b/utils/table_util.py
