added CloseFobtScreeningEpisodePage POM

Author: Andyg79

pages/screening_subject_search/close_fobt_screening_episode_page.py

@@ -0,0 +1,34 @@
+from pages.base_page import BasePage
+from playwright.sync_api import Page
+
+
+class CloseFobtScreeningEpisodePage(BasePage):
+    """Close FOBT Screening Episode Page locators, and methods for interacting with the page."""
+
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page
+        self.close_fobt_screening_episode_button = self.page.get_by_role(
+            "button", name="Close FOBT Screening Episode"
+        )
+        self.reason_dropdown = self.page.locator("#CLOSE_REASON")
+        self.notes_textarea = self.page.locator("#UI_NOTES_TEXT")
+        self.final_close_button = self.page.locator("#UI_BUTTON_CLOSE")
+
+    def close_fobt_screening_episode(self, reason_text: str) -> None:
+        """
+        Complete the process of closing a FOBT screening episode.
+        Args:
+            reason_text (str): The visible text of the reason to select from the dropdown.
+        """
+        # Step 1: Trigger the dialog and accept it
+        self.safe_accept_dialog(self.close_fobt_screening_episode_button)
+
+        # Step 2: Select reason from dropdown
+        self.reason_dropdown.select_option(label=reason_text)
+
+        # Step 3: Enter note
+        self.notes_textarea.fill("automation test note")
+
+        # Step 4: Click final 'Close Episode' button
+        self.safe_accept_dialog(self.final_close_button)

pages/screening_subject_search/subject_screening_summary_page.py

@@ -44,7 +44,7 @@ def __init__(self, page: Page):
         self.update_subject_data = self.page.get_by_role(
             "button", name="Update Subject Data"
         )
