Adding both scenarios from _Setup.feature

Author: adrianoaru-nhs

.test_last_runs.json

@@ -0,0 +1,3 @@
+{
+  "subject/episodes/datasets/investigation/endoscopy/polypcategories/test_setup": "2025-07-09"
+}

conftest.py

@@ -35,3 +35,46 @@ def smokescreen_properties() -> dict:
 @pytest.fixture
 def general_properties() -> dict:
     return PropertiesFile().get_general_properties()
+
+
+from typing import Any
+import pytest
+from _pytest.config.argparsing import Parser
+from _pytest.fixtures import FixtureRequest
+
+
+def pytest_addoption(parser: Parser) -> None:
+    """
+    Add custom command-line options to pytest.
+
+    Args:
+        parser (Parser): The pytest parser object used to define CLI options.
+
+    Adds:
+        --subjects-to-run-for (int):
+            The number of subjects to run the test setup for.
+            Default is 10.
+
+    Example:
+        pytest tests/test_setup.py::test_setup_subjects_as_a259 --subjects-to-run-for=5
+    """
+    parser.addoption(
+        "--subjects-to-run-for",
+        action="store",
+        default="10",
+        help="Number of subjects to run the test setup for (default: 10)",
+    )
+
+
+@pytest.fixture
+def subjects_to_run_for(request: FixtureRequest) -> int:
+    """
+    Fixture to retrieve the value of the '--subjects-to-run-for' CLI argument.
+
+    Args:
+        request (FixtureRequest): Provides access to the requesting test context.
+
+    Returns:
+        int: The number of subjects specified via the CLI or default (10).
+    """
+    return int(request.config.getoption("--subjects-to-run-for"))  # type: ignore

docs/utility-guides/LastTestRun.md

