Completing scenario 2 and refactoring methods.

Author: adrianoaru-nhs

pages/screening_subject_search/advance_surveillance_episode_page.py

@@ -4,16 +4,40 @@
 
 class AdvanceSurveillanceEpisodePage(AdvanceEpisodePage):
     """Advance Surveillance Episode Page locators, and methods for interacting with the page."""
-    
+
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        
+
         # Locators
-        self.discharge_from_surveillance_clinical_decision_button = self.page.get_by_role(
-            "button", name="Discharge from Surveillance - Clinical Decision"
+        self.discharge_from_surveillance_clinical_decision_button = (
+            self.page.get_by_role(
+                "button", name="Discharge from Surveillance - Clinical Decision"
+            )
+        )
+        self.discharge_from_screening_and_surveillance_clinical_decision_button = (
+            self.page.get_by_role(
+                "button",
+                name="Discharge from Screening and Surveillance - Clinical Decision",
+            )
+        )
+        self.book_surveillance_appointment_button = self.page.get_by_role(
+            "button", name="Book Surveillance Appointment"
         )
 
     def click_discharge_from_surveillance_clinical_decision_button(self) -> None:
         """Click on the 'Discharge from Surveillance - Clinical Decision' button."""
         self.click(self.discharge_from_surveillance_clinical_decision_button)
+
+    def click_discharge_from_screening_and_surveillance_clinical_decision_button(
+        self,
+    ) -> None:
+        """Click on the 'Discharge from Screening and Surveillance - Clinical Decision' button."""
+        self.click(
+            self.discharge_from_screening_and_surveillance_clinical_decision_button
+        )
+
+    def click_book_surveillance_appointment_button(self) -> None:
+        """Click on the 'Book Surveillance Appointment' button."""
+        self.safe_accept_dialog(self.book_surveillance_appointment_button)
+        self.page.wait_for_timeout(500)  # Timeout to allow subject to update on the DB.

pages/screening_subject_search/discharge_from_surveillance_page.py

@@ -13,20 +13,24 @@ def __init__(self, page: Page):
 
         # Locators
         self.date_decision_made_input_field = self.page.locator("#UI_OTHER_DATE")
-        self.screening_consultant_lookup_link = self.page.locator("#UI_CONSULTANT_PIO_SELECT_LINK")
-        self.screening_pracitioner_dropdown = self.page.locator("#UI_SCREENING_PRACTITIONER")
-        self.notes_field = self.page.locator("#UI_NOTES")
-        self.save_button = self.page.get_by_role(
-            "button", name="Save"
+        self.screening_consultant_lookup_link = self.page.locator(
+            "#UI_CONSULTANT_PIO_SELECT_LINK"
+        )
+        self.screening_pracitioner_dropdown = self.page.locator(
+            "#UI_SCREENING_PRACTITIONER"
         )
+        self.notes_field = self.page.locator("#UI_NOTES")
+        self.save_button = self.page.get_by_role("button", name="Save")
 
     def enter_date_decition_made(self, date: datetime) -> None:
         """
         Enter a date into the 'Date Decision Made' field
         Args:
             date (datetime): the date to enter.
         """
-        CalendarPicker(self.page).calendar_picker_ddmmyyyy(date, self.date_decision_made_input_field)
+        CalendarPicker(self.page).calendar_picker_ddmmyyyy(
+            date, self.date_decision_made_input_field
+        )
 
     def select_screening_consultant_from_index(self, index: int) -> None:
         """
@@ -63,7 +67,9 @@ def click_save_button(self) -> None:
         """Click on the 'Save' button."""
         self.safe_accept_dialog(self.save_button)
 
-    def complete_discharge_from_surveillance_form(self, include_screening_consultant: bool) -> None:
+    def complete_discharge_from_surveillance_form(
+        self, include_screening_consultant: bool
+    ) -> None:
         """
         Completes the discharge from surveillance form.
         Args:
@@ -75,4 +81,6 @@ def complete_discharge_from_surveillance_form(self, include_screening_consultant
         self.select_screening_pracitioner_from_index(1)
         self.fill_notes_field("Notes for subject being discharged")
         self.click_save_button()
-        
+        self.page.wait_for_timeout(
+            1000
+        )  # Timeout to allow subject to be updated on the DB.

pages/screening_subject_search/reopen_episode_page.py

@@ -0,0 +1,68 @@
+from playwright.sync_api import Page
+from pages.base_page import BasePage
+
+
+class ReopenEpisodePage(BasePage):
+    """Reopen Episode Page locators, and methods for interacting with the page."""
+
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page
+
+        self.reopen_to_book_an_assessment_button = self.page.get_by_role(
+            "button", name="Reopen to book an assessment"
+        )
+        self.reopen_episode_for_correction_button = self.page.get_by_role(
+            "button", name="Reopen episode for correction"
+        )
+        self.reopen_due_to_subject_or_patient_decision = self.page.get_by_role(
+            "button", name="Reopen due to subject or patient decision"
+        )
+        self.reopen_following_non_response_button = self.page.get_by_role(
+            "button", name="Reopen following Non-Response"
+        )
+        self.reopen_to_confirm_diagnostic_test_result_and_outcome_button = (
+            self.page.get_by_role(
+                "button", name="Reopen to Confirm Diagnostic Test Result and Outcome"
+            )
+        )
+        self.reopen_to_reschedule_diagnostic_test_button = self.page.get_by_role(
+            "button", name="Reopen to Reschedule Diagnostic Test"
+        )
+        self.reopen_to_rerecord_outcome_from_symptomatic_referral_button = (
+            self.page.get_by_role(
+                "button", name="Reopen to Re-record Outcome from Symptomatic Referral"
+            )
+        )
+
+    def click_reopen_to_book_an_assessment_button(self) -> None:
+        """Click the 'Reopen to book an assessment' button."""
+        self.safe_accept_dialog(self.reopen_to_book_an_assessment_button)
+
+    def click_reopen_episode_for_correction_button(self) -> None:
+        """Click the 'Reopen episode for correction' button."""
+        self.safe_accept_dialog(self.reopen_episode_for_correction_button)
+
+    def click_reopen_due_to_subject_or_patient_decision(self) -> None:
+        """Click the 'Reopen due to subject or patient decision' button."""
+        self.safe_accept_dialog(self.reopen_due_to_subject_or_patient_decision)
+
+    def click_reopen_following_non_response_button(self) -> None:
+        """Click the 'Reopen following Non-Response' button."""
+        self.safe_accept_dialog(self.reopen_following_non_response_button)
+
+    def click_reopen_to_confirm_diagnostic_test_result_and_outcome_button(self) -> None:
+        """Click the 'Reopen to Confirm Diagnostic Test Result and Outcome' button."""
+        self.safe_accept_dialog(
+            self.reopen_to_confirm_diagnostic_test_result_and_outcome_button
+        )
+
+    def click_reopen_to_reschedule_diagnostic_test_button(self) -> None:
+        """Click the 'Reopen to Reschedule Diagnostic Test' button."""
+        self.safe_accept_dialog(self.reopen_to_reschedule_diagnostic_test_button)
+
+    def click_reopen_to_rerecord_outcome_from_symptomatic_referral_button(self) -> None:
+        """Click the 'Reopen to Re-record Outcome from Symptomatic Referral' button."""
+        self.safe_accept_dialog(
+            self.reopen_to_rerecord_outcome_from_symptomatic_referral_button
+        )

pages/screening_subject_search/reopen_fobt_screening_episode_page.py

@@ -1,68 +1,10 @@
 from playwright.sync_api import Page
-from pages.base_page import BasePage
+from pages.screening_subject_search.reopen_episode_page import ReopenEpisodePage
 
 
-class ReopenFOBTScreeningEpisodePage(BasePage):
+class ReopenFOBTScreeningEpisodePage(ReopenEpisodePage):
     """Reopen FOBT Screening Episode Page locators, and methods for interacting with the page."""
 
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-
-        self.reopen_to_book_an_assessment_button = self.page.get_by_role(
-            "button", name="Reopen to book an assessment"
-        )
-        self.reopen_episode_for_correction_button = self.page.get_by_role(
-            "button", name="Reopen episode for correction"
-        )
-        self.reopen_due_to_subject_or_patient_decision = self.page.get_by_role(
-            "button", name="Reopen due to subject or patient decision"
-        )
-        self.reopen_following_non_response_button = self.page.get_by_role(
-            "button", name="Reopen following Non-Response"
-        )
-        self.reopen_to_confirm_diagnostic_test_result_and_outcome_button = (
-            self.page.get_by_role(
-                "button", name="Reopen to Confirm Diagnostic Test Result and Outcome"
-            )
-        )
-        self.reopen_to_reschedule_diagnostic_test_button = self.page.get_by_role(
-            "button", name="Reopen to Reschedule Diagnostic Test"
-        )
-        self.reopen_to_rerecord_outcome_from_symptomatic_referral_button = (
-            self.page.get_by_role(
-                "button", name="Reopen to Re-record Outcome from Symptomatic Referral"
-            )
-        )
-
-    def click_reopen_to_book_an_assessment_button(self) -> None:
-        """Click the 'Reopen to book an assessment' button."""
-        self.safe_accept_dialog(self.reopen_to_book_an_assessment_button)
-
-    def click_reopen_episode_for_correction_button(self) -> None:
-        """Click the 'Reopen episode for correction' button."""
-        self.safe_accept_dialog(self.reopen_episode_for_correction_button)
-
-    def click_reopen_due_to_subject_or_patient_decision(self) -> None:
-        """Click the 'Reopen due to subject or patient decision' button."""
-        self.safe_accept_dialog(self.reopen_due_to_subject_or_patient_decision)
-
-    def click_reopen_following_non_response_button(self) -> None:
-        """Click the 'Reopen following Non-Response' button."""
-        self.safe_accept_dialog(self.reopen_following_non_response_button)
-
-    def click_reopen_to_confirm_diagnostic_test_result_and_outcome_button(self) -> None:
-        """Click the 'Reopen to Confirm Diagnostic Test Result and Outcome' button."""
-        self.safe_accept_dialog(
-            self.reopen_to_confirm_diagnostic_test_result_and_outcome_button
-        )
-
-    def click_reopen_to_reschedule_diagnostic_test_button(self) -> None:
-        """Click the 'Reopen to Reschedule Diagnostic Test' button."""
-        self.safe_accept_dialog(self.reopen_to_reschedule_diagnostic_test_button)
-
-    def click_reopen_to_rerecord_outcome_from_symptomatic_referral_button(self) -> None:
-        """Click the 'Reopen to Re-record Outcome from Symptomatic Referral' button."""
-        self.safe_accept_dialog(
-            self.reopen_to_rerecord_outcome_from_symptomatic_referral_button
-        )

pages/screening_subject_search/reopen_surveillance_episode_page.py

@@ -0,0 +1,10 @@
+from playwright.sync_api import Page
+from pages.screening_subject_search.reopen_episode_page import ReopenEpisodePage
+
+
+class ReopenSurveillanceEpisodePage(ReopenEpisodePage):
+    """Reopen Surveillance Episode Page locators, and methods for interacting with the page."""
+
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page

pages/screening_subject_search/subject_screening_summary_page.py

@@ -106,6 +106,9 @@ def __init__(self, page: Page):
         self.reopen_fobt_screening_episode_button = self.page.get_by_role(
             "button", name="Reopen FOBT Screening Episode"
         )
+        self.reopen_surveillance_episode_button = self.page.get_by_role(
+            "button", name="Reopen Surveillance Episode"
+        )
         self.reopen_for_correction_button = self.page.get_by_role(
             "button", name="Reopen episode for correction"
         )
@@ -441,6 +444,10 @@ def click_reopen_fobt_screening_episode_button(self) -> None:
         """Click on the 'Reopen FOBT Screening Episode' button"""
         self.click(self.reopen_fobt_screening_episode_button)
 
+    def click_reopen_surveillance_episode_button(self) -> None:
+        """Click on the 'Reopen Surveillance Episode' button"""
+        self.click(self.reopen_surveillance_episode_button)
+
     def reopen_fobt_screening_episode(self) -> None:
         """
         Reopen a previously closed FOBT screening episode, including confirmation modal.

tests/regression/regression_tests/fobt_regression_tests/test_fobt_scenario_10.py

@@ -615,7 +615,7 @@ def test_scenario_10(page: Page) -> None:
 
     # And I set the practitioner appointment date to "today"
     # And I book the earliest available post investigation appointment on this date
-    book_post_investigation_appointment(page, "The Royal Hospital (Wolverhampton)", 1)
+    book_post_investigation_appointment(page, "The Royal Hospital (Wolverhampton)")
 
     # Then my subject has been updated as follows:
     subject_assertion(

tests/regression/regression_tests/fobt_regression_tests/test_fobt_scenario_11.py

@@ -600,7 +600,7 @@ def test_scenario_11(page: Page) -> None:
 
     # And I set the practitioner appointment date to "today"
     # And I book the earliest available post investigation appointment on this date
-    book_post_investigation_appointment(page, "The Royal Hospital (Wolverhampton)", 1)
+    book_post_investigation_appointment(page, "The Royal Hospital (Wolverhampton)")
 
     # Then my subject has been updated as follows:
     subject_assertion(
@@ -672,9 +672,7 @@ def test_scenario_11(page: Page) -> None:
     # And I set the practitioner appointment date to "today"
     # And I book the earliest available post investigation appointment on this date
     book_post_investigation_appointment(
-        page=page,
-        site="The Royal Hospital (Wolverhampton)",
-        screening_practitioner_index=1,
+        page=page, site="The Royal Hospital (Wolverhampton)"
     )
 
     # Then my subject has been updated as follows:

tests/regression/regression_tests/fobt_regression_tests/test_fobt_scenario_12.py

@@ -57,7 +57,9 @@
     YesNoOptions,
     EndoscopyLocationOptions,
 )
-from pages.screening_subject_search.non_neoplastic_result_from_symptomatic_procedure_page import (NonNeoplasticResultFromSymptomaticProcedurePage)
+from pages.screening_subject_search.non_neoplastic_result_from_symptomatic_procedure_page import (
+    NonNeoplasticResultFromSymptomaticProcedurePage,
+)
 from utils.subject_demographics import SubjectDemographicUtil
 from pages.screening_subject_search.reopen_fobt_screening_episode_page import (
     ReopenFOBTScreeningEpisodePage,
@@ -431,7 +433,7 @@ def test_scenario_12(page: Page) -> None:
 
     # And I set the practitioner appointment date to "today"
     # And I book the earliest available post investigation appointment on this date
-    book_post_investigation_appointment(page, "The Royal Hospital (Wolverhampton)", 1)
+    book_post_investigation_appointment(page, "The Royal Hospital (Wolverhampton)")
 
     # Then my subject has been updated as follows:
     subject_assertion(

tests/regression/regression_tests/fobt_regression_tests/test_fobt_scenario_14.py

@@ -677,7 +677,7 @@ def test_scenario_14(page: Page) -> None:
     SubjectScreeningSummaryPage(page).click_book_practitioner_clinic_button()
     #  And I set the practitioner appointment date to "today"
     # And I book the "earliest" available practitioner appointment on this date
-    book_post_investigation_appointment(page, "The Royal Hospital (Wolverhampton)", 1)
+    book_post_investigation_appointment(page, "The Royal Hospital (Wolverhampton)")
     # Then my subject has been updated as follows:
     subject_assertion(
         nhs_no,