-        self.close_fobt_screening_episode = self.page.get_by_role(
+        self.close_fobt_screening_episode_button = self.page.get_by_role(
             "button", name="Close FOBT Screening Episode"
         )
         self.a_page_to_advance_the_episode = self.page.get_by_text(
@@ -189,7 +189,7 @@ def click_update_subject_data(self) -> None:
 
     def click_close_fobt_screening_episode(self) -> None:
         """Click on the 'Close FOBT Screening Episode' button."""
-        self.click(self.close_fobt_screening_episode)
+        self.click(self.close_fobt_screening_episode_button)
 
     def go_to_a_page_to_advance_the_episode(self) -> None:
         """Click on the link to go to a page to advance the episode."""
@@ -381,7 +381,9 @@ def assert_screening_status(self, expected_status: str) -> None:
         assert (
             actual_status.lower() == expected_status.lower()
         ), f"[SCREENING STATUS MISMATCH] Expected '{expected_status}', but found '{actual_status}' in UI."
-        logging.info("[UI ASSERTIONS COMPLETE] Subject screening status checked in the UI")
+        logging.info(
+            "[UI ASSERTIONS COMPLETE] Subject screening status checked in the UI"
+        )
 
     def assert_latest_event_status(self, expected_status: str) -> None:
         """
@@ -397,7 +399,9 @@ def assert_latest_event_status(self, expected_status: str) -> None:
         assert (
             actual_status == expected_status
         ), f"[LATEST EVENT STATUS MISMATCH] Expected '{expected_status}', but found '{actual_status}' in UI."
-        logging.info("[UI ASSERTIONS COMPLETE] Subject latest event status checked in the UI")
+        logging.info(
+            "[UI ASSERTIONS COMPLETE] Subject latest event status checked in the UI"
+        )
 
     def click_reopen_fobt_screening_episode_button(self) -> None:
         """Click on the 'Reopen FOBT Screening Episode' button"""

tests/regression/regression_tests/fobt_regression_tests/test_scenario_4.py

@@ -16,6 +16,9 @@
 )
 from pages.communication_production.batch_list_page import BatchListPage
 from pages.logout.log_out_page import LogoutPage
+from pages.screening_subject_search.close_fobt_screening_episode_page import (
+    CloseFobtScreeningEpisodePage,
+)
 
 
 @pytest.mark.wip
@@ -131,22 +134,14 @@ def test_scenario_4(page: Page) -> None:
     )
 
     # Then there is a "S1" letter batch for my subject with the exact title "Pre-invitation (FIT)"
-    batch_processing(
-        page,
-        "S1",
-        "Pre-invitation (FIT)",
-        "S9 - Pre-invitation Sent",
-        True,
-    )
-
     # When I process the open "S1" letter batch for my subject
     # Then my subject has been updated as follows:
     batch_processing(
         page,
         "S1",
         "Pre-invitation (FIT)",
         "S9 - Pre-invitation Sent",
-        False,
+        True,
     )
 
     # When I view the subject
@@ -157,22 +152,14 @@ def test_scenario_4(page: Page) -> None:
 
     # When I run Timed Events for my subject
     # Then there is a "S9" letter batch for my subject with the exact title "Invitation & Test Kit (FIT)"
-    batch_processing(
-        page,
-        "S9",
-        "Invitation & Test Kit (FIT)",
-        "S10 - Invitation & Test Kit Sent",
-        True,
-    )
-
     # When I process the open "S9" letter batch for my subject
     # # Then my subject has been updated as follows:
     batch_processing(
         page,
         "S9",
         "Invitation & Test Kit (FIT)",
         "S10 - Invitation & Test Kit Sent",
-        False,
+        True,
     )
 
     # When I log my subject's latest unlogged FIT kit
@@ -202,42 +189,43 @@ def test_scenario_4(page: Page) -> None:
     # When I view the subject
     screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
 
+    # And I close the subject's episode for "Opt out of current episode"
+    CloseFobtScreeningEpisodePage(page).close_fobt_screening_episode(
+        "Opt out of current episode"
+    )
 
-# # And I close the subject's episode for "Opt out of current episode"
-# CallAndRecallUtils().close_episode(nhs_no, reason="Opt out of current episode")
-
+    # Then my subject has been updated as follows:
+    subject_assertion(
+        nhs_no,
+        {
+            "calculated FOBT due date": "2 years from episode end",
+            "calculated lynch due date": "Null",
+            "calculated surveillance due date": "Null",
+            "ceased confirmation date": "Null",
+            "ceased confirmation details": "Null",
+            "ceased confirmation user ID": "Null",
+            "clinical reason for cease": "Null",
+            "latest episode accumulated result": "Definitive abnormal FOBT outcome",
+            "latest episode recall calculation method": "S92 Interrupt Close Date",
+            "latest episode recall episode type": "FOBT Screening",
+            "latest episode recall surveillance type": "Null",
+            "latest episode status": "Closed",
+            "latest episode status reason": "Opt out of current episode",
+            "latest event status": "S92 Close Screening Episode via Interrupt",
+            "lynch due date": "Null",
+            "lynch due date date of change": "Unchanged",
+            "lynch due date reason": "Unchanged",
+            "screening due date": "Null",
+            "screening due date date of change": "Today",
+            "screening due date reason": "Awaiting failsafe",
+            "screening status": "Recall",
+            "screening status reason": "Recall",
+            "surveillance due date": "Null",
+            "surveillance due date date of change": "Unchanged",
+            "surveillance due date reason": "Unchanged",
+        },
+    )
 
-# # Then my subject has been updated as follows:
-# subject_assertion(
-#     nhs_no,
-#     {
-#         "calculated FOBT due date": "2 years from episode end",
-#         "calculated lynch due date": None,
-#         "calculated surveillance due date": None,
-#         "ceased confirmation date": None,
-#         "ceased confirmation details": None,
-#         "ceased confirmation user ID": None,
-#         "clinical reason for cease": None,
-#         "latest episode accumulated result": "Definitive abnormal FOBT outcome",
-#         "latest episode recall calculation method": "S92 Interrupt Close Date",
-#         "latest episode recall episode type": "FOBT Screening",
-#         "latest episode recall surveillance type": None,
-#         "latest episode status": "Closed",
-#         "latest episode status reason": "Opt out of current episode",
-#         "latest event status": "S92 Close Screening Episode via Interrupt",
-#         "lynch due date": None,
-#         "lynch due date date of change": "Unchanged",
-#         "lynch due date reason": "Unchanged",
-#         "screening due date": None,
-#         "screening due date date of change": "Today",
-#         "screening due date reason": "Awaiting failsafe",
-#         "screening status": "Recall",
-#         "screening status reason": "Recall",
-#         "surveillance due date": None,
-#         "surveillance due date date of change": "Unchanged",
-#         "surveillance due date reason": "Unchanged",
-#     },
-# )
 
 # # When I view the subject
 # screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)