New: [AEA-4941] - Repeat prescription automated test end to end journey (#287)

## Summary

- Routine Change
- ✨ New Feature

### Details

updated pre-commit version
package updates
slight addition to `make deep-clean`
template.env updated to reflect new environment variables used when
running locally

Modified EPS tests to include repeats when creating prescriptions

Author: seansteberisal

.gitallowed

@@ -13,3 +13,4 @@ CidrBlock:\s?"?10\.0\.\d+\.\d+\/\d+"
 .*token_response\[\"access_token\"\].*
 .*password=None.*
 .*secrets.REGRESSION_TESTS_PAT.*
+*.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

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
 
@@ -101,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/environment.py

@@ -169,8 +169,8 @@ def before_scenario(context, scenario):
         return
     product = context.config.userdata["product"].upper()
     if product == "CPTS-UI":
-        global _playwright
-        global _page
+        global _playwright  # noqa: F824
+        global _page  # noqa: F824
         context.browser = context.browser.new_context()
         context.browser.tracing.start(screenshots=True, snapshots=True, sources=True)
         context.page = context.browser.new_page()
@@ -194,7 +194,7 @@ def after_scenario(context, scenario):
                     attachment_type="application/zip",
                 )
             if context.page is not None:
-                global _page
+                global _page  # noqa: F824
                 _page.close()
 
 

features/eps_fhir/cancel_prescriptions.feature

@@ -1,15 +1,22 @@
 @eps_fhir @cancel @regression @blocker @smoke
 @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-3869
+@allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4941
 Feature: I can cancel prescriptions
 
   @skip-sandbox
   Scenario Outline: I can cancel a prescription
     Given I am an authorised prescriber with <App> app
-    And I successfully prepare and sign a non-nominated prescription
+    And I successfully prepare and sign a <Nomination> <Type> prescription
     When I cancel all line items on the prescription
     Then the response indicates a success
     And the response body indicates a successful cancel action
     Examples:
-      | App           |
-      | EPS-FHIR      |
-      | EPS-FHIR-SHA1 |
+      | App           | Nomination    | Type   |
+      | EPS-FHIR      | nominated     | acute  |
+      | EPS-FHIR      | non-nominated | acute  |
+      | EPS-FHIR      | nominated     | repeat |
+      | EPS-FHIR      | non-nominated | repeat |
+      | EPS-FHIR-SHA1 | nominated     | acute  |
+      | EPS-FHIR-SHA1 | non-nominated | acute  |
+      | EPS-FHIR-SHA1 | nominated     | repeat |
+      | EPS-FHIR-SHA1 | non-nominated | repeat |

features/eps_fhir/create_prescriptions.feature

@@ -3,28 +3,33 @@
 Feature: I can create prescriptions
 
   @skip-sandbox
+  @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4941
   Scenario Outline: I can create, sign and release a prescription
     Given I am an authorised prescriber with <App> app
-    And I successfully prepare and sign a <Type> prescription
+    And I successfully prepare and sign a <Nomination> <Type> prescription
     When I am an authorised dispenser with EPS-FHIR app
     And I release the prescription
     Then the response indicates a success
     And the response body indicates a successful release action
     Examples:
-      | Type          | App           |
-      | nominated     | EPS-FHIR      |
-      | non-nominated | EPS-FHIR      |
-      | nominated     | EPS-FHIR-SHA1 |
-      | non-nominated | EPS-FHIR-SHA1 |
+      | App           | Nomination    | Type   |
+      | EPS-FHIR      | nominated     | acute  |
+      | EPS-FHIR      | non-nominated | acute  |
+      | EPS-FHIR      | nominated     | repeat |
+      | EPS-FHIR      | non-nominated | repeat |
+      | EPS-FHIR-SHA1 | nominated     | acute  |
+      | EPS-FHIR-SHA1 | non-nominated | acute  |
+      | EPS-FHIR-SHA1 | nominated     | repeat |
+      | EPS-FHIR-SHA1 | non-nominated | repeat |
 
   @skip-sandbox
   Scenario: I can create a prescription with sha256
     Given I am an authorised prescriber with EPS-FHIR app
-    And I successfully prepare a nominated prescription
+    And I successfully prepare a nominated acute prescription
     Then the signing algorithm is RS256
 
   @skip-sandbox
   Scenario: I can create a prescription with sha1
     Given I am an authorised prescriber with EPS-FHIR-SHA1 app
-    And I successfully prepare a nominated prescription
+    And I successfully prepare a nominated acute prescription
     Then the signing algorithm is RS1

features/eps_fhir/dispense_prescriptions.feature

@@ -2,11 +2,18 @@
 Feature: I can dispense prescriptions
 
   @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-3865
-  Scenario: I can dispense a prescription
-    Given a prescription has been created and released using apim apis
+  @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4941
+  Scenario Outline: I can dispense a prescription
+    Given a <Nomination> <Type> prescription has been created and released using apim apis
     When I dispense the prescription
     Then the response indicates a success
     And the response body indicates a successful dispense action
+    Examples:
+      | Nomination    | Type   |
+      | nominated     | acute  |
+      | non-nominated | acute  |
+      | nominated     | repeat |
+      | non-nominated | repeat |
 
   @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-3868
   Scenario: I can amend a single dispense notification

features/eps_fhir/return_prescriptions.feature

@@ -1,9 +1,16 @@
 @eps_fhir @smoke @regression @blocker @return
 @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-3866
+@allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4941
 Feature: I can return prescriptions
 
-  Scenario: I can return a prescription
-    Given a prescription has been created and released using apim apis
+  Scenario Outline: I can return a prescription
+    Given a <Nomination> <Type> prescription has been created and released using apim apis
     When I return the prescription
     Then the response indicates a success
     And the response body indicates a successful return action
+    Examples:
+      | Nomination    | Type   |
+      | nominated     | acute  |
+      | non-nominated | acute  |
+      | nominated     | repeat |
+      | non-nominated | repeat |

features/eps_fhir_dispensing/dispense_prescriptions.feature

@@ -3,11 +3,18 @@
 Feature: I can dispense prescriptions
 
   @dispense
-  Scenario: I can dispense a prescription
-    Given a prescription has been created and released using proxygen apis
+  @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4941
+  Scenario Outline: I can dispense a prescription
+    Given a <Nomination> <Type> prescription has been created and released using proxygen apis
     When I dispense the prescription
     Then the response indicates a success
     And the response body indicates a successful dispense action
+    Examples:
+      | Nomination    | Type   |
+      | nominated     | acute  |
+      | non-nominated | acute  |
+      | nominated     | repeat |
+      | non-nominated | repeat |
 
   @amend
   Scenario: I can amend a single dispense notification