Started refactoring work previously done on this ticket

Author: Andyg79

pages/subject/subject_lynch_page.py

@@ -1,104 +1,70 @@
-from playwright.sync_api import Page, expect
+from playwright.sync_api import Page
 from pages.base_page import BasePage
+import logging
 
-class SubjectPage(BasePage):
 
-    def __init__(
-        self,
-        page: Page,
-        hub_manager_role: str,
-        lynch_diagnosis_type: str,
-        subject_age: int,
-        diagnosis_date: str,
-        last_colonoscopy_date: str,
-        default_pause_seconds: int,
-        screening_status_lynch_self_referral: str,
-        expected_self_referral_updates: dict,
-        expected_seeking_further_data_updates: dict,
-        expected_reset_seeking_further_data_updates: dict,
-    ):
+class SubjectPage(BasePage):
+    """Page object for interacting with subject-related actions."""
 
+    def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        self.hub_manager_role = hub_manager_role
-        self.lynch_diagnosis_type = lynch_diagnosis_type
-        self.subject_age = subject_age
-        self.diagnosis_date = diagnosis_date
-        self.last_colonoscopy_date = last_colonoscopy_date
-        self.default_pause_seconds = default_pause_seconds
-        self.screening_status_lynch_self_referral = screening_status_lynch_self_referral
-        self.expected_self_referral_updates = expected_self_referral_updates
-        self.expected_seeking_further_data_updates = expected_seeking_further_data_updates
-        self.expected_reset_seeking_further_data_updates = expected_reset_seeking_further_data_updates
-
-    # Class attributes for test data and expected results
-
-    hub_manager_role = "Hub Manager"
-    lynch_diagnosis_type = "EPCAM"
-    subject_age = 75
-    diagnosis_date = "3 years ago"
-    last_colonoscopy_date = "2 years ago"
-    default_pause_seconds = 5
-    screening_status_lynch_self_referral = "Lynch Self-referral"
-
-    expected_self_referral_updates = {
-        # ... (your expected values here)
-    }
-    expected_seeking_further_data_updates = {
-        # ... (your expected values here)
-    }
-    expected_reset_seeking_further_data_updates = {
-        # ... (your expected values here)
-    }
-
-    def receive_lynch_diagnosis(self, diagnosis_type, age, diagnosis_date, last_colonoscopy_date):
-        """
-        Implement UI steps to receive Lynch diagnosis for a subject.
-        """
-        # Example: Fill diagnosis form fields and submit
-        pass
 
-    def pause_for_processing(self, seconds):
-        """
-        Pause for the specified number of seconds to allow processing.
-        """
-        self.page.wait_for_timeout(seconds * 1000)
+    class TestData:
+        hub_manager_role = "Hub Manager"
+        lynch_diagnosis_type = "EPCAM"
+        subject_age = 75
+        diagnosis_date = "3 years ago"
+        last_colonoscopy_date = "2 years ago"
+        screening_status_lynch_self_referral = "Lynch Self-referral"
 
-    def self_refer_subject(self):
-        """
-        Implement UI steps to self-refer the subject.
-        """
-        # Example: Click self-referral button
-        pass
+    def self_refer_subject(self) -> None:
+        """Implement UI steps to self-refer the subject."""
+        logging.warning("[TODO] self_refer_subject not yet implemented.")
+        # TODO: Implement UI steps to self-refer the subject
 
-    def confirm_prompt(self):
-        """
-        Implement UI steps to confirm the prompt (e.g., confirmation dialog).
-        """
-        # Example: Accept confirmation dialog
-        pass
+    def confirm_prompt(self) -> None:
+        """Implement UI steps to confirm the prompt (e.g., confirmation dialog)."""
+        logging.warning("[TODO] confirm_prompt not yet implemented.")
+        # TODO: Implement UI steps to confirm the prompt
 
-    def assert_subject_updates(self, expected_updates: dict):
-        """
-        Assert that subject details match the expected updates.
-        """
-        for key, expected_value in expected_updates.items():
-            locator = self.page.get_by_text(key)
-            expect(locator).to_be_visible()
-            # Optionally, check the value displayed next to the key
-            # value_locator = locator.locator("xpath=following-sibling::*[1]")
-            # expect(value_locator).to_have_text(expected_value)
-
-    def set_seeking_further_data(self):
-        """
-        Implement UI steps to set the subject to Seeking Further Data.
-        """
-        # Example: Select status from dropdown and save
-        pass
+    def set_seeking_further_data(self) -> None:
+        """Set the subject to Seeking Further Data."""
+
+        logging.info(
+            "[UI ACTION] Setting screening status to 'Seeking Further Data' with reason 'Uncertified Death'"
+        )
+
+        # Select 'Seeking Further Data' from the screening status dropdown
+        self.page.get_by_label("Change Screening Status").select_option("4007") # Seeking Further Data
+
+        # Select 'Uncertified Death' as the reason
+        self.page.get_by_label("Reason", exact=True).select_option("11314") # Uncertified Death
 
-    def set_screening_status(self, status):
+        # Click the update button
+        self.page.get_by_role("button", name="Update Subject Data").click()
+
+    def set_screening_status(self, status) -> None:
+        """Set the screening status."""
+        logging.warning("[TODO] set_screening_status not yet implemented.")
+        # TODO: Implement UI steps to set the screening status
+
+    def receive_lynch_diagnosis(
+        self, diagnosis_type, age, diagnosis_date, last_colonoscopy_date=None
+    ) -> None:
         """
-        Implement UI steps to set the screening status.
+        Simulates receiving a Lynch diagnosis for a subject via the UI.
         """
-        # Example: Select status from dropdown and save
-        pass
+        logging.info(
+            f"[UI ACTION] Receiving Lynch diagnosis: {diagnosis_type}, age={age}, diagnosis_date={diagnosis_date}, colonoscopy={last_colonoscopy_date}"
+        )
+
+        # Example UI interactions
+        self.page.get_by_label("Diagnosis Type").select_option(diagnosis_type)
+        self.page.get_by_label("Age").fill(str(age))
+        self.page.get_by_label("Diagnosis Date").fill(diagnosis_date)
+
+        if last_colonoscopy_date:
+            self.page.get_by_label("Last Colonoscopy Date").fill(last_colonoscopy_date)
+
+        self.page.get_by_role("button", name="Submit").click()

pytest.ini

@@ -55,3 +55,4 @@ markers =
     spine_retrieval_search_tests: tests that are part of subject spine retrieval demographics
     hub_user_tests: tests that are part of the hub user test suite
     fobt_regression_tests: tests that are part of the fobt regression test suite
+    lynch_self_referral_tests: tests that are part of the lynch self referral test suite