updating the locators

Author: mepr1

pages/screening_subject_search/diagnostic_test_outcome_page.py

@@ -20,11 +20,12 @@ def __init__(self, page: Page):
 
     def verify_diagnostic_test_outcome(self, outcome_name: str) -> None:
         """Verify that the diagnostic test outcome is visible."""
-        expect(self.test_outcome_result(outcome_name)).to_be_visible()
+        expect(self.test_outcome_result).to_be_visible()
+  
 
     def select_test_outcome_option(self, option: str) -> None:
         """Select an option from the Outcome of Diagnostic Test dropdown."""
-        self.outcome_dropdown.select_option(option)
+        self.test_outcome_dropdown.select_option(option)
 
     def click_save_button(self) -> None:
         """Click the 'Save' button."""
@@ -37,3 +38,4 @@ class OutcomeOfDiagnosticTest(StrEnum):
     Failed_Test_Refer_Another = "20363"
     Refer_Symptomatic = "20366"
     Refer_Surveillance = "20365"
+    Investigation_Complete='20360'

tests/smokescreen/test_compartment_6.py

@@ -15,7 +15,7 @@
     RecordDiagnosisDatePage,
 )
 from pages.screening_subject_search.diagnostic_test_outcome_page import (
-    DiagnosticTestOutcomePage,
+    DiagnosticTestOutcomePage,OutcomeOfDiagnosticTest
 )
 from pages.datasets.investigation_dataset_page import (
     InvestigationDatasetsPage,
@@ -217,7 +217,7 @@ 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("20365")
+    DiagnosticTestOutcomePage(page).select_test_outcome_option(OutcomeOfDiagnosticTest.Refer_Surveillance)
     DiagnosticTestOutcomePage(page).click_save_button()
 
 def after_lnpcp_result(page: Page) -> None:
@@ -235,7 +235,7 @@ 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("20365")
+    DiagnosticTestOutcomePage(page).select_test_outcome_option(OutcomeOfDiagnosticTest.Refer_Surveillance)
     DiagnosticTestOutcomePage(page).click_save_button()
 
 def handover_subject_to_symptomatic_care(page: Page) -> None:
@@ -286,7 +286,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 = "9109877185"
+    nhs_no = "9408053060"
     go_to_investigation_datasets_page(page, nhs_no)
 
     # The following code is on the investigation datasets page
@@ -301,7 +301,7 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
     handover_subject_to_symptomatic_care(page)
 
     # Younger patient
-    nhs_no = "9624131880"
+    nhs_no = "9867151259"
     go_to_investigation_datasets_page(page, nhs_no)
 
     # The following code is on the investigation datasets page
@@ -331,7 +331,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 = "9648064792"
+    nhs_no = "9546869694"
     go_to_investigation_datasets_page(page, nhs_no)
 
     # The following code is on the investigation datasets page
@@ -346,7 +346,7 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
     handover_subject_to_symptomatic_care(page)
 
     # Younger patient
-    nhs_no = "9627060208"
+    nhs_no = "9546692670"
     go_to_investigation_datasets_page(page, nhs_no)
 
     # The following code is on the investigation datasets page
@@ -374,7 +374,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 = "9965184321"
+    nhs_no_normal = "9692517950"
     go_to_investigation_datasets_page(page, nhs_no_normal)
 
     # The following code is on the investigation datasets page
@@ -404,7 +404,7 @@ 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("20360")
+    DiagnosticTestOutcomePage(page).select_test_outcome_option(OutcomeOfDiagnosticTest.Investigation_Complete)
     DiagnosticTestOutcomePage(page).click_save_button()
 
     SubjectScreeningSummaryPage(page).verify_latest_event_status_value(