Adding utils for compartment 5 and fixed some logging for other compartments

Author: adrianoaru-nhs

pages/screening_practitioner_appointments/appointment_detail_page.py

@@ -10,7 +10,7 @@ def __init__(self, page: Page):
         self.attendance_radio = self.page.get_by_role("radio", name="Attendance")
         self.attendented_check_box = self.page.locator("#UI_ATTENDED")
         self.calendar_button = self.page.get_by_role("button", name="Calendar")
-        self.save_button = self.page.get_by_role("button", name="Save").click()
+        self.save_button = self.page.get_by_role("button", name="Save")
 
     def check_attendance_radio(self) -> None:
         self.attendance_radio.check()

pages/screening_practitioner_appointments/screening_practitioner_day_view.py

@@ -1,15 +1,20 @@
 from playwright.sync_api import Page
 from pages.base_page import BasePage
 
+
 class ScreeningPractitionerDayView(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
         # Screening Practitioner Day View   - page locators
         self.calendar_button = page.get_by_role("button", name="Calendar")
+        self.practitioner_dropdown = self.page.locator("#UI_PRACTITIONER_NDV")
 
     def click_calendar_button(self) -> None:
         self.click(self.calendar_button)
 
     def click_patient_link(self, patient_name: str) -> None:
         self.click(self.page.get_by_role("link", name=patient_name))
+
+    def select_practitioner_dropdown_option(self, practitioner: str | list) -> None:
+        self.practitioner_dropdown.select_option(label=practitioner)

pages/screening_subject_search/advance_fobt_screening_episode_page.py

@@ -1,5 +1,7 @@
 from playwright.sync_api import Page, expect, Locator
 from pages.base_page import BasePage
+import logging
+import pytest
 
 
 class AdvanceFOBTScreeningEpisode(BasePage):
@@ -53,10 +55,15 @@ def get_latest_event_status_cell(self, latest_event_status: str) -> Locator:
         return self.page.get_by_role("cell", name=latest_event_status, exact=True)
 
     def verify_latest_event_status_value(self, latest_event_status: str) -> None:
+        logging.info(f"Verifying subject has the status: {latest_event_status}")
         latest_event_status_cell = self.get_latest_event_status_cell(
             latest_event_status
         )
-        expect(latest_event_status_cell).to_be_visible()
+        try:
+            expect(latest_event_status_cell).to_be_visible()
+            logging.info(f"Subject has the status: {latest_event_status}")
+        except Exception:
+            pytest.fail(f"Subject does not have the status: {latest_event_status}")
 
     def click_record_other_post_investigation_contact_button(self) -> None:
         self.click(self.record_other_post_investigation_contact_button)

pages/screening_subject_search/subject_screening_summary.py

@@ -1,6 +1,7 @@
 from playwright.sync_api import Page, expect, Locator
 from pages.base_page import BasePage
 from enum import Enum
+import logging
 import pytest
 
 
@@ -76,10 +77,15 @@ def verify_latest_event_status_header(self) -> None:
         expect(self.latest_event_status).to_be_visible()
 
     def verify_latest_event_status_value(self, latest_event_status: str) -> None:
+        logging.info(f"Verifying subject has the status: {latest_event_status}")
         latest_event_status_cell = self.get_latest_event_status_cell(
             latest_event_status
         )
-        expect(latest_event_status_cell).to_be_visible()
+        try:
+            expect(latest_event_status_cell).to_be_visible()
+            logging.info(f"Subject has the status: {latest_event_status}")
+        except Exception:
+            pytest.fail(f"Subject does not have the status: {latest_event_status}")
 
     def click_subjects_events_notes(self) -> None:
         self.click(self.subjects_events_notes)
@@ -130,7 +136,12 @@ def click_datasets_link(self) -> None:
         self.click(self.datasets_link)
 
     def click_advance_fobt_screening_episode_button(self) -> None:
-        self.click(self.advance_fobt_screening_episode_button)
+        logging.info("Advancing the episode")
+        try:
+            self.click(self.advance_fobt_screening_episode_button)
+            logging.info("Episode successfully advanced")
+        except Exception as e:
+            pytest.fail(f"Unable to advance the episode: {e}")
 
 
 class ChangeScreeningStatusOptions(Enum):

tests/smokescreen/bcss_smokescreen_tests.properties

@@ -85,7 +85,7 @@
 # ----------------------------------
 #   compartment 5
 # ----------------------------------
-#    c5_eng_number_of_screening_appts_to_attend=5
+   c5_eng_number_of_screening_appts_to_attend=2
 
 # ----------------------------------
 #   compartment 6

tests/smokescreen/test_compartment_2.py

@@ -56,15 +56,9 @@ def test_compartment_2(page: Page, smokescreen_properties: dict) -> None:
             pytest.fail(f"{fit_device_id} unsuccessfully logged: {str(e)}")
 
     nhs_no = subjectdf["subject_nhs_number"].iloc[0]
-    try:
-        verify_subject_event_status_by_nhs_no(
-            page, nhs_no, "S43 - Kit Returned and Logged (Initial Test)"
-        )
-        logging.info(
-            f"Successfully verified NHS number {nhs_no} with status S43 - Kit Returned and Logged (Initial Test)"
-        )
-    except Exception as e:
-        pytest.fail(f"Verification failed for NHS number {nhs_no}: {str(e)}")
+    verify_subject_event_status_by_nhs_no(
+        page, nhs_no, "S43 - Kit Returned and Logged (Initial Test)"
+    )
 
     BasePage(page).click_main_menu_link()
     BasePage(page).go_to_fit_test_kits_page()

tests/smokescreen/test_compartment_3.py

@@ -66,16 +66,7 @@ def test_compartment_3(page: Page, smokescreen_properties: dict) -> None:
             f"Verifying NHS number: {nhs_number} with expected status: {expected_status}"
         )
 
-        try:
-            verify_subject_event_status_by_nhs_no(page, nhs_number, expected_status)
-            logging.info(
-                f"Successfully verified NHS number {nhs_number} with status {expected_status}"
-            )
-        except Exception as e:
-            logging.error(
-                f"Verification failed for NHS number {nhs_number} with status {expected_status}: {str(e)}"
-            )
-            raise
+        verify_subject_event_status_by_nhs_no(page, nhs_number, expected_status)
 
     # Process S2 batch
     batch_processing(