@@ -0,0 +1,97 @@
+# Utility Guide: last_test_run
+
+The `last_test_run` utility provides a simple way to track when specific tests were last executed. It is designed to help you avoid running setups for tests multiple times and instead does a check to see if the test has been run today.
+
+---
+
+## Table of Contents
+
+- [Utility Guide: last\_test\_run](#utility-guide-last_test_run)
+  - [Table of Contents](#table-of-contents)
+  - [Overview](#overview)
+  - [When and Why to Use last\_test\_run](#when-and-why-to-use-last_test_run)
+  - [Required Arguments](#required-arguments)
+  - [last\_test\_run Methods](#last_test_run-methods)
+  - [Example Usage](#example-usage)
+  - [How It Works](#how-it-works)
+  - [Implementation Details](#implementation-details)
+
+---
+
+## Overview
+
+This utility manages a JSON file (`.test_last_runs.json`) that records the last date each test was run. It provides functions to load, save, and check this data, making it easy to implement "run once per day" logic in your test suite.
+
+---
+
+## When and Why to Use last_test_run
+
+You might want to use this utility in scenarios such as:
+
+- Avoiding repeated execution of slow or stateful tests within the same day.
+- Ensuring setup or teardown routines only run once per day.
+- Tracking test execution dates for reporting or debugging.
+
+---
+
+## Required Arguments
+
+Each function in this utility requires specific arguments:
+
+- `has_test_run_today(test_name: str) -> bool`:
+  - `test_name` (str): The unique name of the test to check.
+
+See the docstrings in the code for details on each function.
+
+---
+
+## last_test_run Methods
+
+**The main methods provided are:**
+
+- **load_last_run_data() -> Dict[str, Any]**
+  Loads the last run data from the JSON file. Returns a dictionary mapping test names to their last run date.
+
+- **save_last_run_data(data: Dict[str, Any]) -> None**
+  Saves the provided dictionary to the JSON file.
+
+- **has_test_run_today(test_name: str) -> bool**
+  Checks if the given test has already run today. If not, updates the record to mark it as run today.
+
+---
+
+## Example Usage
+
+```python
+from utils.last_test_run import has_test_run_today
+
+def test_expensive_setup():
+    if has_test_run_today("test_expensive_setup"):
+        print("Setup already run today, skipping.")
+        return
+    # ... perform expensive setup ...
+    print("Setup complete.")
+```
+
+---
+
+## How It Works
+
+- The utility stores a mapping of test names to their last run date in `.test_last_runs.json`.
+- When `has_test_run_today` is called, it checks if the test has already run today.
+  - If yes, it returns `True`.
+  - If no, it updates the file and returns `False`.
+
+---
+
+## Implementation Details
+
+- The JSON file is created in the project root if it does not exist.
+- If the file is empty or corrupted, the utility will safely return an empty dictionary and continue.
+- All functions are type-annotated and documented with docstrings for clarity.
+
+---
+
+> **Note:**
+> The `last_test_run` utility is available under `utils/last_test_run.py`.
+> See the source code for more details and to extend its functionality as needed.

pages/base_page.py

@@ -53,6 +53,7 @@ def __init__(self, page: Page):
             "#ntshPageTitle"
         )
         self.main_menu__header = self.page.locator("#ntshPageTitle")
+        self.log_in_page = self.page.get_by_role("button", name="Log in")
 
     def click_main_menu_link(self) -> None:
         """Click the Base Page 'Main Menu' link if it is visible."""
@@ -270,3 +271,7 @@ def handle_dialog(dialog: Dialog):
             dialog.dismiss()  # Dismiss dialog
 
         self.page.once("dialog", handle_dialog)
+
+    def go_to_log_in_page(self) -> None:
+        """Click on the Log in button to navigate to the login page."""
+        self.click(self.log_in_page)

pages/datasets/cancer_audit_datasets_page.py

@@ -1,6 +1,6 @@
 from playwright.sync_api import Page
 from pages.base_page import BasePage
-from enum import Enum
+from enum import StrEnum
 from utils.calendar_picker import CalendarPicker
 from datetime import datetime
 from pages.datasets.investigation_dataset_page import (
@@ -26,6 +26,9 @@ def __init__(self, page: Page):
         self.save_dataset_button = self.page.locator(
             "#UI_DIV_BUTTON_SAVE1"
         ).get_by_role("button", name="Save Dataset")
+        self.edit_dataset_button = self.page.locator(
+            "#UI_DIV_BUTTON_EDIT1"
+        ).get_by_role("button", name="Edit Dataset")
         # Types of Scan
         self.abdominal_ultrasound_checkbox = self.page.get_by_role(
             "checkbox", name="Abdominal Ultrasound"
@@ -52,6 +55,10 @@ def __init__(self, page: Page):
         self.other_textbox = self.page.get_by_role(
             "textbox", name="Please enter the other"
         )
+        # Other Staging and Pre-Treatment Information locators
+        self.treatment_received_select = self.page.get_by_label(
+            "Treatment Received", exact=True
+        )
         # Tumour Information
         self.date_of_diagnosis_textbox = self.page.get_by_role(
             "textbox", name="Date of Diagnosis"
@@ -83,6 +90,10 @@ def click_save_dataset_button(self) -> None:
         """Clicks on the 'Save Dataset' button."""
         self.click(self.save_dataset_button)
 
+    def click_edit_dataset_button(self) -> None:
+        """Clicks on the 'Edit Dataset' button"""
+        self.click(self.edit_dataset_button)
+
     def check_abdominal_ultrasound_checkbox(self) -> None:
         """Checks the 'Abdominal Ultrasound' checkbox."""
         self.abdominal_ultrasound_checkbox.check()
@@ -132,6 +143,10 @@ def fill_other_textbox(self, text: str) -> None:
         self.other_textbox.fill(text)
         self.other_textbox.press("Tab")
 
+    def select_treatment_received_option(self, option: str) -> None:
+        """Select and option from the 'Treatment Received' dropdown"""
+        self.treatment_received_select.select_option(option)
+
     def fill_date_of_diagnosis_textbox(self, date: datetime) -> None:
         """Fills the 'Date of Diagnosis' textbox with the provided date."""
         CalendarPicker(self.page).calendar_picker_ddmmyyyy(
@@ -160,7 +175,7 @@ def select_first_definitive_teatment_information_option(self, option: str) -> No
 NOT_REPORTED_CODE = "202140~~202188"
 
 
-class ASAGradeOptions(Enum):
+class ASAGradeOptions(StrEnum):
     """Enum for ASA Grade options."""
 
     FIT = "17009"
@@ -171,22 +186,22 @@ class ASAGradeOptions(Enum):
     NOT_KNOWN = "17015"
 
 
-class YesNoOptions(Enum):
+class YesNoOptions(StrEnum):
     """Enum for YesNo options."""
 
     YES = "17058"
     NO = "17059"
 
 
-class MetastasesPresentOptions(Enum):
+class MetastasesPresentOptions(StrEnum):
     """Enum for Metastases Present options."""
 
     CERTAIN = "17131~~202199"
     NONE = "17130"
     NOT_REPORTED = NOT_REPORTED_CODE
 
 
-class FinalPreTreatmentTCategoryOptions(Enum):
+class FinalPreTreatmentTCategoryOptions(StrEnum):
     """Enum for Final Pre-Treatment T Category options."""
 
     CTX = "17356"
@@ -198,7 +213,7 @@ class FinalPreTreatmentTCategoryOptions(Enum):
     NOT_REPORTED = NOT_REPORTED_CODE
 
 
-class FinalPreTreatmentNCategoryOptions(Enum):
+class FinalPreTreatmentNCategoryOptions(StrEnum):
     """Enum for Final Pre-Treatment N Category options."""
 
     CNX = "202201"
@@ -208,7 +223,7 @@ class FinalPreTreatmentNCategoryOptions(Enum):
     NOT_REPORTED = NOT_REPORTED_CODE
 
 
-class ReasonNoTreatmentRecievedOptions(Enum):
+class ReasonNoTreatmentRecievedOptions(StrEnum):
     """Enum for Reason No Treatment Received options."""
 
     ADVANCED_DISEASE = "99016"
@@ -219,7 +234,7 @@ class ReasonNoTreatmentRecievedOptions(Enum):
     UNKNOWN = "99018"
 
 
-class PreviouslyExcisedTumorOptions(Enum):
+class PreviouslyExcisedTumorOptions(StrEnum):
     """Enum for Previously Excised Tumor options."""
 
     YES = "17058~~305403"
@@ -228,14 +243,14 @@ class PreviouslyExcisedTumorOptions(Enum):
     NOT_REPORTED = "202140"
 
 
-class TreatmentTypeOptions(Enum):
+class TreatmentTypeOptions(StrEnum):
     """Enum for Treatment Type options."""
 
     SURGICAL = "202143"
     NON_SURGICAL = "202144"
 
 
-class TreatmentGivenOptions(Enum):
+class TreatmentGivenOptions(StrEnum):
     """Enum for Treatment Given options."""
 
     CHEMOTHERAPY = "202160~~202184,202217,202218,202219,202220,202221,202222,202223,202224,202225,202226,202227,202228,202287,305395,305397"
@@ -245,7 +260,7 @@ class TreatmentGivenOptions(Enum):
     SPECIALIST_PALLIATIVE_CARE = "202164~~202184,202217,202218,202219,202220,202221,202222,202223,202224,202225,202226,202227,202228,305395,305397"
 
 
-class CancerTreatmentIntentOptions(Enum):
+class CancerTreatmentIntentOptions(StrEnum):
     """Enum for Cancer Treatment Intent options."""
 
     CURATIVE = "17370"
@@ -254,14 +269,14 @@ class CancerTreatmentIntentOptions(Enum):
     NOT_KNOWN = "17373"
 
 
-class NHSOrPrivateOptions(Enum):
+class NHSOrPrivateOptions(StrEnum):
     """Enum for NHS or Private options."""
 
     NHS = "202153~~202177,202178"
     PRIVATE = "202154~~202179"
 
 
-class TreatmentProviderLookupOptions(Enum):
+class TreatmentProviderLookupOptions(StrEnum):
     """Enum for Treatment Provider lookup options."""
 
     ADVANCE_NURSE_PRACTITIONER_1 = "51905"
@@ -290,7 +305,7 @@ class TreatmentProviderLookupOptions(Enum):
     BUSHBURY_HEALTH_CENTRE = "51801"
 
 
-class ConsultantLookupOptions(Enum):
+class ConsultantLookupOptions(StrEnum):
     """Enum for Consultant lookup options."""
 
     B_FRAME = "201"

pages/screening_practitioner_appointments/appointment_detail_page.py

@@ -33,3 +33,12 @@ def click_save_button(self) -> None:
     def verify_text_visible(self, text: str) -> None:
         """Verifies that the specified text is visible on the page."""
         expect(self.page.get_by_text(text)).to_be_visible()
+
+    def wait_for_attendance_radio(self, timeout_duration: float = 30000) -> None:
+        """
+        Waits for the attendance radio to be visible. Default timeout is 30 seconds but this can be changed
+
+        Args:
+            timeout_duration (float): This is how long you want to wait for in milliseconds
+        """
+        self.attendance_radio.wait_for(timeout=timeout_duration)

pages/screening_practitioner_appointments/practitioner_availability_page.py

@@ -27,6 +27,10 @@ def select_practitioner_dropdown_option(self, practitioner: str) -> None:
         """Selects the practitioner from the dropdown list."""
         self.screening_practitioner_dropdown.select_option(label=practitioner)
 
+    def select_practitioner_dropdown_option_from_index(self, index: int) -> None:
+        """Selects the practitioner from the dropdown list."""
+        self.screening_practitioner_dropdown.select_option(index=index)
+
     def click_calendar_button(self) -> None:
         """Clicks the calendar button to open the calendar picker."""
         self.click(self.calendar_button)

pages/screening_subject_search/episode_events_and_notes_page.py

@@ -9,9 +9,16 @@ def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
         # List of episode events and notes - page locators
+        self.view_appointment_link = self.page.get_by_role(
+            "link", name="View Appointment"
+        )
 
     def expected_episode_event_is_displayed(self, event_description: str) -> None:
         """Check if the expected episode event is displayed on the page."""
         expect(
             self.page.get_by_role("cell", name=event_description, exact=True)
         ).to_be_visible()
+
+    def click_view_appointment_link(self) -> None:
+        """Click the 'View Appointment' link"""
+        self.click(self.view_appointment_link)

pages/screening_subject_search/subject_screening_summary_page.py

@@ -59,6 +59,9 @@ def __init__(self, page: Page):
         )
         self.temporary_address_popup = self.page.locator("#idTempAddress")
         self.close_button = self.page.get_by_role("img", name="close")
+        self.book_practitioner_clinic_button = self.page.get_by_role(
+            "button", name="Book Practitioner Clinic"
+        )
 
     def wait_for_page_title(self) -> None:
         """Waits for the page to be the Subject Screening Summary"""
@@ -227,6 +230,10 @@ def click_close_button(self) -> None:
         """Click on the close button in the temporary address popup."""
         self.click(self.close_button)
 
+    def click_book_practitioner_clinic_button(self) -> None:
+        """Click on the 'Book Practitioner Clinic' button"""
+        self.click(self.book_practitioner_clinic_button)
+
 
 class ChangeScreeningStatusOptions(Enum):
     """Enum for Change Screening Status options."""