Merge pull request #602 from NHSDigital/add-delegation-tests

jf-x-dev · web-flow · commit 16138148c8ef · 2025-09-17T11:57:32.000+01:00
Add a basic test for delegation
diff --git a/.env.generic b/.env.generic
@@ -11,6 +11,8 @@ BASIC_AUTH_TOKEN=
 SET_FEATURE_FLAGS=false
 ADDITIONAL_FEATURE_FLAGS=
 
+SCREENSHOT_ALL_STEPS=false
+
 IMMS_API_PEM=
 IMMS_API_KEY=
 IMMS_API_KID=
diff --git a/.github/actions/run-functional-tests/action.yml b/.github/actions/run-functional-tests/action.yml
@@ -7,6 +7,8 @@ inputs:
     required: true
   programmes_enabled:
     required: true
+  screenshot_all_steps:
+    required: true
   set_feature_flags:
     default: "false"
   additional_feature_flags:
@@ -36,6 +38,7 @@ runs:
       env:
         BASE_URL: ${{ inputs.base_url }}
         PROGRAMMES_ENABLED: ${{ inputs.programmes_enabled }}
+        SCREENSHOT_ALL_STEPS: ${{ inputs.screenshot_all_steps }}
         SET_FEATURE_FLAGS: ${{ inputs.set_feature_flags }}
         ADDITIONAL_FEATURE_FLAGS: ${{ inputs.additional_feature_flags }}
         BASIC_AUTH_TOKEN: ${{ env.BASIC_AUTH_TOKEN }}
diff --git a/.github/workflows/functional_selected_device.yaml b/.github/workflows/functional_selected_device.yaml
@@ -31,6 +31,14 @@ on:
           - training
           - sandbox-alpha
           - sandbox-beta
+      screenshot_all_steps:
+        description: 'Take screenshots for all steps (in addition to failures)'
+        required: true
+        default: 'false'
+        type: choice
+        options:
+          - true
+          - false
       set_feature_flags:
         description: 'Set feature flags in the flipper page before running tests (affects all users of the environment being tested!)'
         required: true
@@ -73,6 +81,7 @@ jobs:
             echo "set_feature_flags=false" >> $GITHUB_OUTPUT
             echo "additional_feature_flags=" >> $GITHUB_OUTPUT
             echo "deploy_report=false" >> $GITHUB_OUTPUT
+            echo "screenshot_all_steps=false" >> $GITHUB_OUTPUT
           else
             echo "device=${{ github.event.inputs.device }}" >> $GITHUB_OUTPUT
 
@@ -84,6 +93,7 @@ jobs:
             echo "set_feature_flags=${{ github.event.inputs.set_feature_flags }}" >> $GITHUB_OUTPUT
             echo "additional_feature_flags=${{ github.event.inputs.additional_feature_flags }}" >> $GITHUB_OUTPUT
             echo "deploy_report=true" >> $GITHUB_OUTPUT
+            echo "screenshot_all_steps=${{ github.event.inputs.screenshot_all_steps }}" >> $GITHUB_OUTPUT
           fi
 
       - uses: actions/checkout@v5
@@ -101,6 +111,7 @@ jobs:
           device: ${{ steps.set-variables.outputs.device }}
           base_url: ${{ steps.set-variables.outputs.environment }}
           programmes_enabled: ${{ steps.set-variables.outputs.programmes }}
+          screenshot_all_steps: ${{ steps.set-variables.outputs.screenshot_all_steps }}
           set_feature_flags: ${{ steps.set-variables.outputs.set_feature_flags }}
           additional_feature_flags: ${{ steps.set-variables.outputs.additional_feature_flags }}
           playwright_cache_hit: ${{ steps.playwright-cache.outputs.cache-hit }}
diff --git a/mavis/test/__init__.py b/mavis/test/__init__.py
@@ -20,17 +20,20 @@
     edit_batch_page,
     flipper_page,
     get_online_consent_url,
+    healthcare_assistant,
     imms_base_url,
     import_records_page,
     log_in_as_medical_secretary,
     log_in_as_nurse,
+    log_in_as_prescriber,
     log_in_page,
     match_consent_response_page,
     medical_secretary,
     nurse,
     onboarding,
     online_consent_page,
     organisation,
+    prescriber,
     programmes_enabled,
     programmes_page,
     reset_before_each_module,
@@ -73,17 +76,20 @@
     "edit_batch_page",
     "flipper_page",
     "get_online_consent_url",
+    "healthcare_assistant",
     "imms_base_url",
     "import_records_page",
     "log_in_as_medical_secretary",
     "log_in_as_nurse",
+    "log_in_as_prescriber",
     "log_in_page",
     "match_consent_response_page",
     "medical_secretary",
     "nurse",
     "onboarding",
     "online_consent_page",
     "organisation",
+    "prescriber",
     "programmes_enabled",
     "programmes_page",
     "pytest_runtest_logreport",
