Merge branch 'main' of github.com:NHSDigital/bcss-playwright into feature/BCSS-20386-batch-processing-refactoring

Author: adrianoaru-nhs

pages/screening_practitioner_appointments/appointment_detail_page.py

@@ -8,15 +8,15 @@ def __init__(self, page: Page):
         self.page = page
         # Appointment Detail - page filters
         self.attendance_radio = self.page.get_by_role("radio", name="Attendance")
-        self.attendented_check_box = self.page.locator("#UI_ATTENDED")
+        self.attended_check_box = self.page.locator("#UI_ATTENDED")
         self.calendar_button = self.page.get_by_role("button", name="Calendar")
-        self.save_button = self.page.get_by_role("button", name="Save").click()
+        self.save_button = self.page.get_by_role("button", name="Save")
 
     def check_attendance_radio(self) -> None:
         self.attendance_radio.check()
 
-    def check_attendented_check_box(self) -> None:
-        self.attendented_check_box.check()
+    def check_attended_check_box(self) -> None:
+        self.attended_check_box.check()
 
     def click_calendar_button(self) -> None:
         self.click(self.calendar_button)

pages/screening_subject_search/attend_diagnostic_test_page.py

@@ -0,0 +1,21 @@
+from playwright.sync_api import Page
+from pages.base_page import BasePage
+
+
+class AttendDiagnosticTest(BasePage):
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page
+        # Advance Diagnostic Test - page locators
+        self.actual_type_of_test_dropdown = self.page.locator("#UI_CONFIRMED_TYPE_OF_TEST")
+        self.calendar_button = self.page.get_by_role("button", name="Calendar")
+        self.save_button =self.page.get_by_role("button", name="Save")
+
+    def select_actual_type_of_test_dropdown_option(self, text: str) -> None:
+        self.actual_type_of_test_dropdown.select_option(label=text)
+
+    def click_calendar_button(self) -> None:
+        self.click(self.calendar_button)
+
+    def click_save_button(self) -> None:
+        self.click(self.save_button)

tests/smokescreen/test_compartment_5.py

@@ -25,6 +25,9 @@
 from pages.screening_practitioner_appointments.appointment_calendar_page import (
     AppointmentCalendar,
 )
+from pages.screening_subject_search.attend_diagnostic_test_page import (
+    AttendDiagnosticTest,
+)
 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
@@ -81,7 +84,7 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
 
     # Select Attendance radio button, tick Attended checkbox, set Attended Date to yesterday's (system) date and then press Save
     AppointmentDetail(page).check_attendance_radio()
-    AppointmentDetail(page).check_attendented_check_box()
+    AppointmentDetail(page).check_attended_check_box()
     AppointmentDetail(page).click_calendar_button()
     CalendarPicker(page).v1_calender_picker(datetime.today() - timedelta(1))
     AppointmentDetail(page).click_save_button()
@@ -145,10 +148,10 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
     AdvanceFOBTScreeningEpisode(page).click_attend_diagnostic_test_button()
 
     # Select Colonoscopy from drop down list. Enter the actual appointment date as today's date and select 'Save'
-    page.locator("#UI_CONFIRMED_TYPE_OF_TEST").select_option(label="Colonoscopy")
-    page.get_by_role("button", name="Calendar").click()
+    AttendDiagnosticTest.select_actual_type_of_test_dropdown_option("Colonoscopy")
+    AttendDiagnosticTest.click_calendar_button()
     CalendarPicker(page).v1_calender_picker(datetime.today())
-    page.get_by_role("button", name="Save").click()
+    AttendDiagnosticTest.click_save_button()
     SubjectScreeningSummary(page).verify_latest_event_status_value(
         "A259 - Attended Diagnostic Test"
     )