addressed pr comments

Author: Andyg79

pages/manual_cease/manual_cease_page.py

@@ -1,4 +1,7 @@
 from playwright.sync_api import Page
+import logging
+from datetime import datetime
+from pages.base_page import BasePage
 
 
 class ManualCeasePage:
@@ -23,3 +26,47 @@ def __init__(self, page: Page):
             "button", name="Record Return of Disclaimer Letter"
         )
         self.notes_field = page.get_by_label("Notes")
+
+    def click_request_cease(self):
+        self.request_cease_button.click()
+
+    def select_cease_reason(self, reason: str):
+        self.cease_reason_dropdown.select_option(label=reason)
+
+    def click_save_request_cease(self):
+        self.save_request_cease_button.click()
+
+    def record_disclaimer_sent(self):
+        self.record_disclaimer_sent_button.click()
+
+    def confirm_disclaimer_sent(self):
+        self.confirm_disclaimer_sent_button.click()
+
+    def record_return_of_disclaimer(self):
+        self.record_return_disclaimer_button.click()
+
+    def fill_notes_and_date(self, notes: str = "AUTO TEST: notes"):
+        self.notes_field.fill(notes)
+        today_str = datetime.today().strftime("%d/%m/%Y")
+        self.date_confirmed_field.fill(today_str)
+
+    def confirm_cease(self):
+        BasePage(self.page).safe_accept_dialog(self.confirm_cease_button)
+
+    def fill_notes_if_visible(self, notes: str = "AUTO TEST: notes"):
+        if self.notes_textbox.is_visible():
+            self.notes_textbox.fill(notes)
+
+    def fill_date_if_visible(self, date_str: str):
+        if self.date_confirmed_field.is_visible():
+            self.date_confirmed_field.fill(date_str)
+
+    def confirm_or_save_cease(self):
+        if self.confirm_cease_button.is_visible():
+            BasePage(self.page).safe_accept_dialog(self.confirm_cease_button)
+
+        elif self.save_request_cease_button.is_visible():
+            self.save_request_cease_button.click()
+        else:
+            logging.error("No cease confirmation button found!")
+            raise RuntimeError("Cease button not found on the page")

tests/regression/manual_cease/test_manually_cease_a_subject.py

@@ -52,6 +52,7 @@ def base_expected_db() -> dict[str, Any]:
 
 # These scenarios just check that manually ceasing a subject (either immediately or via a disclaimer letter) from different statuses correctly sets their screening status and status reason.
 # Screening due date reason is always set to "Ceased" during a manual cease, even if the SDD is not changing.
+@pytest.mark.wip
 @pytest.mark.vpn_required
 @pytest.mark.manual_cease_tests
 @pytest.mark.regression
