Added pom for colonoscopy dataset

Refactored subject dataset
Moved subject dataset pom into dataset dir

Author: Andyg79

…itioner_appointments/subject_datasets.py …ges/datasets/colonoscopy_dataset_page.pypages/screening_practitioner_appointments/subject_datasets.py renamed to pages/datasets/colonoscopy_dataset_page.py pages/screening_practitioner_appointments/subject_datasets.py renamed to pages/datasets/colonoscopy_dataset_page.py

@@ -1,13 +1,14 @@
-from playwright.sync_api import Page, expect
+from playwright.sync_api import Page
 from pages.base_page import BasePage
 from enum import Enum
 
 
-class SubjectDatasets(BasePage):
+class ColonoscopyDatasetsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
 
+        # Colonoscopy datasets page locators
         self.show_dataset_button = self.page.get_by_role("link", name="Show Dataset")
 
         self.save_dataset_button = self.page.locator(
@@ -49,7 +50,15 @@ def click_dataset_complete_radio_button_no(self) -> None:
 
 class AsaGradeOptions(Enum):
     FIT = "17009"
+    RELEVANT_DISEASE = "17010"
+    RESTRICTIVE_DISEASE = "17011"
+    LIFE_THREATENING_DISEASE = "17012"
+    MORIBUND = "17013"
+    NOT_APPLICABLE = "17014"
+    NOT_KNOWN = "17015"
 
 
 class FitForColonoscopySspOptions(Enum):
     YES = "17058"
+    NO = "17059"
+    UNABLE_TO_ASSESS = "17954"

pages/datasets/subject_datasets_page.py

@@ -0,0 +1,15 @@
+from playwright.sync_api import Page
+from pages.base_page import BasePage
+
+
+class SubjectDatasetsPage(BasePage):
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page
+        # Subject datasets page locators
+        self.colonoscopy_show_dataset_button = self.page.locator(
+            "body > table > tbody > tr > td > div:nth-child(13) > div.DatasetLink > p > a"
+        )  # Using a more specific selector because we will have multiple buttons on the page with the same role and name
+
+    def click_colonoscopy_show_datasets(self) -> None:
+        self.click(self.colonoscopy_show_dataset_button)

tests/smokescreen/test_compartment_5.py

@@ -1,15 +1,16 @@
 import pytest
-from playwright.sync_api import Page, expect
+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.screening_practitioner_appointments import (
     ScreeningPractitionerAppointmentsPage,
 )
-from pages.screening_practitioner_appointments.subject_datasets import (
-    SubjectDatasets,
+from pages.datasets.subject_datasets_page import (
+    SubjectDatasetsPage,
     FitForColonoscopySspOptions,
     AsaGradeOptions,
 )
+from pages.datasets.colonoscopy_dataset_page import ColonoscopyDatasetsPage
 from pages.screening_subject_search.subject_screening_summary import (
     SubjectScreeningSummary,
 )
@@ -99,23 +100,23 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
     SubjectScreeningSummary(page).click_datasets_link()
 
     # Click on 'Show Dataset' next to the Colonoscopy Assessment
-    SubjectDatasets(page).click_show_datasets()
+    SubjectDatasetsPage(page).click_colonoscopy_show_datasets()
 
     # Populate Colonoscopy Assessment Details fields
 
     # ASA Grade  - I - Fit
-    SubjectDatasets(page).select_asa_grade_option(AsaGradeOptions.FIT.value)
+    ColonoscopyDatasetsPage(page).select_asa_grade_option(AsaGradeOptions.FIT.value)
 
     # Fit for Colonoscopy (SSP) - Yes
-    SubjectDatasets(page).select_fit_for_colonoscopy_option(
+    ColonoscopyDatasetsPage(page).select_fit_for_colonoscopy_option(
         FitForColonoscopySspOptions.YES.value
     )
 
     # Click 'Yes' for Dataset Complete?
-    SubjectDatasets(page).click_dataset_complete_radio_button_yes()
+    ColonoscopyDatasetsPage(page).click_dataset_complete_radio_button_yes()
 
     # Click Save Dataset button
-    SubjectDatasets(page).save_dataset()
+    ColonoscopyDatasetsPage(page).save_dataset()
 
     # Click Back
     BasePage(page).click_back_button()