Changed record_diagnosis_date_with_reason to record_diagnosis_reason

Author: Andyg79

pages/screening_subject_search/record_diagnosis_date_page.py

@@ -10,8 +10,10 @@ class RecordDiagnosisDatePage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
+
         # Record Diagnosis Date - page locators
         self.diagnosis_date_field = self.page.locator("#diagnosisDate")
+        self.reason_dropdown = self.page.locator("#reason")
         self.save_button = self.page.get_by_role("button", name="Save")
 
     def enter_date_in_diagnosis_date_field(self, date: datetime) -> None:
@@ -42,18 +44,22 @@ def get_alert_message(self) -> str:
         else:
             return ""
 
-    def record_diagnosis_date_with_reason(self, date: datetime, reason_text: str) -> None:
+
+    def record_diagnosis_reason(self, reason_text: str) -> None:
         """
-        Records a diagnosis date and selects a reason before saving.
+        Selects a diagnosis reason from the dropdown and saves the form.
 
         Args:
-            date (datetime): The diagnosis date to enter.
             reason_text (str): The visible text of the reason to select.
+                Valid options include:
+                - "Patient declined all appointments"
+                - "2 DNAs of colonoscopy assessment appt"
+                - "Patient emigrated"
+                - "Patient deceased"
+                - "Patient choice"
+                - "Patient could not be contacted"
+                - "Reopened old episode, date unknown"
+                - "Other"
         """
-        self.enter_date_in_diagnosis_date_field(date)
-
-        reason_dropdown = self.page.locator("#DIAGNOSIS_REASON")  # Replace with actual ID
-        reason_dropdown.select_option(label=reason_text)
-
+        self.reason_dropdown.select_option(label=reason_text)
         self.safe_accept_dialog(self.save_button)
-

tests/regression/regression_tests/fobt_regression_tests/test_scenario_4.py

@@ -34,7 +34,6 @@
 )
 
 
-@pytest.mark.wip
 @pytest.mark.usefixtures("setup_org_and_appointments")
 @pytest.mark.vpn_required
 @pytest.mark.regression
@@ -352,6 +351,8 @@ def test_scenario_4(page: Page) -> None:
         },
     )
 
+
+def test_process_j4_letter_batch(page: Page, nhs_no: str) -> None:
     # When I process the open "J4" letter batch for my subject
     # # Then my subject has been updated as follows:
     batch_processing(
@@ -421,7 +422,7 @@ def test_scenario_4(page: Page) -> None:
         ReasonForCancellationOptions.PATIENT_UNSUITABLE_RECENTLY_SCREENED
     )
 
-    # And I press OK on my confirmation prompt TODO: This step is resulting in a 403 forbidden error
+    # And I press OK on my confirmation prompt
     AppointmentDetailPage(page).click_save_button(accept_dialog=True)
 
     # Then my subject has been updated as follows:
@@ -459,10 +460,10 @@ def test_scenario_4(page: Page) -> None:
     # And I select the advance episode option for "Record Diagnosis Date"
     AdvanceFOBTScreeningEpisodePage(page).click_record_diagnosis_date_button()
 
-    # And I enter a Diagnosis Date of "today"
-    RecordDiagnosisDatePage(page).enter_date_in_diagnosis_date_field(datetime.today())
+    # And I select Diagnosis Date Reason "Patient choice"
+    RecordDiagnosisDatePage(page).record_diagnosis_reason(reason_text="Patient Choice")
 
-    # # And I save Diagnosis Date Information
+    # And I save Diagnosis Date Information
     RecordDiagnosisDatePage(page).click_save_button()
 
     # Then my subject has been updated as follows: