worked on review comments

Author: mepr1

conftest.py

@@ -38,19 +38,3 @@ def smokescreen_properties() -> dict:
 @pytest.fixture
 def general_properties() -> dict:
     return PropertiesFile().get_general_properties()
-
-
-@pytest.fixture
-def login_as(page):
-    """Fixture to log in as a specific role."""
-
-    def _login(role: str):
-        """Log in to the application as a specific role.
-        Args:
-            role (str): The role to log in as, e.g., "ScreeningAssistant at BCS02".
-        """
-        logging.info(f"Logging in as '{role}'.")
-        UserTools.user_login(page, role)
-        BasePage(page).go_to_screening_subject_search_page()
-
-    return _login

docs/utility-guides/SubjectNotes.md

@@ -3,10 +3,9 @@
 The **Note Test Utility** module provides reusable helper functions for verifying and comparing note data during test automation of screening subjects in BCSS.
 It includes helpers for:
 
-1. Searching for a subject by NHS number.
-2. Fetching supporting notes from the database.
-3. Verifying that a note matches expected values from the DB or UI.
-4. Confirming that a removed note is archived properly as obsolete.
+1. Fetching supporting notes from the database.
+2. Verifying that a note matches expected values from the DB or UI.
+3. Confirming that a removed note is archived properly as obsolete.
 
 ## Table of Contents
 
