Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
run: python -m pip install --upgrade pip setuptools wheel

- name: Install poetry
run: pip install "poetry<2.0.0"
run: 'pip install --only-binary :all: "poetry==2.4.1"'

- name: Cache poetry packages
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
Expand Down
16 changes: 10 additions & 6 deletions azure/templates/run-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
- name: private_key_file_path
type: string

variables:
WorkingDir: ${{ parameters.working_directory }}
TargetUrl: ${{ parameters.target_url }}

steps:
- task: UseDotNet@2
displayName: 'Use .NET Core sdk'
Expand Down Expand Up @@ -43,21 +47,21 @@
command: 'custom'
custom: vstest
arguments: >
${{ parameters.working_directory }}/Publish/Nhs.App.Api.Integration.Tests/Nhs.App.Api.Integration.Tests.dll
--logger:"trx;LogFileName=${{ parameters.working_directory }}/IntegrationTests/Tests.trx"
--settings:${{ parameters.working_directory }}/Publish/Nhs.App.Api.Integration.Tests/test.runsettings
$(WorkingDir)/Publish/Nhs.App.Api.Integration.Tests/Nhs.App.Api.Integration.Tests.dll
--logger:"trx;LogFileName=$(WorkingDir)/IntegrationTests/Tests.trx"
--settings:$(WorkingDir)/Publish/Nhs.App.Api.Integration.Tests/test.runsettings
-- TestRunParameters.Parameter(name="\""ApigeeApiKey"\"",value="\""$(CLIENT_ID)"\"")
-- TestRunParameters.Parameter(name="\""ApplicationUrl"\"",value="\""${{ parameters.target_url }}"\"")
-- TestRunParameters.Parameter(name="\""ApplicationUrl"\"",value="\""$(TargetUrl)"\"")
-- TestRunParameters.Parameter(name="\""TokenEndpoint"\"",value="\""${{ parameters.token_url }}"\"")

Check failure on line 55 in azure/templates/run-integration-tests.yml

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Change this step to not use user-controlled data directly in the argument 'arguments'.

See more on https://sonarcloud.io/project/issues?id=NHSDigital_nhs-app-api&issues=AZ9f_A9HYTMT2AZxatX5&open=AZ9f_A9HYTMT2AZxatX5&pullRequest=383
-- TestRunParameters.Parameter(name="\""IssuerKey"\"",value="\""$(JWT_TESTING_API_KEY)"\"")
-- TestRunParameters.Parameter(name="\""PrivateKeyFilePath"\"",value="\""${{ parameters.private_key_file_path }}"\"")
-- TestRunParameters.Parameter(name="\""KidValue"\"",value="\"test-1\"")

- task: PublishTestResults@2
displayName: 'Publish Test Results ${{ parameters.working_directory }}/IntegrationTests/Tests.trx'
displayName: 'Publish Test Results $(WorkingDir)/IntegrationTests/Tests.trx'
inputs:
testResultsFormat: VSTest
testResultsFiles: '${{ parameters.working_directory }}/IntegrationTests/Tests.trx'
testResultsFiles: '$(WorkingDir)/IntegrationTests/Tests.trx'
mergeTestResults: true
testRunTitle: 'Integration Tests'
continueOnError: true
Expand Down
4 changes: 2 additions & 2 deletions sandbox/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM node:12
FROM node:24

COPY . /sandbox

WORKDIR /sandbox

RUN npm install
RUN npm install --ignore-scripts

EXPOSE 9000

Expand Down
73 changes: 39 additions & 34 deletions sandbox/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.