pom for subject dataset page and refactor C6

Author: mepr1

pages/datasets/subject_datasets_page.py

@@ -1,4 +1,4 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Page, expect
 from pages.base_page import BasePage
 
 
@@ -31,3 +31,13 @@ def click_colonoscopy_show_datasets(self) -> None:
     def click_investigation_show_datasets(self) -> None:
         """Clicks on the 'Show Dataset' button for the Investigation row on the Subject Datasets Page."""
         self.click(self.investigation_show_dataset_button)
+
+    def expect_text_to_be_visible(self, text: str) -> None:
+        """
+        This method is designed to expect a text to be visible on the page.
+        It checks if the given text is visible.
+
+        Args:
+            text (str): The text to check for visibility.
+        """
+        expect(self.page.get_by_text(text).nth(1)).to_be_visible()

tests/smokescreen/test_compartment_6.py

@@ -10,16 +10,18 @@
 from pages.logout.log_out_page import LogoutPage
 from pages.datasets.subject_datasets_page import SubjectDatasetsPage
 from pages.screening_subject_search.handover_into_symptomatic_care_page import (
-    HandoverIntoSymptomaticCarePage
+    HandoverIntoSymptomaticCarePage,
 )
 from utils.calendar_picker import CalendarPicker
 from datetime import datetime
 from pages.screening_subject_search.record_diagnosis_date_page import (
     RecordDiagnosisDatePage,
 )
 from pages.screening_subject_search.diagnostic_test_outcome_page import (
-    DiagnosticTestOutcomePage,OutcomeOfDiagnosticTest
+    DiagnosticTestOutcomePage,
+    OutcomeOfDiagnosticTest,
 )
+from pages.datasets.subject_datasets_page import SubjectDatasetsPage
 from pages.datasets.investigation_dataset_page import (
     InvestigationDatasetsPage,
     SiteLookupOptions,
@@ -211,7 +213,7 @@ def after_high_risk_result(page: Page) -> None:
     BasePage(page).click_back_button()
 
     # The following code is on the subject datasets page
-    expect(page.get_by_text("** Completed **").nth(1)).to_be_visible()
+    SubjectDatasetsPage(page).expect_text_to_be_visible("** Completed **")
     BasePage(page).click_back_button()
 
     SubjectScreeningSummaryPage(page).click_advance_fobt_screening_episode_button()
@@ -220,15 +222,18 @@ def after_high_risk_result(page: Page) -> None:
 
     # The following code is on the diagnostic test outcome page
     DiagnosticTestOutcomePage(page).verify_diagnostic_test_outcome("High-risk findings")
-    DiagnosticTestOutcomePage(page).select_test_outcome_option(OutcomeOfDiagnosticTest.REFER_SURVEILLANCE)
+    DiagnosticTestOutcomePage(page).select_test_outcome_option(
+        OutcomeOfDiagnosticTest.REFER_SURVEILLANCE
+    )
     DiagnosticTestOutcomePage(page).click_save_button()
 
+
 def after_lnpcp_result(page: Page) -> None:
     InvestigationDatasetsPage(page).expect_text_to_be_visible("LNPCP")
     BasePage(page).click_back_button()
 
     # The following code is on the subject datasets page
-    expect(page.get_by_text("** Completed **").nth(1)).to_be_visible()
+    SubjectDatasetsPage(page).expect_text_to_be_visible("** Completed **")
     BasePage(page).click_back_button()
 
     SubjectScreeningSummaryPage(page).click_advance_fobt_screening_episode_button()
@@ -238,9 +243,12 @@ def after_lnpcp_result(page: Page) -> None:
 
     # The following code is on the diagnostic test outcome page
     DiagnosticTestOutcomePage(page).verify_diagnostic_test_outcome("LNPCP")
-    DiagnosticTestOutcomePage(page).select_test_outcome_option(OutcomeOfDiagnosticTest.REFER_SURVEILLANCE)
+    DiagnosticTestOutcomePage(page).select_test_outcome_option(
+        OutcomeOfDiagnosticTest.REFER_SURVEILLANCE
+    )
     DiagnosticTestOutcomePage(page).click_save_button()
 
+
 def handover_subject_to_symptomatic_care(page: Page) -> None:
     SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
         "A394 - Handover into Symptomatic Care for Surveillance - Patient Age"
@@ -282,7 +290,7 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
 
     # This needs to be repeated for two subjects, one old and one not - High Risk Result
     # Older patient
-    nhs_no = "9772286785"
+    nhs_no = "9730614296"
     go_to_investigation_datasets_page(page, nhs_no)
 
     # The following code is on the investigation datasets page
@@ -297,7 +305,7 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
     handover_subject_to_symptomatic_care(page)
 
     # Younger patient
-    nhs_no = "9802397318"
+    nhs_no = "9711391848"
     go_to_investigation_datasets_page(page, nhs_no)
 
     # The following code is on the investigation datasets page
@@ -327,7 +335,7 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
 
     # This needs to be repeated for two subjects, one old and one not - LNPCP Result
     # Older patient
-    nhs_no = "9359523194"
+    nhs_no = "9468743977"
     go_to_investigation_datasets_page(page, nhs_no)
 
     # The following code is on the investigation datasets page
@@ -342,7 +350,7 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
     handover_subject_to_symptomatic_care(page)
 
     # Younger patient
-    nhs_no = "9828941813"
+    nhs_no = "9724560430"
     go_to_investigation_datasets_page(page, nhs_no)
 
     # The following code is on the investigation datasets page
@@ -370,7 +378,7 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
     )
 
     # This needs to be repeated for 1 subject, age does not matter - Normal Result
-    nhs_no_normal = "9852356488"
+    nhs_no_normal = "9808363938"
     go_to_investigation_datasets_page(page, nhs_no_normal)
 
     # The following code is on the investigation datasets page
@@ -388,7 +396,7 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
     BasePage(page).click_back_button()
 
     # The following code is on the subject datasets page
-    expect(page.get_by_text("** Completed **").nth(1)).to_be_visible()
+    SubjectDatasetsPage(page).expect_text_to_be_visible("** Completed **")
     BasePage(page).click_back_button()
 
     SubjectScreeningSummaryPage(page).click_advance_fobt_screening_episode_button()
@@ -400,7 +408,9 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
     DiagnosticTestOutcomePage(page).verify_diagnostic_test_outcome(
         "Normal (No Abnormalities"
     )
-    DiagnosticTestOutcomePage(page).select_test_outcome_option(OutcomeOfDiagnosticTest.INVESTIGATION_COMPLETE)
+    DiagnosticTestOutcomePage(page).select_test_outcome_option(
+        OutcomeOfDiagnosticTest.INVESTIGATION_COMPLETE
+    )
     DiagnosticTestOutcomePage(page).click_save_button()
 
     SubjectScreeningSummaryPage(page).verify_latest_event_status_value(