Merge branch 'main' of github.com:NHSDigital/bcss-playwright into feature/BCSS-20327-compartment-5-utils

# Conflicts:
#	tests/smokescreen/test_compartment_5.py

Author: adrianoaru-nhs

pages/datasets/colonoscopy_dataset_page.py

@@ -38,21 +38,21 @@ def select_asa_grade_option(self, option: str) -> None:
         """
         This method is designed to select a specific grade option from the colonoscopy dataset page, ASA Grade dropdown menu.
         Args:
-        option (str): The ASA grade option to be selected. This should be a string that matches one of the available options in the dropdown menu.
-            Valid options are: "FIT", "RELEVANT_DISEASE", "UNABLE_TO_ASSESS", RESTRICTIVE_DISEASE, "LIFE_THREATENING_DISEASE", "MORIBUND", "NOT_APPLICABLE", or "NOT_KNOWN".
+            option (str): The ASA grade option to be selected. This should be a string that matches one of the available options in the dropdown menu.
+                Valid options are: "FIT", "RELEVANT_DISEASE", "UNABLE_TO_ASSESS", RESTRICTIVE_DISEASE, "LIFE_THREATENING_DISEASE", "MORIBUND", "NOT_APPLICABLE", or "NOT_KNOWN".
         Returns:
-        None
+            None
         """
         self.select_asa_grade_dropdown.select_option(option)
 
     def select_fit_for_colonoscopy_option(self, option: str) -> None:
         """
         This method is designed to select a specific option from the colonoscopy dataset page, Fit for Colonoscopy (SSP) dropdown menu.
         Args:
-        option (str): The option to be selected. This should be a string that matches one of the available options in the dropdown menu.
-            Valid options are: "YES", "NO", or "UNABLE_TO_ASSESS".
+            option (str): The option to be selected. This should be a string that matches one of the available options in the dropdown menu.
+                Valid options are: "YES", "NO", or "UNABLE_TO_ASSESS".
         Returns:
-        None
+            None
         """
         self.select_fit_for_colonoscopy_dropdown.select_option(option)
 

pages/screening_subject_search/contact_with_patient_page.py

@@ -0,0 +1,48 @@
+from playwright.sync_api import Page
+from pages.base_page import BasePage
+
+
+class ContactWithPatientPage(BasePage):
+    """
+    ContactWithPatientPage class for interacting with 'Contact With Patient' page elements.
+    """
+
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page
+
+        # Contact With Patient - Page Locators
+        self.contact_direction_dropdown = self.page.locator("#UI_DIRECTION")
+        self.contact_made_between_patient_and_dropdown = self.page.locator(
+            "#UI_CALLER_ID"
+        )
+        self.calendar_button = self.page.get_by_role("button", name="Calendar")
+        self.start_time_field = self.page.locator("#UI_START_TIME")
+        self.end_time_field = self.page.locator("#UI_END_TIME")
+        self.discussion_record_text_field = self.page.locator("#UI_COMMENT_ID")
+        self.outcome_dropdown = self.page.locator("#UI_OUTCOME")
+        self.save_button = self.page.get_by_role("button", name="Save")
+
+    def select_direction_dropdown_option(self, direction: str) -> None:
+        self.contact_direction_dropdown.select_option(label=direction)
+
+    def select_caller_id_dropdown_index_option(self, index_value: int) -> None:
+        self.contact_made_between_patient_and_dropdown.select_option(index=index_value)
+
+    def click_calendar_button(self) -> None:
+        self.click(self.calendar_button)
+
+    def enter_start_time(self, start_time: str) -> None:
+        self.start_time_field.fill(start_time)
+
+    def enter_end_time(self, end_time: str) -> None:
+        self.end_time_field.fill(end_time)
+
+    def enter_discussion_record_text(self, value: str) -> None:
+        self.discussion_record_text_field.fill(value)
+
+    def select_outcome_dropdown_option(self, outcome: str) -> None:
+        self.outcome_dropdown.select_option(label=outcome)
+
+    def click_save_button(self) -> None:
+        self.click(self.save_button)

tests/smokescreen/test_compartment_5.py

@@ -2,9 +2,18 @@
 from playwright.sync_api import Page
 from pages.logout.log_out_page import Logout
 from pages.base_page import BasePage
+from pages.screening_practitioner_appointments.appointment_calendar_page import (
+    AppointmentCalendar,
+)
+from pages.screening_practitioner_appointments.appointment_detail_page import (
+    AppointmentDetail,
+)
 from pages.screening_practitioner_appointments.screening_practitioner_appointments import (
     ScreeningPractitionerAppointmentsPage,
 )
+from pages.screening_practitioner_appointments.screening_practitioner_day_view import (
+    ScreeningPractitionerDayView,
+)
 from pages.datasets.subject_datasets_page import (
     SubjectDatasetsPage,
 )
@@ -13,24 +22,20 @@
     FitForColonoscopySspOptions,
     AsaGradeOptions,
 )
-from pages.screening_subject_search.subject_screening_summary import (
-    SubjectScreeningSummary,
-)
 from pages.screening_subject_search.advance_fobt_screening_episode_page import (
     AdvanceFOBTScreeningEpisode,
 )
-from pages.screening_practitioner_appointments.screening_practitioner_day_view import (
-    ScreeningPractitionerDayView,
-)
-from pages.screening_practitioner_appointments.appointment_detail_page import (
-    AppointmentDetail,
-)
-from pages.screening_practitioner_appointments.appointment_calendar_page import (
-    AppointmentCalendar,
-)
 from pages.screening_subject_search.attend_diagnostic_test_page import (
     AttendDiagnosticTest,
 )
+from pages.screening_subject_search.subject_screening_summary import (
+    SubjectScreeningSummary,
+)
+
+from pages.screening_subject_search.contact_with_patient_page import (
+    ContactWithPatientPage,
+)
+
 from utils.user_tools import UserTools
 from utils.load_properties_file import PropertiesFile
 from utils.screening_subject_page_searcher import verify_subject_event_status_by_nhs_no
@@ -182,20 +187,17 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
             page
         ).click_record_other_post_investigation_contact_button()
 
-        page.locator("#UI_DIRECTION").select_option(label="To patient")
-        page.locator("#UI_CALLER_ID").select_option(index=1)
-        page.get_by_role("button", name="Calendar").click()
+        ContactWithPatientPage(page).select_direction_dropdown_option("To patient")
+        ContactWithPatientPage(page).select_caller_id_dropdown_index_option(1)
+        ContactWithPatientPage(page).click_calendar_button()
         CalendarPicker(page).v1_calender_picker(datetime.today())
-        page.locator("#UI_START_TIME").click()
-        page.locator("#UI_START_TIME").fill("11:00")
-        page.locator("#UI_END_TIME").click()
-        page.locator("#UI_END_TIME").fill("12:00")
-        page.locator("#UI_COMMENT_ID").click()
-        page.locator("#UI_COMMENT_ID").fill("Test Automation")
-        page.locator("#UI_OUTCOME").select_option(
-            label="Post-investigation Appointment Not Required"
+        ContactWithPatientPage(page).enter_start_time("11:00")
+        ContactWithPatientPage(page).enter_end_time("12:00")
+        ContactWithPatientPage(page).enter_discussion_record_text("Test Automation")
+        ContactWithPatientPage(page).select_outcome_dropdown_option(
+            "Post-investigation Appointment Not Required"
         )
-        page.get_by_role("button", name="Save").click()
+        ContactWithPatientPage(page).click_save_button()
 
         verify_subject_event_status_by_nhs_no(
             page, nhs_no, "A323 - Post-investigation Appointment NOT Required"