@@ -146,6 +147,7 @@ def test_manual_cease_from_inactive_subject_for_informed_dissent(
     logging.info("[ASSERTIONS COMPLETE] Manual cease scenario validated successfully")
 
 
+@pytest.mark.wip
 @pytest.mark.vpn_required
 @pytest.mark.manual_cease_tests
 @pytest.mark.regression
@@ -256,6 +258,7 @@ def test_manual_cease_from_call_subject_for_informed_dissent_verbal_only(
     logging.info("[ASSERTIONS COMPLETE] Manual cease scenario validated successfully")
 
 
+@pytest.mark.wip
 @pytest.mark.vpn_required
 @pytest.mark.manual_cease_tests
 @pytest.mark.regression
@@ -364,6 +367,7 @@ def test_manual_cease_from_recall_subject_for_no_colon_subject_request(
     logging.info("[ASSERTIONS COMPLETE] Manual cease scenario validated successfully")
 
 
+@pytest.mark.wip
 @pytest.mark.vpn_required
 @pytest.mark.manual_cease_tests
 @pytest.mark.regression
@@ -467,6 +471,7 @@ def test_manual_cease_from_surveillance_subject_for_no_colon_programme_assessed(
     )
 
 
+@pytest.mark.wip
 @pytest.mark.vpn_required
 @pytest.mark.manual_cease_tests
 @pytest.mark.regression
@@ -572,6 +577,7 @@ def test_manual_cease_from_already_ceased_subject_for_informal_death(
     )
 
 
+@pytest.mark.wip
 @pytest.mark.vpn_required
 @pytest.mark.manual_cease_tests
 @pytest.mark.regression

utils/manual_cease.py

@@ -1,7 +1,6 @@
 import logging
 import pandas as pd
 from utils.oracle.oracle import OracleDB
-from pages.base_page import BasePage
 from datetime import datetime, date
 from enum import IntEnum
 from pages.manual_cease.manual_cease_page import ManualCeasePage
@@ -111,15 +110,15 @@ def process_manual_cease_with_disclaimer(
             )
 
             # Step 1: Click "Request Cease"
-            manual_cease_page.request_cease_button.click()
+            manual_cease_page.click_request_cease()
             logging.info("[STEP 1] Clicked 'Request Cease'")
 
             # Step 2: Select reason
-            manual_cease_page.cease_reason_dropdown.select_option(label=reason)
+            manual_cease_page.select_cease_reason(reason)
             logging.info(f"[STEP 2] Selected cease reason: {reason}")
 
             # Step 3: Save cease request
-            manual_cease_page.save_request_cease_button.click()
+            manual_cease_page.click_save_request_cease()
             logging.info("[STEP 3] Clicked 'Save Request Cease'")
 
         except TimeoutError:
@@ -128,26 +127,23 @@ def process_manual_cease_with_disclaimer(
             )
 
         # Step 4: Record Disclaimer Letter Sent
-        manual_cease_page.record_disclaimer_sent_button.click()
+        manual_cease_page.record_disclaimer_sent()
         logging.info("[STEP 4] Clicked 'Record Disclaimer Letter Sent'")
 
         # Step 5: Confirm manual sending of disclaimer letter
-        manual_cease_page.confirm_disclaimer_sent_button.click()
+        manual_cease_page.confirm_disclaimer_sent()
         logging.info("[STEP 5] Confirmed disclaimer letter sent")
 
         # Step 6: Record Return of Disclaimer letter
-        manual_cease_page.record_return_disclaimer_button.click()
+        manual_cease_page.record_return_of_disclaimer()
         logging.info("[STEP 6] Clicked 'Record Return of Disclaimer Letter'")
 
         # Step 7: Final confirmation (Record Informed Dissent screen)
-        manual_cease_page.notes_field.fill("AUTO TEST: notes")
-        today_str = datetime.today().strftime("%d/%m/%Y")
-        manual_cease_page.date_confirmed_field.fill(today_str)
-        logging.info(f"[STEP 7] Entered date: {today_str} and note")
+        manual_cease_page.fill_notes_and_date()
+        logging.info(f"[STEP 7] Entered note and today's date")
 
-        BasePage(manual_cease_page.page).safe_accept_dialog(
-            manual_cease_page.confirm_cease_button
-        )
+        # Step 8: Confirm cease
+        manual_cease_page.confirm_cease()
         logging.info("[STEP 8] Clicked 'Confirm Cease'")
 
     @staticmethod
@@ -168,36 +164,22 @@ def process_manual_cease_immediate(
         logging.info("[MANUAL CEASE] Starting full cease workflow")
 
         # Step 1: Click "Request Cease"
-        manual_cease_page.request_cease_button.click()
+        manual_cease_page.click_request_cease()
         logging.info("[STEP 1] Clicked 'Request Cease'")
 
         # Step 2: Select reason from dropdown
-        manual_cease_page.cease_reason_dropdown.select_option(label=reason)
+        manual_cease_page.select_cease_reason(reason)
         logging.info(f"[STEP 2] Selected cease reason: {reason}")
 
         # Step 3: Conditionally enter notes and today's date
         today_str = datetime.today().strftime("%d/%m/%Y")
-
-        if manual_cease_page.notes_textbox.is_visible():
-            manual_cease_page.notes_textbox.fill("AUTO TEST: notes")
-            logging.info("[STEP 3] Entered note")
-
-        if manual_cease_page.date_confirmed_field.is_visible():
-            manual_cease_page.date_confirmed_field.fill(today_str)
-            logging.info(f"[STEP 3] Entered date: {today_str}")
+        manual_cease_page.fill_notes_if_visible()
+        manual_cease_page.fill_date_if_visible(today_str)
+        logging.info("[STEP 3] Entered note and today's date: {date_str}")
 
         # Step 4: Confirm cease via available button
-        if manual_cease_page.confirm_cease_button.is_visible():
-            BasePage(manual_cease_page.page).safe_accept_dialog(
-                manual_cease_page.confirm_cease_button
-            )
-            logging.info("[STEP 4] Clicked 'Confirm Cease'")
-        elif manual_cease_page.save_request_cease_button.is_visible():
-            manual_cease_page.save_request_cease_button.click()
-            logging.info("[STEP 4] Clicked 'Save Request Cease'")
-        else:
-            logging.error("[STEP 4] No cease confirmation button found!")
-            raise RuntimeError("Cease button not found on the page")
+        manual_cease_page.confirm_or_save_cease()
+        logging.info("[STEP 4] Clicked 'Confirm Cease' or 'Save Request Cease'")
 
     @staticmethod
     def verify_manual_cease_db_fields_dynamic(