Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ef66882
CCM-7478: Remove unnecessary sandbox dependency
gareth-allan Sep 19, 2025
d5ffc92
CCM-7478: Configure test coverage reporting
gareth-allan Sep 19, 2025
5e82989
CCM-7478: Try to fix coverage path
gareth-allan Sep 19, 2025
db90384
CCM-7478: Add debug
gareth-allan Sep 19, 2025
3a1ce51
CCM-7478: Remove debug again
gareth-allan Sep 22, 2025
dfa0fc4
CCM-7478: Rewrite LCOV file for correct paths
gareth-allan Sep 22, 2025
de89956
CCM-7478: Tweak coverage generation
gareth-allan Sep 23, 2025
a3622a4
CCM-7478: Don't set Node.js path for Sonar
gareth-allan Sep 23, 2025
94bf92e
Enable debug mode for Sonar scan
gareth-allan Sep 23, 2025
71335ae
CCM-7478: Try disabling coverage exclusions
gareth-allan Sep 23, 2025
a825808
Merge branch 'release' into feature/CCM-7478_sonarqube_test_coverage
gareth-allan Sep 29, 2025
dc56cd5
CCM-7478: Specify test files to Sonar
gareth-allan Sep 29, 2025
b596fec
CCM-7478: Attempt to fail Sonar quality gate
gareth-allan Sep 29, 2025
7ff1310
CCM-7478: Further attempts to break Sonar
gareth-allan Sep 29, 2025
e56ce99
CCM-7478: Further attempt to fail Sonar quality gate
gareth-allan Sep 29, 2025
fd86be5
CCM-7478: Try adding a sonar.sources property
gareth-allan Sep 29, 2025
c066b32
CCM-7478: Remove sonar.tests property
gareth-allan Sep 29, 2025
df79145
CCM-7478: Make Sonar scan fail if quality gate fails
gareth-allan Sep 29, 2025
e267f3a
CCM-7478: Attempt to configure test files again
gareth-allan Sep 29, 2025
4f983d5
CCM-7478: Remove deliberate Sonar failure
gareth-allan Sep 30, 2025
5e582ac
CCM-7478: Disable Sonar debug output
gareth-allan Sep 30, 2025
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
4 changes: 4 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ jobs:
run: |
cd sandbox
npm run test
cd -
mkdir coverage coverage-temp
TMPDIR="./coverage-temp" npx lcov-result-merger sandbox/coverage/lcov.info coverage/lcov.info --prepend-source-files
rm -r coverage-temp

- name: Check licenses
run: make check-licenses
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ env
*.pem
sandbox/coverage
sandbox/.nyc_output
coverage
zap-report/
zap-report.json
zap-report.xml
Expand Down
142 changes: 0 additions & 142 deletions sandbox/package-lock.json

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

1 change: 0 additions & 1 deletion sandbox/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"license-checker": "^25.0.1",
"mocha": "^11.7.2",
"mocha-junit-reporter": "^2.2.1",
"mocha-multi": "^1.1.3",
"nodemon": "^3.1.10",
"supertest": "^7.1.4"
}
Expand Down
10 changes: 7 additions & 3 deletions scripts/config/sonar-scanner.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@ sonar.organization=nhsdigital
sonar.projectKey=NHSDigital_communications-manager-api
sonar.sourceEncoding=UTF-8
sonar.language=js,python
sonar.qualitygate.wait=true
Comment thread
gareth-allan marked this conversation as resolved.

sonar.sources=.
sonar.tests=tests/, sandbox/__test__
sonar.test.inclusions=tests/**.py, sandbox/__test__/**
sonar.exclusions=.venv/**,proxies/utils/performance/*

#exclude everything from test coverage, this is covered by other tools
sonar.coverage.exclusions=**/*
#sonar.nodejs.executable=/usr/bin/node
sonar.python.version=3.10.8

# Configure test coverage reporting
sonar.javascript.lcov.reportPaths=coverage/lcov.info

#exclusion rules for our proxy JS - rhinojs 1.7.12 -https://mozilla.github.io/rhino/compat/engines.html
sonar.issue.ignore.multicriteria=optChain,useLet

Expand Down