Fixed issues and spelling issues

Author: adrianoaru-nhs

pages/screening_subject_search/subject_screening_summary_page.py

@@ -56,6 +56,10 @@ def __init__(self, page: Page):
             "button", name="Advance FOBT Screening Episode"
         )
 
+    def wait_for_page_title(self) -> None:
+        """Waits for the page to be the Subject Screening Summary"""
+        self.subject_screening_summary.wait_for()
+
     def verify_result_contains_text(self, text) -> None:
         """Verify that the result contains the given text."""
         expect(self.display_rs).to_contain_text(text)

tests/smokescreen/test_compartment_6.py

@@ -251,7 +251,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 = "9056553305"
+    nhs_no = "9109877185"
     go_to_investigation_datasets_page(page, nhs_no)
 
     # The following code is on the investigation datasets page
@@ -278,20 +278,21 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
     page.locator("#UI_NS_CONSULTANT_PIO_SELECT_LINK").click()
     option_locator = page.locator(
         '[value="201"]:visible'
-    )  # Here value '201' is refering to Consultant B, Frame
+    )  # Here value '201' is referring to Consultant B, Frame
     option_locator.wait_for(state="visible")
     option_locator.click()
     page.get_by_role("textbox", name="Notes").click()
     page.get_by_role("textbox", name="Notes").fill("Test Automation")
     page.once("dialog", lambda dialog: dialog.accept())
     page.get_by_role("button", name="Save").click()
 
+    SubjectScreeningSummaryPage(page).wait_for_page_title()
     SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
         "A385 - Handover into Symptomatic Care"
     )
 
     # Younger patient
-    nhs_no = "9867208471"
+    nhs_no = "9624131880"
     go_to_investigation_datasets_page(page, nhs_no)
 
     # The following code is on the investigation datasets page
@@ -321,7 +322,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 = "9840013254"
+    nhs_no = "9648064792"
     go_to_investigation_datasets_page(page, nhs_no)
 
     # The following code is on the investigation datasets page
@@ -348,20 +349,21 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
     page.locator("#UI_NS_CONSULTANT_PIO_SELECT_LINK").click()
     option_locator = page.locator(
         '[value="201"]:visible'
-    )  # Here value '201' is refering to Consultant B, Frame
+    )  # Here value '201' is referring to Consultant B, Frame
     option_locator.wait_for(state="visible")
     option_locator.click()
     page.get_by_role("textbox", name="Notes").click()
     page.get_by_role("textbox", name="Notes").fill("Test Automation")
     page.once("dialog", lambda dialog: dialog.accept())
     page.get_by_role("button", name="Save").click()
 
+    SubjectScreeningSummaryPage(page).wait_for_page_title()
     SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
         "A385 - Handover into Symptomatic Care"
     )
 
     # Younger patient
-    nhs_no = "9477527106"
+    nhs_no = "9627060208"
     go_to_investigation_datasets_page(page, nhs_no)
 
     # The following code is on the investigation datasets page
@@ -389,8 +391,8 @@ 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 = "9936724968"
-    go_to_investigation_datasets_page(page, nhs_no)
+    nhs_no_normal = "9965184321"
+    go_to_investigation_datasets_page(page, nhs_no_normal)
 
     # The following code is on the investigation datasets page
     default_investigation_dataset_forms(page)
@@ -445,6 +447,11 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
         ],
     )
 
+    # This is to check for the status of a normal subject as this NHS Number cannot be retrieved from the DB
+    verify_subject_event_status_by_nhs_no(
+        page, nhs_no_normal, "S61 - Normal (No Abnormalities Found)"
+    )
+
     batch_processing(
         page,
         "A385",

utils/batch_processing.py

@@ -92,7 +92,7 @@ def prepare_and_print_batch(
     page: Page, link_text: str, get_subjects_from_pdf: bool = False
 ) -> pd.DataFrame | None:
     """
-    This prepares the batch, retreives the files and confirms them as printed
+    This prepares the batch, retrieves the files and confirms them as printed
     Once those buttons have been pressed it waits for the message 'Batch Successfully Archived'
 
     Args: