Merge remote-tracking branch 'origin/main' into claims_test

Author: anthony-nhs

.devcontainer/devcontainer.json

@@ -44,7 +44,8 @@
             "github.vscode-github-actions",
             "ms-python.pylint",
             "ms-python.black-formatter",
-            "jimasp.behave-vsc"
+            "jimasp.behave-vsc",
+            "Gruntfuggly.todo-tree"
         ],
         "settings": {
           "python.defaultInterpreterPath": "/workspaces/electronic-prescription-service-api-regression-tests/venv/bin/python",

.gitallowed

@@ -13,3 +13,10 @@ CidrBlock:\s?"?10\.0\.\d+\.\d+\/\d+"
 .*token_response\[\"access_token\"\].*
 .*password=None.*
 .*secrets.REGRESSION_TESTS_PAT.*
+*.env
+arguments.password
+body = f"username={username}&password={password}&grant_type=password"
+--secret="\$APIGEE_MFA_SECRET"
+password = arguments\.password
+poetry run python scripts/add_pr_product_to_app.py --user="$APIGEE_USER" --*** --secret="$APIGEE_MFA_SECRET" --pr="$PR_ID"
+--user="$APIGEE_USER" --*** --secret="$APIGEE_MFA_SECRET"

.github/workflows/regression_tests.yml

@@ -78,7 +78,7 @@ jobs:
 
       # using git commit sha for version of action to ensure we have stable version
       - name: Install asdf
-        uses: asdf-vm/actions/setup@1117842ea70e2711a0072e3a71265cbfe2c830be
+        uses: asdf-vm/actions/setup@9cd779f40fe38688dd19505ccbc4eaaf018b44e7
         with:
           asdf_version: 0.16.4
 
@@ -90,7 +90,7 @@ jobs:
           key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
 
       - name: Install asdf dependencies in .tool-versions
-        uses: asdf-vm/actions/install@1117842ea70e2711a0072e3a71265cbfe2c830be
+        uses: asdf-vm/actions/install@9cd779f40fe38688dd19505ccbc4eaaf018b44e7
         with:
           asdf_version: 0.16.4
         env:

.github/workflows/release.yml

@@ -37,7 +37,7 @@ jobs:
 
       # using git commit sha for version of action to ensure we have stable version
       - name: Install asdf
-        uses: asdf-vm/actions/setup@1117842ea70e2711a0072e3a71265cbfe2c830be
+        uses: asdf-vm/actions/setup@9cd779f40fe38688dd19505ccbc4eaaf018b44e7
         with:
           asdf_version: 0.16.4
 
@@ -49,7 +49,7 @@ jobs:
           key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
 
       - name: Install asdf dependencies in .tool-versions
-        uses: asdf-vm/actions/install@1117842ea70e2711a0072e3a71265cbfe2c830be
+        uses: asdf-vm/actions/install@9cd779f40fe38688dd19505ccbc4eaaf018b44e7
         with:
           asdf_version: 0.16.4
         env:

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ default_language_version:
     python: python3.12
 repos:   
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: check-merge-conflict
         name: Check for merge conflict strings

.tool-versions

@@ -1,5 +1,5 @@
 python 3.12.9
-poetry 1.8.3
+poetry 2.1.1
 shellcheck 0.10.0
 nodejs 22.14.0
 actionlint 1.7.7

Makefile

@@ -18,6 +18,14 @@ update-node:
 update-poetry:
 	poetry update
 
+install-asdf:
+	asdf plugin add python
+	asdf plugin add poetry
+	asdf plugin add shellcheck
+	asdf plugin add nodejs
+	asdf plugin add actionlint
+	asdf install
+
 install-python:
 	poetry install
 
@@ -52,6 +60,7 @@ check-licenses:
 
 deep-clean-install:
 	rm -f -d -r .venv/
+	mkdir .venv/
 	asdf uninstall poetry
 	asdf uninstall python
 	asdf plugin remove poetry

README.md

@@ -6,6 +6,7 @@ These tests will automate End-to-End regression testing for:
 * [Prescriptions for Patients (PfP)](https://digital.nhs.uk/developer/api-catalogue/prescriptions-for-patients)
 * [Prescription Status Update (PSU)](https://digital.nhs.uk/developer/api-catalogue/prescription-status-update-fhir/)
 * [Clinical Prescription Tracker UI (CPT-UI)](https://github.com/NHSDigital/eps-prescription-tracker-ui)
+* [Clinical Prescription Tracker API (CPT-API)](https://github.com/NHSDigital/electronic-prescription-service-clinical-prescription-tracker)
 
 ## General usage
 These tests are run automatically during deployment and shouldn't need to be touched unless performing debugging or
@@ -22,12 +23,27 @@ It is necessary to set some Environment variables in order to run any tests in y
 1. `.env` file
 2. OS environment variable
 
-The following environment variables need to be set for the correct environment you wish to test against:
-* CLIENT_ID
-* CLIENT_SECRET
+The following environment variables may need to be set for the correct environment you wish to test against:
+* CPT_FHIR_CLIENT_ID
+* CPT_FHIR_CLIENT_SECRET
+* EPS_FHIR_CLIENT_ID
+* EPS_FHIR_CLIENT_SECRET
+* EPS_FHIR_SHA1_CLIENT_ID
+* EPS_FHIR_SHA1_CLIENT_SECRET
+* EPS_FHIR_PRESCRIBING_CLIENT_ID
+* EPS_FHIR_PRESCRIBING_CLIENT_SECRET
+* EPS_FHIR_PRESCRIBING_SHA1_CLIENT_ID
+* EPS_FHIR_PRESCRIBING_SHA1_CLIENT_SECRET
+* EPS_FHIR_DISPENSING_CLIENT_ID
+* EPS_FHIR_DISPENSING_CLIENT_SECRET
+* PFP_CLIENT_ID
+* PFP_CLIENT_SECRET
+* PSU_CLIENT_ID
+* PSU_CLIENT_SECRET
 * PRIVATE_KEY
 * CERTIFICATE
 
+
 To make this easier, a `template.env` file is located on the root. Fill in the values and rename this to `.env`
 
 Any file that begins with `.env` is automatically ignored by Git
@@ -42,15 +58,8 @@ You may need to run `poetry shell` to activate the poetry shell, followed by `ma
 If you'd like to use your own machine without containerisation. You will need the following;
 * Ubuntu (WSL)
 * [ASDF](https://asdf-vm.com/guide/getting-started.html)
-#### Once ASDF is installed, add the following plugins:
-* ASDF python plugin `asdf plugin add python`
-* ASDF poetry plugin `asdf plugin add poetry`
-* ASDF shellcheck plugin `asdf plugin add shellcheck`
-* ASDF nodejs plugin `asdf plugin add nodejs`
-#### Once the plugins are added you can install them
-`asdf install` This will install the versions as described in .tool-versions
-
-Now you can run `make install` to install the virtualenv and packages. You may need to run `poetry shell` to activate the poetry shell, followed by `make install-playwright` to install the playwright tools. To check if these are installed properly, run `playwright codegen` and check that you see a browser window pop up.
+You can now run the `make install-asdf` command
+* next, run `make install` to install the virtualenv and packages. You may need to run `poetry shell` to activate the poetry shell, followed by `make install-playwright` to install the playwright tools. To check if these are installed properly, run `playwright codegen` and check that you see a browser window pop up.
 
 ## Developing/Debugging Tests
 
@@ -73,10 +82,11 @@ Make sure that your behave run configuration includes the `--product=` & `--env=
 Run the tests by calling the Make command `make run-tests`. This requires the parameters `product=` and `env=` to be passed in.
 Optionally, you can pass in tags to be run, for example `tags=cpt-ui` will run all CPT-UI-tagged tests.
 Further, if you want to actually see the tests being executed, you can pass a `HEADLESS=true` to the makefile.
+If you want to throttle the speed that the tests are done, you can insert a delay between each action by passing the `SLOWMO=<delay, ms>` environment variable. This lets a human keep track of what steps are being done.
 
 For example:
 ```
-product=cpts-ui env=internal-dev PULL_REQUEST_ID=pr-300 tags=cpt-ui HEADLESS=true make run-tests
+product=cpts-ui env=internal-dev PULL_REQUEST_ID=pr-300 tags=login HEADLESS=false SLOWMO=2000 make run-tests
 ```
 
 Note that CPT-UI supports localhost testing. To do this, use the `env=localhost` variable - but ensure you have *not* set the `PULL_REQUEST_ID` variable, as it is not needed and will break the tests. Make sure your localhost server is running!
@@ -100,7 +110,7 @@ Change the `env` variable accordingly to either `INT` or `INTERNAL-DEV`.
 If you wish to test a different product i.e. `PFP-APIGEE` then you must change `product=` and `--tags` respectively.
 
 ### Method 5:
-Run the tests by pushing changes to github in a pull request and running the regression tests job.
+Run the tests by pushing changes to GitHub in a pull request and running the regression tests job.
 You can do this by the browser or by running this
 ```
 BRANCH=fix_tests_take_2

features/cpts_ui/change_role.feature

@@ -84,6 +84,16 @@ Feature: Users are able to change their roles, if they have multiple roles with
     Then I am on the change role page
     And I can see the role that has been pre selected
 
+  @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-5046
+  Scenario: User refreshes the page and retains roles with access
+    Given I am logged in as a user with multiple access roles
+    And I have confirmed a role
+    And I am on the change your role page
+    When I click a change role role card
+    And I click the change link next to the role text
+    And I refresh the page
+    Then I do not see the change role page header link
+
   @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4974
   Scenario: User can see roles with access cards
     Given I am logged in with a single access role and multiple without access

features/cpts_ui/patient_detail_banner.feature

@@ -0,0 +1,34 @@
+@cpts_ui @patient_detail_banner @regression @blocker @smoke @ui
+@allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-5061
+Feature: The site has a patient detail banner
+    
+    Background:
+        Given I am logged in as a user with multiple access roles
+        And I have confirmed a role
+
+    Scenario: Before I search for a prescription, the patient details banner is not visible
+        When I go to the search for a prescription page
+        Then I am on the search for a prescription page
+        And the patient details banner is not visible
+
+    Scenario: When I search for a prescription, and go back, the patient details banner is not visible
+        When I go to the search for a prescription page
+        And I click on tab Prescription ID search
+        # FIXME: This will need to be updated when the search pages are updated to use real data
+        And I search for a prescription using a valid prescription ID "C0C757-A83008-A1234O"
+        And I click the Go Back link on the prescription not found page
+        Then The patient details banner is not visible
+
+    Scenario: When I search for a prescription, the patient details appear
+        When I go to the search for a prescription page
+        And I click on tab Prescription ID search
+        # FIXME: This will need to be updated when the search pages are updated to use real data
+        And I search for a prescription using a valid prescription ID "C0C757-A83008-C2D93O"
+        Then The patient details banner reports complete data
+
+    # TODO: Can we set a prescription with incomplete patient data?
+    Scenario: When I search for a prescription with incomplete data, the patient detail banner is formatted correctly
+        When I go to the search for a prescription page
+        And I click on tab Prescription ID search
+        And I search for a prescription using a valid prescription ID "209E3D-A83008-327F9F"
+        Then The patient details banner reports incomplete data