diff --git a/mavis/test/annotations.py b/mavis/test/annotations.py
@@ -16,25 +16,25 @@ def _reduce_colors(image_bytes: bytes) -> bytes:
         return output_io.getvalue()
 
 
-def step(title: str, *, attach_screenshot: bool = True):
+def _add_screenshot(page, name: str) -> None:
+    screenshot_bytes = page.screenshot(full_page=True, scale="css")
+    reduced_bytes = _reduce_colors(screenshot_bytes)
+    allure.attach(
+        reduced_bytes,
+        name=name,
+        attachment_type=allure.attachment_type.PNG,
+    )
+
+
+def step(title: str):
     def decorator(func):
         @wraps(func)
         def wrapper(self, *args, **kwargs):
             with allure.step(title):
                 try:
                     return_value = func(self, *args, **kwargs)
                 except Exception:
-                    if attach_screenshot:
-                        screenshot_bytes = self.page.screenshot(
-                            full_page=True,
-                            scale="css",
-                        )
-                        reduced_bytes = _reduce_colors(screenshot_bytes)
-                        allure.attach(
-                            reduced_bytes,
-                            name="Screenshot on failure",
-                            attachment_type=allure.attachment_type.PNG,
-                        )
+                    _add_screenshot(self.page, name="Screenshot on failure")
                     raise
 
                 coverage = kwargs.get("coverage")
@@ -45,14 +45,8 @@ def wrapper(self, *args, **kwargs):
                         attachment_type=allure.attachment_type.TEXT,
                     )
 
-                if attach_screenshot:
-                    screenshot_bytes = self.page.screenshot(full_page=True, scale="css")
-                    reduced_bytes = _reduce_colors(screenshot_bytes)
-                    allure.attach(
-                        reduced_bytes,
-                        name="Screenshot",
-                        attachment_type=allure.attachment_type.PNG,
-                    )
+                if os.getenv("SCREENSHOT_ALL_STEPS", "false").lower() == "true":
+                    _add_screenshot(self.page, name="Screenshot")
 
                 return return_value
 
diff --git a/mavis/test/data/pds.py b/mavis/test/data/pds.py
@@ -1,11 +1,13 @@
 import csv
+import random
 from datetime import date, datetime
 from pathlib import Path
 from typing import NamedTuple
 from zoneinfo import ZoneInfo
 
 from dateutil.relativedelta import relativedelta
 
+from mavis.test.models import Child, Parent, Relationship
 from mavis.test.utils import get_todays_date
 
 
@@ -65,14 +67,28 @@ def address(self) -> tuple[str, str, str, str]:
     reader = csv.DictReader(file)
     patients = [Patient.from_csv_row(row) for row in reader]
 
-patients_without_date_of_death = [
-    patient for patient in patients if not patient.date_of_death
-]
 
-cutoff_date = get_todays_date() - relativedelta(years=22)
+def get_random_child_patient_without_date_of_death() -> Child:
+    patients_without_date_of_death = [
+        patient for patient in patients if not patient.date_of_death
+    ]
 
-child_patients_without_date_of_death = [
-    patient
-    for patient in patients_without_date_of_death
-    if patient.date_of_birth >= cutoff_date
-]
+    cutoff_date = get_todays_date() - relativedelta(years=22)
+
+    child_patients_without_date_of_death = [
+        patient
+        for patient in patients_without_date_of_death
+        if patient.date_of_birth >= cutoff_date
+    ]
+
+    child = random.choice(child_patients_without_date_of_death)
+
+    return Child(
+        child.given_name,
+        child.family_name,
+        child.nhs_number,
+        child.address,
+        child.date_of_birth,
+        9,
+        (Parent.get(Relationship.DAD), Parent.get(Relationship.MUM)),
+    )
diff --git a/mavis/test/fixtures/__init__.py b/mavis/test/fixtures/__init__.py
@@ -3,6 +3,7 @@
     get_online_consent_url,
     log_in_as_medical_secretary,
     log_in_as_nurse,
+    log_in_as_prescriber,
     set_feature_flags,
     test_data,
 )
@@ -11,11 +12,13 @@
     children,
     clinics,
     delete_team_after_tests,
+    healthcare_assistant,
     imms_base_url,
     medical_secretary,
     nurse,
     onboarding,
     organisation,
+    prescriber,
     programmes_enabled,
     reset_before_each_module,
     schools,
@@ -78,17 +81,20 @@
     "edit_batch_page",
     "flipper_page",
     "get_online_consent_url",
+    "healthcare_assistant",
     "imms_base_url",
     "import_records_page",
     "log_in_as_medical_secretary",
     "log_in_as_nurse",
+    "log_in_as_prescriber",
     "log_in_page",
     "match_consent_response_page",
     "medical_secretary",
     "nurse",
     "onboarding",
     "online_consent_page",
     "organisation",
+    "prescriber",
     "programmes_enabled",
     "programmes_page",
     "reset_before_each_module",
