Adding locators to the new POM

Author: adrianoaru-nhs

pages/screening_subject_search/record_diagnosis_date_page.py

@@ -1,5 +1,7 @@
 from playwright.sync_api import Page
 from pages.base_page import BasePage
+from datetime import datetime
+from utils.calendar_picker import CalendarPicker
 
 
 class RecordDiagnosisDatePage(BasePage):
@@ -10,7 +12,18 @@ def __init__(self, page: Page):
         self.page = page
         # Record Diagnosis Date - page locators
         self.diagnosis_date_field = self.page.locator("#diagnosisDate")
+        self.save_button = self.page.get_by_role("button", name="Save")
 
-    def click_diagnosis_date_field(self) -> None:
-        """Click the diagnosis date field."""
+    def enter_date_in_diagnosis_date_field(self, date: datetime) -> None:
+        """
+        Enters a date in the diagnosis date field.
+        Args:
+            date (datetime): The date to enter in the field.
+        """
         self.click(self.diagnosis_date_field)
+        CalendarPicker(self.page).v2_calendar_picker(date)
+        self.diagnosis_date_field.press("Enter")
+
+    def click_save_button(self) -> None:
+        """Clicks the save button."""
+        self.click(self.save_button)

tests/smokescreen/test_compartment_6.py

@@ -11,6 +11,9 @@
 from pages.datasets.subject_datasets_page import SubjectDatasetsPage
 from utils.calendar_picker import CalendarPicker
 from datetime import datetime
+from pages.screening_subject_search.record_diagnosis_date_page import (
+    RecordDiagnosisDatePage,
+)
 from pages.datasets.investigation_dataset_page import (
     InvestigationDatasetsPage,
     SiteLookupOptions,
@@ -309,9 +312,8 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
     page.get_by_role("button", name="Record Diagnosis Date").click()
 
     # The following code is on the record diagnosis date page
-    page.locator("#diagnosisDate").click()
-    CalendarPicker(page).v2_calendar_picker(datetime.today())
-    page.get_by_role("button", name="Save").click()
+    RecordDiagnosisDatePage(page).enter_date_in_diagnosis_date_field(datetime.today())
+    RecordDiagnosisDatePage(page).click_save_button()
 
     SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
         "A318 - Post-investigation Appointment NOT Required - Result Letter Created"
@@ -379,10 +381,8 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
     page.get_by_role("button", name="Record Diagnosis Date").click()
 
     # The following code is on the record diagnosis date page
-    page.locator("#diagnosisDate").click()
-    CalendarPicker(page).v2_calendar_picker(datetime.today())
-    page.locator("#diagnosisDate").press("Enter")
-    page.get_by_role("button", name="Save").click()
+    RecordDiagnosisDatePage(page).enter_date_in_diagnosis_date_field(datetime.today())
+    RecordDiagnosisDatePage(page).click_save_button()
 
     SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
         "A318 - Post-investigation Appointment NOT Required - Result Letter Created"
@@ -431,18 +431,8 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
     page.get_by_role("button", name="Record Diagnosis Date").click()
 
     # The following code is on the record diagnosis date page
-    page.locator("#diagnosisDate").click()
-    CalendarPicker(page).v2_calendar_picker(datetime.today())
-    page.get_by_role("button", name="Save").click()
-
-    # Modification needs to be done to accept this list. it should check if any of the values in this list are present. Something like the following:
-    # def get_first_visible_cell(page, values):
-    # if isinstance(values, str):
-    #     values = [values]
-    # for name in values:
-    #     locator = page.get_by_role("cell", name=name)
-    #     if locator.is_visible():
-    #         return locator
+    RecordDiagnosisDatePage(page).enter_date_in_diagnosis_date_field(datetime.today())
+    RecordDiagnosisDatePage(page).click_save_button()
 
     batch_processing(
         page,