@@ -22,7 +21,6 @@ You can import functions into your test files like so:
 
 ```python
 from utils.note_test_util import (
-    search_subject_by_nhs,
     fetch_supporting_notes_from_db,
     verify_note_content_matches_expected,
     verify_note_content_ui_vs_db,

pages/screening_subject_search/subject_events_notes.py

@@ -1,4 +1,4 @@
-from playwright.sync_api import Page, expect, Locator
+from playwright.sync_api import Page, Locator
 from pages.base_page import BasePage
 from enum import StrEnum
 import logging

pages/screening_subject_search/subject_screening_search_page.py

@@ -82,15 +82,6 @@ def click_nhs_number_filter(self) -> None:
         """Click the 'NHS Number' filter."""
         self.click(self.nhs_number_filter)
 
-    def fill_nhs_number(self, nhs_no: str) -> None:
-        """
-        Fills the NHS Number field with the provided NHS number.
-
-        Args:
-            nhs_no (str): The NHS number to fill in the input field.
-        """
-        self.nhs_number_input.fill(nhs_no)
-
     def click_surname_filter(self) -> None:
         """Click the 'Surname' filter."""
         self.click(self.surname_filter)

pytest.ini

@@ -39,8 +39,6 @@ markers =
     vpn_required: for tests that require a VPN connection
     regression: tests that are part of the regression test suite
     call_and_recall: tests that are part of the call and recall test suite
-    notes_tests: tests that are part of the notes test suite
+    note_tests: tests that are part of the notes test suite
     subject_tests: tests that are part of the subject tests suite
     subject_search: tests that are part of the subject search test suite
-    wip2: tests that are currently in progress
-

tests/regression/notes/test_additional_care_notes.py

@@ -1,11 +1,8 @@
 import logging
 import pytest
 from playwright.sync_api import Page, expect
-from pages import login, screening_subject_search
+from utils.user_tools import UserTools
 from pages.base_page import BasePage
-from pages.screening_subject_search import subject_screening_search_page
-from pages.screening_subject_search import subject_screening_summary_page
-from pages.screening_subject_search import subject_events_notes
 from pages.screening_subject_search.subject_screening_search_page import (
     SubjectScreeningPage,
 )
@@ -18,16 +15,12 @@
     SubjectEventsNotes,
     AdditionalCareNoteTypeOptions,
 )
-from utils.user_tools import UserTools
-from utils.table_util import TableUtils
 from utils.oracle.oracle_specific_functions import (
     get_subjects_by_note_count,
     get_subjects_with_multiple_notes,
-    get_supporting_notes,
 )
-import pandas as pd
+from utils.screening_subject_page_searcher import search_subject_episode_by_nhs_number
 from utils.subject_notes import (
-    search_subject_by_nhs,
     fetch_supporting_notes_from_db,
     verify_note_content_matches_expected,
     verify_note_content_ui_vs_db,
@@ -38,16 +31,16 @@
 @pytest.mark.regression
 @pytest.mark.note_tests
 def test_subject_does_not_have_an_additional_care_note(
-    page: Page, general_properties: dict, login_as
+    page: Page, general_properties: dict
 ) -> None:
     """
     Test to check if I can identify if a subject does not have a Additional Care note
     """
     logging.info(
         f"Starting test: Verify subject does not have a '{general_properties["additional_care_note_name"]}'."
     )
-    # Use the login fixture
-    login_as("ScreeningAssistant at BCS02")
+    UserTools.user_login(page, "ScreeningAssistant at BCS02")
+    BasePage(page).go_to_screening_subject_search_page()
 
     # Search for the subject by NHS Number.")
     subjects_df = get_subjects_by_note_count(
@@ -61,9 +54,7 @@ def test_subject_does_not_have_an_additional_care_note(
         )
 
     nhs_no = subjects_df["subject_nhs_number"].iloc[0]
-    SubjectScreeningPage(page).fill_nhs_number(nhs_no)
-    SubjectScreeningPage(page).select_search_area_option("07")
-    SubjectScreeningPage(page).click_search_button()
+    search_subject_episode_by_nhs_number(page, nhs_no)
     # Verify no additional care notes are present
     logging.info(
         f"Verified that no '{general_properties['additional_care_note_name']}' link is visible for the subject."
@@ -77,16 +68,16 @@ def test_subject_does_not_have_an_additional_care_note(
 @pytest.mark.regression
 @pytest.mark.note_tests
 def test_add_an_additional_care_note_for_a_subject_without_a_note(
-    page: Page, general_properties: dict, login_as
+    page: Page, general_properties: dict
 ) -> None:
     """
     Test to add a note for a subject without an additional care note.
     """
     logging.info(
         "Starting test: Add a '{general_properties['additional_care_note_name']}'  for a subject without a note."
     )
-    # Use the login fixture
-    login_as("Team Leader at BCS01")
+    UserTools.user_login(page, "Team Leader at BCS01")
+    BasePage(page).go_to_screening_subject_search_page()
 
     # Get a subject with no notes of the specified type
     subjects_df = get_subjects_by_note_count(
@@ -99,7 +90,8 @@ def test_add_an_additional_care_note_for_a_subject_without_a_note(
             f"No subjects found for note type {general_properties["additional_care_note_type_value"]}."
         )
     nhs_no = subjects_df["subject_nhs_number"].iloc[0]
-    search_subject_by_nhs(page, nhs_no)
+    search_subject_episode_by_nhs_number(page, nhs_no)
+    # search_subject_by_nhs(page, nhs_no)
 
     # Navigate to Subject Events & Notes
     logging.info("Navigating to 'Subject Events & Notes' for the selected subject.")
@@ -128,9 +120,7 @@ def test_add_an_additional_care_note_for_a_subject_without_a_note(
         subjects_df, nhs_no, general_properties["note_status_active"]
     )
 
-    verify_note_content_matches_expected(
-        notes_df, note_title, note_text, type_id
-    )
+    verify_note_content_matches_expected(notes_df, note_title, note_text, type_id)
 
     logging.info(
         f"Verification successful: Additional care note added for the subject with NHS Number: {nhs_no}. "
@@ -141,7 +131,7 @@ def test_add_an_additional_care_note_for_a_subject_without_a_note(
 @pytest.mark.regression
 @pytest.mark.note_tests
 def test_add_additional_care_note_for_subject_with_existing_note(
-    page: Page, general_properties: dict, login_as
+    page: Page, general_properties: dict
 ) -> None:
     """
     Test to add an additional care note for a subject who already has an existing note.
@@ -150,7 +140,8 @@ def test_add_additional_care_note_for_subject_with_existing_note(
     logging.info(
         "Starting test: Add an additional care note for a subject who already has additional care note."
     )
-    login_as("Team Leader at BCS01")
+    UserTools.user_login(page, "Team Leader at BCS01")
+    BasePage(page).go_to_screening_subject_search_page()
 
     # Get a subject with existing additional care notes
     subjects_df = get_subjects_by_note_count(
@@ -159,7 +150,7 @@ def test_add_additional_care_note_for_subject_with_existing_note(
         1,
     )
     nhs_no = subjects_df["subject_nhs_number"].iloc[0]
-    search_subject_by_nhs(page, nhs_no)
+    search_subject_episode_by_nhs_number(page, nhs_no)
     # Navigate to Subject Events & Notes
     logging.info("Navigating to 'Subject Events & Notes' for the selected subject.")
     SubjectScreeningSummaryPage(page).click_subjects_events_notes()
@@ -188,9 +179,7 @@ def test_add_additional_care_note_for_subject_with_existing_note(
         subjects_df, nhs_no, general_properties["note_status_active"]
     )
 
-    verify_note_content_matches_expected(
-        notes_df, note_title, note_text, type_id
-    )
+    verify_note_content_matches_expected(notes_df, note_title, note_text, type_id)
 
     logging.info(
         f"Verification successful: Additional care note added for the subject with NHS Number: {nhs_no}. "
@@ -201,13 +190,14 @@ def test_add_additional_care_note_for_subject_with_existing_note(
 @pytest.mark.regression
 @pytest.mark.note_tests
 def test_identify_subject_with_additional_care_note(
-    page: Page, general_properties: dict, login_as
+    page: Page, general_properties: dict
 ) -> None:
     """
     Test to identify if a subject has an Additional Care note.
     """
     logging.info("Starting test: Verify subject has an additional care note.")
-    login_as("ScreeningAssistant at BCS02")
+    UserTools.user_login(page, "ScreeningAssistant at BCS02")
+    BasePage(page).go_to_screening_subject_search_page()
 
     # Search for the subject by NHS Number.")
     subjects_df = get_subjects_by_note_count(
@@ -216,9 +206,9 @@ def test_identify_subject_with_additional_care_note(
         1,
     )
     nhs_no = subjects_df["subject_nhs_number"].iloc[0]
-    search_subject_by_nhs(page, nhs_no)
+    search_subject_episode_by_nhs_number(page, nhs_no)
     # Verify subject has additional care notes  present
-    logging.info("Verified: Aadditional care notes are present for the subject.")
+    logging.info("Verified: Additional care notes are present for the subject.")
     # logging.info("Verifying that  additional care notes are present for the subject.")
     SubjectScreeningSummaryPage(page).verify_note_link_present(
         general_properties["additional_care_note_name"]
@@ -227,23 +217,22 @@ def test_identify_subject_with_additional_care_note(
 
 @pytest.mark.regression
 @pytest.mark.note_tests
-def test_view_active_additional_care_note(
-    page: Page, general_properties: dict, login_as
-) -> None:
+def test_view_active_additional_care_note(page: Page, general_properties: dict) -> None:
     """
     Test to verify if an active Additional Care note is visible for a subject.
     """
     logging.info("Starting test: Verify subject has an additional care note.")
-    login_as("ScreeningAssistant at BCS02")
+    UserTools.user_login(page, "ScreeningAssistant at BCS02")
+    BasePage(page).go_to_screening_subject_search_page()
 
     # Search for the subject by NHS Number.")
     subjects_df = get_subjects_by_note_count(
         general_properties["additional_care_note_type_value"], 1
     )
     nhs_no = subjects_df["subject_nhs_number"].iloc[0]
-    search_subject_by_nhs(page, nhs_no)
+    search_subject_episode_by_nhs_number(page, nhs_no)
     # Verify subject has additional care notes  present
-    logging.info("Verified: Aadditional care notes are present for the subject.")
+    logging.info("Verified: Additional care notes are present for the subject.")
     # logging.info("Verifying that  additional care notes are present for the subject.")
     logging.info(
         f"Verifying that the Additional Care Note is visible for the subject with NHS Number: {nhs_no}."
@@ -269,21 +258,22 @@ def test_view_active_additional_care_note(
 @pytest.mark.regression
 @pytest.mark.note_tests
 def test_update_existing_additional_care_note(
-    page: Page, general_properties: dict, login_as
+    page: Page, general_properties: dict
 ) -> None:
     """
     Test to verify if an existing Additional Care note can be updated successfully.
     """
     logging.info("Starting test: Verify subject has an additional care note.")
-    login_as("Team Leader at BCS01")
+    UserTools.user_login(page, "Team Leader at BCS01")
+    BasePage(page).go_to_screening_subject_search_page()
     # Search for the subject by NHS Number.")
     subjects_df = get_subjects_by_note_count(
         general_properties["additional_care_note_type_value"],
         general_properties["note_status_active"],
         1,
     )
     nhs_no = subjects_df["subject_nhs_number"].iloc[0]
-    search_subject_by_nhs(page, nhs_no)
+    search_subject_episode_by_nhs_number(page, nhs_no)
     # Verify subject has additional care notes  present
     logging.info(
         f"Verifying that the Additional Care Note is visible for the subject with NHS Number: {nhs_no}."
@@ -324,9 +314,7 @@ def test_update_existing_additional_care_note(
         )
 
     # Verify title and note match the provided values
-    verify_note_content_matches_expected(
-        notes_df, note_title, note_text, type_id
-    )
+    verify_note_content_matches_expected(notes_df, note_title, note_text, type_id)
 
     logging.info(
         f"Verification successful: Additional care note added for the subject with NHS Number: {nhs_no}. "
@@ -337,15 +325,16 @@ def test_update_existing_additional_care_note(
 @pytest.mark.regression
 @pytest.mark.note_tests
 def test_remove_existing_additional_care_note(
-    page: Page, general_properties: dict, login_as
+    page: Page, general_properties: dict
 ) -> None:
     """
     Test to verify if an existing Additional Care note can be removed for a subject with one Additional Care note.
     """
     logging.info(
         "Starting test: Verify if an existing Additional Care note can be removed for a subject with one Additional Care note"
     )
-    login_as("Team Leader at BCS01")
+    UserTools.user_login(page, "Team Leader at BCS01")
+    BasePage(page).go_to_screening_subject_search_page()
 
     # Search for the subject by NHS Number.")
     subjects_df = get_subjects_by_note_count(
@@ -354,7 +343,7 @@ def test_remove_existing_additional_care_note(
         1,
     )
     nhs_no = subjects_df["subject_nhs_number"].iloc[0]
-    search_subject_by_nhs(page, nhs_no)
+    search_subject_episode_by_nhs_number(page, nhs_no)
     # Verify subject has additional care notes  present
     logging.info(
         f"Verifying that the Additional Care Note is visible for the subject with NHS Number: {nhs_no}."
@@ -373,7 +362,7 @@ def test_remove_existing_additional_care_note(
     )
     logging.info("Verifying that the subject does not have any Additional Care Notes.")
 
-    _,_, notes_df = fetch_supporting_notes_from_db(
+    _, _, notes_df = fetch_supporting_notes_from_db(
         subjects_df, nhs_no, general_properties["note_status_active"]
     )
     # Verify that the DataFrame is not empty
@@ -390,7 +379,7 @@ def test_remove_existing_additional_care_note(
 @pytest.mark.regression
 @pytest.mark.note_tests
 def test_remove_existing_additional_care_note_for_subject_with_multiple_notes(
-    page: Page, general_properties: dict, login_as
+    page: Page, general_properties: dict
 ) -> None:
     """
     Test to verify if an existing Additional Care note can be removed for a subject with multiple Additional Care notes.
@@ -399,7 +388,8 @@ def test_remove_existing_additional_care_note_for_subject_with_multiple_notes(
     logging.info(
         "Starting test: Remove an additional care note for a subject who already has multiple additional care note."
     )
-    login_as("Team Leader at BCS01")
+    UserTools.user_login(page, "Team Leader at BCS01")
+    BasePage(page).go_to_screening_subject_search_page()
 
     # Get a subject with multiple additional care notes
     subjects_df = get_subjects_with_multiple_notes(
@@ -410,7 +400,7 @@ def test_remove_existing_additional_care_note_for_subject_with_multiple_notes(
         pytest.fail("No subjects found with multiple Additional Care Notes.")
     nhs_no = subjects_df["subject_nhs_number"].iloc[0]
     logging.info(f"Searching for subject with NHS Number: {nhs_no}")
-    search_subject_by_nhs(page, nhs_no)
+    search_subject_episode_by_nhs_number(page, nhs_no)
     # Navigate to Subject Events & Notes
     logging.info("Navigating to 'Subject Events & Notes' for the selected subject.")
     SubjectScreeningSummaryPage(page).click_subjects_events_notes()