diff --git a/mavis/test/fixtures/helpers.py b/mavis/test/fixtures/helpers.py
@@ -85,6 +85,14 @@ def log_in_as_nurse(set_feature_flags, nurse, team, log_in_page):
     log_in_page.log_out()
 
 
+@pytest.fixture
+def log_in_as_prescriber(set_feature_flags, prescriber, team, log_in_page):
+    log_in_page.navigate()
+    log_in_page.log_in_and_choose_team_if_necessary(prescriber, team)
+    yield
+    log_in_page.log_out()
+
+
 @pytest.fixture
 def test_data(organisation, schools, nurse, children, clinics, year_groups):
     return TestData(organisation, schools, nurse, children, clinics, year_groups)
diff --git a/mavis/test/fixtures/models.py b/mavis/test/fixtures/models.py
@@ -104,11 +104,21 @@ def reset_before_each_module(base_url, team) -> None:
     _check_response_status(response)
 
 
+@pytest.fixture(scope="session")
+def healthcare_assistant(onboarding) -> User:
+    return onboarding.users["healthcare_assistant"]
+
+
 @pytest.fixture(scope="session")
 def medical_secretary(onboarding) -> User:
     return onboarding.users["medical_secretary"]
 
 
+@pytest.fixture(scope="session")
+def prescriber(onboarding) -> User:
+    return onboarding.users["prescriber"]
+
+
 @pytest.fixture(scope="session")
 def clinics(onboarding) -> list[Clinic]:
     return onboarding.clinics
diff --git a/mavis/test/models.py b/mavis/test/models.py
@@ -554,7 +554,13 @@ def get_onboarding_data_for_tests(
         team = Team.generate(subteam, organisation)
         users = {
             role: User.generate(role)
-            for role in ("nurse", "medical_secretary", "superuser")
+            for role in (
+                "nurse",
+                "medical_secretary",
+                "superuser",
+                "prescriber",
+                "healthcare_assistant",
+            )
         }
         clinics = [Clinic.generate()]
         schools = School.get_from_testing_api(base_url, year_groups)
diff --git a/mavis/test/pages/sessions.py b/mavis/test/pages/sessions.py
@@ -234,6 +234,9 @@ def __init__(
             "button",
             name="Add another date",
         )
+        self.change_psd_link = self.page.get_by_role(
+            "link", name="Change   use patient specific direction"
+        )
 
     def __get_display_formatted_date(self, date_to_format: str) -> str:
         _parsed_date = datetime.strptime(date_to_format, "%Y%m%d").replace(
@@ -245,6 +248,10 @@ def __get_display_formatted_date(self, date_to_format: str) -> str:
     def click_overview_tab(self) -> None:
         self._select_tab("Overview")
 
+    @step("Click on PSDs tab")
+    def click_psds_tab(self) -> None:
+        self._select_tab("PSDs")
+
     @step("Click Review consent refused")
     def click_review_consent_refused(self) -> None:
         self.review_consent_refused_link.click()
@@ -503,6 +510,7 @@ def confirm_pre_screening_checks(
         for check in programme.pre_screening_checks(consent_option):
             locator = self.pre_screening_listitem.get_by_text(check)
             expect(locator).to_be_visible()
+        self.page.wait_for_load_state()
         self.pre_screening_checkbox.check()
 
     @step("Click on Yes")
@@ -851,8 +859,11 @@ def record_vaccination_for_child(
         notes: str = "",
         *,
         at_school: bool = True,
+        psd_option: bool = False,
     ) -> datetime:
-        self.click_record_vaccinations_tab()
+        # temporarily do not go to record vaccinations tab for psds
+        if not psd_option:
+            self.click_record_vaccinations_tab()
         self.search_child(vaccination_record.child)
         self.click_programme_tab(vaccination_record.programme)
 
@@ -917,3 +928,23 @@ def click_vaccination_details(self, school: School) -> None:
 
     def expect_text_to_not_be_visible(self, text: str) -> None:
         expect(self.page.get_by_text(text)).not_to_be_visible()
+
+    @step("Click on Change patient specific direction")
+    def click_change_psd(self) -> None:
+        self.change_psd_link.click()
+
+    @step("Answer whether PSD should be enabled with {1}")
+    def answer_whether_psd_should_be_enabled(self, answer: str) -> None:
+        self.page.get_by_role(
+            "group",
+            name=(
+                "Can healthcare assistants administer the flu nasal spray vaccine"
+                " using a patient specific direction (PSD)?"
+            ),
+        ).get_by_label(answer).check()
+
+    def check_child_has_psd(self, child: Child) -> None:
+        patient_card = self.page.locator(
+            f'div.nhsuk-card.app-card.app-card--compact:has(h4:has-text("{child!s}"))'
+        )
+        expect(patient_card).to_contain_text("PSD added")
diff --git a/mavis/test/pages/verbal_consent.py b/mavis/test/pages/verbal_consent.py
diff --git a/tests/test_consent_responses.py b/tests/test_consent_responses.py
diff --git a/tests/test_psd.py b/tests/test_psd.py
