Skip to content

Commit a4d3f47

Browse files
Merge branch 'master' into task/NPA-5608/consent-id-spec-fixes
2 parents 431a5f3 + 1c78969 commit a4d3f47

File tree

5 files changed

+62
-59
lines changed

5 files changed

+62
-59
lines changed

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ https://nhsd-jira.digital.nhs.uk/browse/NPA-XXXX
4747
<!-- Complete before submitting the PR -->
4848

4949
- [ ] PR title follows the format: `NPA-XXXX: <short-description>`
50-
- [ ] Branch name follows the convention: `<type>/NPA-XXXX-<short-description>`
50+
- [ ] Branch name follows the convention: `<type>/NPA-XXXX/<short-description>`
5151
- [ ] Commit messages follow the template: `NPA-XXXX: <short-description>`
5252
- [ ] All acceptance criteria from the Jira ticket are addressed
5353
- [ ] Automated tests (unit/integration/API/infrastructure etc. tests) are added or updated

.github/workflows/run-postman-collection.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ jobs:
1616
- name: Install Newman
1717
run: npm install -g newman
1818
- name: Run Postman Collection
19-
run: newman run ./postman/Validate\ Relationship\ Service\ Sandbox.postman_collection.json
19+
run: newman run "./postman/Validated Relationship Service Sandbox.postman_collection.json"

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,5 @@ sandbox/output.json
2626
sandbox/pytest_html_report.html
2727
sandbox/archive/
2828
sandbox/.hypothesis/
29+
30+
.tool-versions

sandbox/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ For more information about building sandbox APIs see the [API Producer Zone conf
1515
- [Starting the API](#starting-the-api)
1616
- [Development](#development)
1717
- [Starting the API with Hot Reloading](#starting-the-api-with-hot-reloading)
18+
- [Updating examples](#updating-examples)
1819
- [Testing](#testing)
1920
- [Unit Tests](#unit-tests)
2021
- [Useful commands](#useful-commands)
@@ -27,7 +28,7 @@ The API is able to be run locally on the host system for development and testing
2728

2829
The Sandbox is deployed using Docker to AWS ECS; the Dockerfile is located in the root of the repository. This allows Docker to copy in responses from `specification/examples/responses`. The docker container is deployed to AWS ECS using Azure DevOps pipelines.
2930

30-
The [Postman Collection](./postman/Validate_Relationship_Service_Sandbox.postman_collection.json) is used to test the Sandbox API. The tests embedded in the collection are run in GitHub Actions on each Pull Request.
31+
The [Postman Collection](./postman/Validated Relationship Service Sandbox.postman_collection.json) is used to test the Sandbox API. The tests embedded in the collection are run in GitHub Actions on each Pull Request.
3132

3233
## Prerequisites
3334

0 commit comments

Comments
 (0)