From 66b251721a1d55abe8160c6736b8fcef335c5e14 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 09:50:45 +0000 Subject: [PATCH 01/12] fix(deps): update dependency express to v4.21.1 (#3925) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 14 ++++++++------ package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6e7570cfb9..9392e18d04 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "csurf": "1.11.0", "dayjs": "1.11.13", "email-validator": "2.0.4", - "express": "4.21.0", + "express": "4.21.1", "express-http-proxy": "2.1.1", "express-nunjucks": "3.1.2", "express-session": "1.18.1", @@ -11113,7 +11113,9 @@ "license": "MIT" }, "node_modules/cookie": { - "version": "0.6.0", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "license": "MIT", "engines": { "node": ">= 0.6" @@ -13545,9 +13547,9 @@ "optional": true }, "node_modules/express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "license": "MIT", "dependencies": { "accepts": "~1.3.8", @@ -13555,7 +13557,7 @@ "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", diff --git a/package.json b/package.json index 51ba197ca6..786e03acc9 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "csurf": "1.11.0", "dayjs": "1.11.13", "email-validator": "2.0.4", - "express": "4.21.0", + "express": "4.21.1", "express-http-proxy": "2.1.1", "express-nunjucks": "3.1.2", "express-session": "1.18.1", diff --git a/yarn.lock b/yarn.lock index ab902ec9d1..9049de64fe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8757,16 +8757,16 @@ __metadata: languageName: node linkType: hard -"express@npm:4.21.0": - version: 4.21.0 - resolution: "express@npm:4.21.0" +"express@npm:4.21.1": + version: 4.21.1 + resolution: "express@npm:4.21.1" dependencies: accepts: ~1.3.8 array-flatten: 1.1.1 body-parser: 1.20.3 content-disposition: 0.5.4 content-type: ~1.0.4 - cookie: 0.6.0 + cookie: 0.7.1 cookie-signature: 1.0.6 debug: 2.6.9 depd: 2.0.0 @@ -8792,7 +8792,7 @@ __metadata: type-is: ~1.6.18 utils-merge: 1.0.1 vary: ~1.1.2 - checksum: 1c5212993f665809c249bf00ab550b989d1365a5b9171cdfaa26d93ee2ef10cd8add520861ec8d5da74b3194d8374e1d9d53e85ef69b89fd9c4196b87045a5d4 + checksum: 5ac2b26d8aeddda5564fc0907227d29c100f90c0ead2ead9d474dc5108e8fb306c2de2083c4e3ba326e0906466f2b73417dbac16961f4075ff9f03785fd940fe languageName: node linkType: hard @@ -13708,7 +13708,7 @@ __metadata: eslint-plugin-import: 2.29.1 eslint-plugin-jest: 28.8.3 eslint-plugin-prettier: 5.2.1 - express: 4.21.0 + express: 4.21.1 express-http-proxy: 2.1.1 express-nunjucks: 3.1.2 express-session: 1.18.1 From 4c558cfd7ec3eb2257a09970a461ddd9d8ebd93f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 10:32:28 +0000 Subject: [PATCH 02/12] fix(deps): update dependency typescript to v5.6.3 (#3927) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- yarn.lock | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9392e18d04..8c595c459c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -71,7 +71,7 @@ "toobusy-js": "0.5.1", "ts-node": "10.9.2", "tsconfig-paths": "4.2.0", - "typescript": "5.6.2", + "typescript": "5.6.3", "uuid": "10.0.0" }, "devDependencies": { @@ -25483,9 +25483,9 @@ } }, "node_modules/typescript": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", - "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", + "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", diff --git a/package.json b/package.json index 786e03acc9..d5893ee967 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "toobusy-js": "0.5.1", "ts-node": "10.9.2", "tsconfig-paths": "4.2.0", - "typescript": "5.6.2", + "typescript": "5.6.3", "uuid": "10.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 9049de64fe..46c77f7665 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13756,7 +13756,7 @@ __metadata: ts-loader: 9.5.1 ts-node: 10.9.2 tsconfig-paths: 4.2.0 - typescript: 5.6.2 + typescript: 5.6.3 uuid: 10.0.0 webdriverio: 9.1.4 webpack: 5.95.0 @@ -18049,23 +18049,23 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.6.2, typescript@npm:^5.1.3": - version: 5.6.2 - resolution: "typescript@npm:5.6.2" +"typescript@npm:5.6.3, typescript@npm:^5.1.3": + version: 5.6.3 + resolution: "typescript@npm:5.6.3" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 48777e1dabd9044519f56cd012b0296e3b72bafe12b7e8e34222751d45c67e0eba5387ecdaa6c14a53871a29361127798df6dc8d1d35643a0a47cb0b1c65a33a + checksum: ba302f8822777ebefb28b554105f3e074466b671e7444ec6b75dadc008a62f46f373d9e57ceced1c433756d06c8b7dc569a7eefdf3a9573122a49205ff99021a languageName: node linkType: hard -"typescript@patch:typescript@5.6.2#~builtin, typescript@patch:typescript@^5.1.3#~builtin": - version: 5.6.2 - resolution: "typescript@patch:typescript@npm%3A5.6.2#~builtin::version=5.6.2&hash=8c6c40" +"typescript@patch:typescript@5.6.3#~builtin, typescript@patch:typescript@^5.1.3#~builtin": + version: 5.6.3 + resolution: "typescript@patch:typescript@npm%3A5.6.3#~builtin::version=5.6.3&hash=8c6c40" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: be6138b734b2d5f6aa9844b760d6a9e853d395e55ec4570ff1026cca195e5968849e38907c18f9c5b35f6a38e4e18ec29937f1c2ae03c6405e9874ad45d810b1 + checksum: f6947c263dc67ea8429eefc3921683320f901a07d9ef29a1101a34f5b30108343b5a29aa77a581217a17f2616091ae7bd3043b304cf37f37d5e128e19296c08b languageName: node linkType: hard From e9018c7aa093af663fd8ae0a3b6de0e77c2a25d6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 11:15:50 +0000 Subject: [PATCH 03/12] chore(deps): update dependency @playwright/test to v1.48.0 (#3928) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 24 ++++++++++++------------ package.json | 2 +- yarn.lock | 36 ++++++++++++++++++------------------ 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8c595c459c..a8c8ac3bd6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -76,7 +76,7 @@ }, "devDependencies": { "@codeceptjs/allure-legacy": "1.0.2", - "@playwright/test": "1.47.2", + "@playwright/test": "1.48.0", "@types/jest": "29.5.13", "@typescript-eslint/eslint-plugin": "7.18.0", "@typescript-eslint/parser": "7.18.0", @@ -4821,13 +4821,13 @@ } }, "node_modules/@playwright/test": { - "version": "1.47.2", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.47.2.tgz", - "integrity": "sha512-jTXRsoSPONAs8Za9QEQdyjFn+0ZQFjCiIztAIF6bi1HqhBzG9Ma7g1WotyiGqFSBRZjIEqMdT8RUlbk1QVhzCQ==", + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.48.0.tgz", + "integrity": "sha512-W5lhqPUVPqhtc/ySvZI5Q8X2ztBOUgZ8LbAFy0JQgrXZs2xaILrUcNO3rQjwbLPfGK13+rZsDa1FpG+tqYkT5w==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright": "1.47.2" + "playwright": "1.48.0" }, "bin": { "playwright": "cli.js" @@ -21701,13 +21701,13 @@ } }, "node_modules/playwright": { - "version": "1.47.2", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.47.2.tgz", - "integrity": "sha512-nx1cLMmQWqmA3UsnjaaokyoUpdVaaDhJhMoxX2qj3McpjnsqFHs516QAKYhqHAgOP+oCFTEOCOAaD1RgD/RQfA==", + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.48.0.tgz", + "integrity": "sha512-qPqFaMEHuY/ug8o0uteYJSRfMGFikhUysk8ZvAtfKmUK3kc/6oNl/y3EczF8OFGYIi/Ex2HspMfzYArk6+XQSA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.47.2" + "playwright-core": "1.48.0" }, "bin": { "playwright": "cli.js" @@ -21720,9 +21720,9 @@ } }, "node_modules/playwright-core": { - "version": "1.47.2", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.47.2.tgz", - "integrity": "sha512-3JvMfF+9LJfe16l7AbSmU555PaTl2tPyQsVInqm3id16pdDfvZ8TTZ/pyzmkbDrZTQefyzU7AIHlZqQnxpqHVQ==", + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.48.0.tgz", + "integrity": "sha512-RBvzjM9rdpP7UUFrQzRwR8L/xR4HyC1QXMzGYTbf1vjw25/ya9NRAVnXi/0fvFopjebvyPzsmoK58xxeEOaVvA==", "dev": true, "license": "Apache-2.0", "bin": { diff --git a/package.json b/package.json index d5893ee967..7796f3a1e2 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ }, "devDependencies": { "@codeceptjs/allure-legacy": "1.0.2", - "@playwright/test": "1.47.2", + "@playwright/test": "1.48.0", "@types/jest": "29.5.13", "@typescript-eslint/eslint-plugin": "7.18.0", "@typescript-eslint/parser": "7.18.0", diff --git a/yarn.lock b/yarn.lock index 46c77f7665..947b7c0ba1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2590,14 +2590,14 @@ __metadata: languageName: node linkType: hard -"@playwright/test@npm:1.47.2": - version: 1.47.2 - resolution: "@playwright/test@npm:1.47.2" +"@playwright/test@npm:1.48.0": + version: 1.48.0 + resolution: "@playwright/test@npm:1.48.0" dependencies: - playwright: 1.47.2 + playwright: 1.48.0 bin: playwright: cli.js - checksum: 4f149613c0fd4a40061425efdf5c7a257df09e1b6b797ad221597ddde52381edb69fce6645bf3b95a11eee74147a2025c1951041f29dbc717dab0cc46d9c3427 + checksum: 81a6260db1b2dd4a6bff7a31f6fd83a6db21109268a3516e47f24e3de64b0da1b9fa985dab5fdccc73fc9c5cca2e0c1ef2137f5cdc5c5cacdfc7d13f4a36c5fd languageName: node linkType: hard @@ -13588,11 +13588,11 @@ __metadata: linkType: hard "nan@npm:^2.14.0, nan@npm:^2.17.0": - version: 2.20.0 - resolution: "nan@npm:2.20.0" + version: 2.21.0 + resolution: "nan@npm:2.21.0" dependencies: node-gyp: latest - checksum: eb09286e6c238a3582db4d88c875db73e9b5ab35f60306090acd2f3acae21696c9b653368b4a0e32abcef64ee304a923d6223acaddd16169e5eaaf5c508fb533 + checksum: 1831a320d8e0c813ce6390f1c2b9a792232cdbeb6ce22e9433b1d3943a67d50d5256074b829d317a46167a7df0c7adc246e3fbb06781cdb16e4d9bcb575f45f8 languageName: node linkType: hard @@ -13661,7 +13661,7 @@ __metadata: "@hmcts/nodejs-healthcheck": 1.8.5 "@hmcts/nodejs-logging": 4.0.4 "@hmcts/properties-volume": 1.2.0 - "@playwright/test": 1.47.2 + "@playwright/test": 1.48.0 "@types/config": 3.3.5 "@types/cookie-parser": 1.4.7 "@types/csurf": 1.11.5 @@ -14945,27 +14945,27 @@ __metadata: languageName: node linkType: hard -"playwright-core@npm:1.47.2": - version: 1.47.2 - resolution: "playwright-core@npm:1.47.2" +"playwright-core@npm:1.48.0": + version: 1.48.0 + resolution: "playwright-core@npm:1.48.0" bin: playwright-core: cli.js - checksum: c06109a08dd672a92eb048ce7c9a1451ed701e62ff78f0d67c67ee6b06c88f0dc5422c2a7bb26e5fca05840e2adba154a25ca988e56f76c233affe61f42453a3 + checksum: 8c6ecf1ca2484408e8a11bbb107cf4cb19621bbb85c5f4b29206df29ea13b4e6a008fb434df03e3411719c74e4f130a4ece05365fc1a2940e243725a10d04ad4 languageName: node linkType: hard -"playwright@npm:1.47.2": - version: 1.47.2 - resolution: "playwright@npm:1.47.2" +"playwright@npm:1.48.0": + version: 1.48.0 + resolution: "playwright@npm:1.48.0" dependencies: fsevents: 2.3.2 - playwright-core: 1.47.2 + playwright-core: 1.48.0 dependenciesMeta: fsevents: optional: true bin: playwright: cli.js - checksum: 41ec99d62c9d7282a3d0dd2444892a379be2f4c61e9045a0b1cfc5897796747d220df5af11c6a7515c56c82df02a1025a46a5da7abc17485b4e981e133588261 + checksum: e19431f432b68fc08109382a0707e18d2034554f0857925d7d9b75b2277136cef2e756bd93e4228c26ece1446761641b398b0cc0e1c799db1b466a0953fda787 languageName: node linkType: hard From b9db60ab79cb74ef87ed590e87983448404f61ee Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 06:37:01 +0000 Subject: [PATCH 04/12] chore(deps): update webdriverio monorepo to v9.1.5 (#3929) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 46 ++++++++++---------- package.json | 6 +-- yarn.lock | 108 +++++++++++++++++++++++----------------------- 3 files changed, 80 insertions(+), 80 deletions(-) diff --git a/package-lock.json b/package-lock.json index a8c8ac3bd6..482eae19d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -80,8 +80,8 @@ "@types/jest": "29.5.13", "@typescript-eslint/eslint-plugin": "7.18.0", "@typescript-eslint/parser": "7.18.0", - "@wdio/cli": "9.1.4", - "@wdio/sauce-service": "9.1.4", + "@wdio/cli": "9.1.5", + "@wdio/sauce-service": "9.1.5", "allure-commandline": "2.30.0", "axios-debug-log": "1.0.0", "codeceptjs": "3.6.7", @@ -113,7 +113,7 @@ "style-loader": "4.0.0", "ts-jest": "29.2.5", "ts-loader": "9.5.1", - "webdriverio": "9.1.4", + "webdriverio": "9.1.5", "webpack": "5.95.0", "webpack-cli": "5.1.4", "webpack-dev-middleware": "7.4.2", @@ -6658,16 +6658,16 @@ } }, "node_modules/@wdio/cli": { - "version": "9.1.4", - "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-9.1.4.tgz", - "integrity": "sha512-bn8ghKajg+Df1hapcSraXHOUVCO9gFuSIofEALtq8LnLgLrA+81B+e/WqShPpml4sGLhx91Z9aFDSzMG7cHcNg==", + "version": "9.1.5", + "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-9.1.5.tgz", + "integrity": "sha512-AcOg5YIK5egz/JrXQpTySQTvPJUFc1Z2Aii+awmhB5PaTv0vlNO871F4PSUwAdCJ6Q1nab31oBytelCo+NsFUA==", "dev": true, "license": "MIT", "dependencies": { "@types/node": "^20.1.1", "@vitest/snapshot": "^2.1.1", "@wdio/config": "9.1.3", - "@wdio/globals": "9.1.4", + "@wdio/globals": "9.1.5", "@wdio/logger": "9.1.3", "@wdio/protocols": "9.0.8", "@wdio/types": "9.1.3", @@ -6687,7 +6687,7 @@ "read-pkg-up": "^10.0.0", "recursive-readdir": "^2.2.3", "tsx": "^4.7.2", - "webdriverio": "9.1.4", + "webdriverio": "9.1.5", "yargs": "^17.7.2" }, "bin": { @@ -7150,9 +7150,9 @@ } }, "node_modules/@wdio/globals": { - "version": "9.1.4", - "resolved": "https://registry.npmjs.org/@wdio/globals/-/globals-9.1.4.tgz", - "integrity": "sha512-OJNTI4iJLB4fZBtuLwVtSl5ZVo+xF+jyy3E2pmgkQu4filMWFQVTfyRiI0+xlME6vLb98Kkdi/hXf52KO2r2lQ==", + "version": "9.1.5", + "resolved": "https://registry.npmjs.org/@wdio/globals/-/globals-9.1.5.tgz", + "integrity": "sha512-A53AHRw+JYMp9+2tP0yFY4lG4yXhDKRUqRUO8rpnLpFLIfQjDXHMb3l+1NFAUftxRigCB7bMnjNAzUfVPAHDZg==", "dev": true, "license": "MIT", "engines": { @@ -7160,7 +7160,7 @@ }, "optionalDependencies": { "expect-webdriverio": "^5.0.1", - "webdriverio": "9.1.4" + "webdriverio": "9.1.5" } }, "node_modules/@wdio/globals/node_modules/@wdio/logger": { @@ -7333,9 +7333,9 @@ } }, "node_modules/@wdio/sauce-service": { - "version": "9.1.4", - "resolved": "https://registry.npmjs.org/@wdio/sauce-service/-/sauce-service-9.1.4.tgz", - "integrity": "sha512-Iex/VWqrFR9s5uXneJiMf67jZR05isD8x5GkOykFxj7MM+kl0+pRsih9b8QVypVQ3kubUHKNqyzi5iu+eGvo6A==", + "version": "9.1.5", + "resolved": "https://registry.npmjs.org/@wdio/sauce-service/-/sauce-service-9.1.5.tgz", + "integrity": "sha512-5elsvA1H0JuGJTpyuN2WtZMjyhUX8uWzC5ljt5uSI2hY5NfG3p5XsEt6yxSXMDCRhGjx+4rw32y6KJSZk6EzMA==", "dev": true, "license": "MIT", "dependencies": { @@ -7344,7 +7344,7 @@ "@wdio/utils": "9.1.3", "ip": "^2.0.1", "saucelabs": "8.0.0", - "webdriverio": "9.1.4" + "webdriverio": "9.1.5" }, "engines": { "node": ">=18.20.0" @@ -25868,9 +25868,9 @@ } }, "node_modules/webdriver": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-9.1.3.tgz", - "integrity": "sha512-DXt9az2BdWZmqxRZOfzW9fdpVGTdU7pEgkf9a/hpllF4DmCINvLmnZxOoqn2apIec+irRXCSlLUcf8XFSlmYlw==", + "version": "9.1.5", + "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-9.1.5.tgz", + "integrity": "sha512-0W1CsGtAPVEiINkL4r/HSSkVvPwEQmQho0YMAFGiubFPPmMQGM60KgtHErpNjOJggDyN2TKvdoCGQpW1YQ4Jlg==", "dev": true, "license": "MIT", "dependencies": { @@ -26148,9 +26148,9 @@ } }, "node_modules/webdriverio": { - "version": "9.1.4", - "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.1.4.tgz", - "integrity": "sha512-uW6nj/+zSaTAhbEP88tHHOzcYOYRe+vfSpR7F1O0HXvWI+PfcQUDA8GE48TXpjDawRcKdOYMmZIzNNjn09ttSw==", + "version": "9.1.5", + "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.1.5.tgz", + "integrity": "sha512-X2l6bT3/oxDeBlsjra985BnHFmqRnYNFB+qpGrCd/vXKPOexagsFVB3430BCE+PXQTS7TLuB6r/iuP3QR8jI0g==", "dev": true, "license": "MIT", "dependencies": { @@ -26180,7 +26180,7 @@ "rgb2hex": "0.2.5", "serialize-error": "^11.0.3", "urlpattern-polyfill": "^10.0.0", - "webdriver": "9.1.3" + "webdriver": "9.1.5" }, "engines": { "node": ">=18.20.0" diff --git a/package.json b/package.json index 7796f3a1e2..a4d06f4f0a 100644 --- a/package.json +++ b/package.json @@ -111,8 +111,8 @@ "@types/jest": "29.5.13", "@typescript-eslint/eslint-plugin": "7.18.0", "@typescript-eslint/parser": "7.18.0", - "@wdio/cli": "9.1.4", - "@wdio/sauce-service": "9.1.4", + "@wdio/cli": "9.1.5", + "@wdio/sauce-service": "9.1.5", "allure-commandline": "2.30.0", "axios-debug-log": "1.0.0", "codeceptjs": "3.6.7", @@ -144,7 +144,7 @@ "style-loader": "4.0.0", "ts-jest": "29.2.5", "ts-loader": "9.5.1", - "webdriverio": "9.1.4", + "webdriverio": "9.1.5", "webpack": "5.95.0", "webpack-cli": "5.1.4", "webpack-dev-middleware": "7.4.2", diff --git a/yarn.lock b/yarn.lock index 947b7c0ba1..cc7daf0c7f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -253,15 +253,15 @@ __metadata: linkType: hard "@babel/compat-data@npm:^7.25.7": - version: 7.25.7 - resolution: "@babel/compat-data@npm:7.25.7" - checksum: d1188aed1fda07b6463384f289409deb8e951a5f7cf31ef4757f359a633078edc8b2938056084cc823bca5b6166ba29ba8d4d649a18694e370789b6600d09339 + version: 7.25.8 + resolution: "@babel/compat-data@npm:7.25.8" + checksum: 7ac648b110ec0fcd3a3d3fc62c69c0325b536b3c97bafea8a4392dfc68d9ea9ab1f36d1b2f231d404473fc81f503b4a630425677fc9a3cce2ee33d74842ea109 languageName: node linkType: hard "@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.16, @babel/core@npm:^7.20.0, @babel/core@npm:^7.23.9": - version: 7.25.7 - resolution: "@babel/core@npm:7.25.7" + version: 7.25.8 + resolution: "@babel/core@npm:7.25.8" dependencies: "@ampproject/remapping": ^2.2.0 "@babel/code-frame": ^7.25.7 @@ -269,16 +269,16 @@ __metadata: "@babel/helper-compilation-targets": ^7.25.7 "@babel/helper-module-transforms": ^7.25.7 "@babel/helpers": ^7.25.7 - "@babel/parser": ^7.25.7 + "@babel/parser": ^7.25.8 "@babel/template": ^7.25.7 "@babel/traverse": ^7.25.7 - "@babel/types": ^7.25.7 + "@babel/types": ^7.25.8 convert-source-map: ^2.0.0 debug: ^4.1.0 gensync: ^1.0.0-beta.2 json5: ^2.2.3 semver: ^6.3.1 - checksum: 80560a962ee3de022f665fc8cbd7fe479a1e3a07f0390afc9da7e4dff65bb073d8f6122688c3efc77f37aff7aeea8fd3c5df6abdbc259283ed7bc74c775c0fea + checksum: 77ddf693faf6997915e7bbe16e9f21ca1c0e58bc60ace9eac51c373b21d1b46ce50de650195c136a594b0e5fcb901ca17bb57c2d20bf175b3c325211138bcfde languageName: node linkType: hard @@ -570,14 +570,14 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.25.7": - version: 7.25.7 - resolution: "@babel/parser@npm:7.25.7" +"@babel/parser@npm:^7.25.7, @babel/parser@npm:^7.25.8": + version: 7.25.8 + resolution: "@babel/parser@npm:7.25.8" dependencies: - "@babel/types": ^7.25.7 + "@babel/types": ^7.25.8 bin: parser: ./bin/babel-parser.js - checksum: 7c40c2881e92415f5f2a88ac1078a8fea7f2b10097e76116ce40bfe01443d3a842c704bdb64d7b54c9e9dbbf49a60a0e1cf79ff35bcd02c52ff424179acd4259 + checksum: c33f6d26542f156927c5dbe131265c791177d271e582338e960f803903086ec5c152bf25deae5f4c061b7bee14dc0b5fd2882ccb5a21c16ee0738d24fcc0406e languageName: node linkType: hard @@ -1322,14 +1322,14 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:^7.25.7": - version: 7.25.7 - resolution: "@babel/types@npm:7.25.7" +"@babel/types@npm:^7.25.7, @babel/types@npm:^7.25.8": + version: 7.25.8 + resolution: "@babel/types@npm:7.25.8" dependencies: "@babel/helper-string-parser": ^7.25.7 "@babel/helper-validator-identifier": ^7.25.7 to-fast-properties: ^2.0.0 - checksum: a63a3ecdac5eb2fa10a75d50ec23d1560beed6c4037ccf478a430cc221ba9b8b3a55cfbaaefb6e997051728f3c02b44dcddb06de9a0132f164a0a597dd825731 + checksum: 93d84858e820dbfa0fc4882b3ba6a421544d224ee61455a58eed0af9fc3518b30dc2166b8ba48cdd2e91083c5885ed773c36acf46d177b7b1fad9c35b6eb7639 languageName: node linkType: hard @@ -4011,14 +4011,14 @@ __metadata: languageName: node linkType: hard -"@wdio/cli@npm:9.1.4": - version: 9.1.4 - resolution: "@wdio/cli@npm:9.1.4" +"@wdio/cli@npm:9.1.5": + version: 9.1.5 + resolution: "@wdio/cli@npm:9.1.5" dependencies: "@types/node": ^20.1.1 "@vitest/snapshot": ^2.1.1 "@wdio/config": 9.1.3 - "@wdio/globals": 9.1.4 + "@wdio/globals": 9.1.5 "@wdio/logger": 9.1.3 "@wdio/protocols": 9.0.8 "@wdio/types": 9.1.3 @@ -4038,11 +4038,11 @@ __metadata: read-pkg-up: ^10.0.0 recursive-readdir: ^2.2.3 tsx: ^4.7.2 - webdriverio: 9.1.4 + webdriverio: 9.1.5 yargs: ^17.7.2 bin: wdio: ./bin/wdio.js - checksum: f7ad13b40dbe4d7abbd263f58531a03678be618ca3a3286b4c6faf7531b8dbbf83f731038fa84ee08e848437e7c9d573af4200e58e48ba469229cdfd06b99f0e + checksum: 7ed4b0e45b7027ad7ae104395457c6534b1fcc4b4bc2bb3ea391e354c78d1cf248426a2f05becc159eb5a23cb42658f4914675464d16b122b1020cba2784c44e languageName: node linkType: hard @@ -4076,18 +4076,18 @@ __metadata: languageName: node linkType: hard -"@wdio/globals@npm:9.1.4": - version: 9.1.4 - resolution: "@wdio/globals@npm:9.1.4" +"@wdio/globals@npm:9.1.5": + version: 9.1.5 + resolution: "@wdio/globals@npm:9.1.5" dependencies: expect-webdriverio: ^5.0.1 - webdriverio: 9.1.4 + webdriverio: 9.1.5 dependenciesMeta: expect-webdriverio: optional: true webdriverio: optional: true - checksum: df89891e8ea95d82c89f232760362ef691c122d9a4ed3b867f380dfad9ad38ff05760a6d7192152bd9ad31562d16389f994b84bdadda7792ea27a28f825bf603 + checksum: 648052b25fe9fd6102a57fb5660f9784cb4e69757c2398efdd21a5e8f94560d44b7b6b1db9632502658fc6ef9f1c53008328019e24ef44b56c26deafc6aec88f languageName: node linkType: hard @@ -4138,17 +4138,17 @@ __metadata: languageName: node linkType: hard -"@wdio/sauce-service@npm:9.1.4": - version: 9.1.4 - resolution: "@wdio/sauce-service@npm:9.1.4" +"@wdio/sauce-service@npm:9.1.5": + version: 9.1.5 + resolution: "@wdio/sauce-service@npm:9.1.5" dependencies: "@wdio/logger": 9.1.3 "@wdio/types": 9.1.3 "@wdio/utils": 9.1.3 ip: ^2.0.1 saucelabs: 8.0.0 - webdriverio: 9.1.4 - checksum: 5eb8aa6a40bdbb7286d6e1132951435891c4f463f247cb8d7b2486a87944d1408a2bf96741de68b2a77682f2a4fd74c9fb7323f614be7127ac68b5c0644549b2 + webdriverio: 9.1.5 + checksum: a13df45a0a9bfa431e8f403234f3387bff70aeb7bbfc6796e45bb3c839341172c95b02c51ace9f4e38e9e7764fb4b178d37cc47cd6925d50987f2f10deefd36f languageName: node linkType: hard @@ -5890,9 +5890,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.30001663": - version: 1.0.30001667 - resolution: "caniuse-lite@npm:1.0.30001667" - checksum: f3c6a40c3e4115c6e5fb46c47884d903191285d29ec8a8b092546efbc9cdedcbd7183cce72dd3cab7dfc16c4d5b2745892876b3d6dda75d4cba49f9389239aa9 + version: 1.0.30001668 + resolution: "caniuse-lite@npm:1.0.30001668" + checksum: ce6996901b5883454a8ddb3040f82342277b6a6275876dfefcdecb11f7e472e29877f34cae47c2b674f08f2e71971dd4a2acb9bc01adfe8421b7148a7e9e8297 languageName: node linkType: hard @@ -7852,9 +7852,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.5.28": - version: 1.5.35 - resolution: "electron-to-chromium@npm:1.5.35" - checksum: 7eca311ebce5ca5bbef7854becc7c84ea213edc8d0d02dedf998cd695e32e5bffb9803846a9a1801f29ce8f31d6b165c9d319e76923f93c2855fae80846f7610 + version: 1.5.36 + resolution: "electron-to-chromium@npm:1.5.36" + checksum: 1f83daebdf88dd4817565660fa68a827bdca2866032d4902bfd79c6f16d97acbd731b63c09029dd5aa1af4aadbe567834cf3c89b52a37602d375352185d68cf4 languageName: node linkType: hard @@ -13588,11 +13588,11 @@ __metadata: linkType: hard "nan@npm:^2.14.0, nan@npm:^2.17.0": - version: 2.21.0 - resolution: "nan@npm:2.21.0" + version: 2.22.0 + resolution: "nan@npm:2.22.0" dependencies: node-gyp: latest - checksum: 1831a320d8e0c813ce6390f1c2b9a792232cdbeb6ce22e9433b1d3943a67d50d5256074b829d317a46167a7df0c7adc246e3fbb06781cdb16e4d9bcb575f45f8 + checksum: 222e3a090e326c72f6782d948f44ee9b81cfb2161d5fe53216f04426a273fd094deee9dcc6813096dd2397689a2b10c1a92d3885d2e73fd2488a51547beb2929 languageName: node linkType: hard @@ -13687,8 +13687,8 @@ __metadata: "@uppy/file-input": 3.1.2 "@uppy/progress-bar": 3.1.1 "@uppy/xhr-upload": 3.6.8 - "@wdio/cli": 9.1.4 - "@wdio/sauce-service": 9.1.4 + "@wdio/cli": 9.1.5 + "@wdio/sauce-service": 9.1.5 allure-commandline: 2.30.0 applicationinsights: 2.9.6 autobind-decorator: 2.4.0 @@ -13758,7 +13758,7 @@ __metadata: tsconfig-paths: 4.2.0 typescript: 5.6.3 uuid: 10.0.0 - webdriverio: 9.1.4 + webdriverio: 9.1.5 webpack: 5.95.0 webpack-cli: 5.1.4 webpack-dev-middleware: 7.4.2 @@ -18475,9 +18475,9 @@ __metadata: languageName: node linkType: hard -"webdriver@npm:9.1.3": - version: 9.1.3 - resolution: "webdriver@npm:9.1.3" +"webdriver@npm:9.1.5": + version: 9.1.5 + resolution: "webdriver@npm:9.1.5" dependencies: "@types/node": ^20.1.0 "@types/ws": ^8.5.3 @@ -18488,13 +18488,13 @@ __metadata: "@wdio/utils": 9.1.3 deepmerge-ts: ^7.0.3 ws: ^8.8.0 - checksum: d4ba2adda788ab945a5cbff3502dda528e687a132d5cd0e462c88810065cddfadf56a0e0deaf6957f4a9b1f2108ac0f3a2c8451dd9ce02712eb95ad5afe6b65a + checksum: 838726252a89fdcd4fa50e0276d0cf549250ed19fef2b97734a254071fb16855cfd2d3ddf517f047aa18e32a4ea7e294aa2c4168371e3b644c8eb49ecef2ceb4 languageName: node linkType: hard -"webdriverio@npm:9.1.4": - version: 9.1.4 - resolution: "webdriverio@npm:9.1.4" +"webdriverio@npm:9.1.5": + version: 9.1.5 + resolution: "webdriverio@npm:9.1.5" dependencies: "@types/node": ^20.11.30 "@types/sinonjs__fake-timers": ^8.1.5 @@ -18522,13 +18522,13 @@ __metadata: rgb2hex: 0.2.5 serialize-error: ^11.0.3 urlpattern-polyfill: ^10.0.0 - webdriver: 9.1.3 + webdriver: 9.1.5 peerDependencies: puppeteer-core: ^22.3.0 peerDependenciesMeta: puppeteer-core: optional: true - checksum: 72600a8bb11fda6f5b5ac8731c800eaf90a18ea433b6e786bd6af952a5ae080391fa295e352c036a06ece1c156a61b11ce3a3ff7b0aad268204ae915e5de1747 + checksum: ea7a6dd4a428a0482b925a261962030104a169d6665d72eda8a3cf19b30e36cc4ff0715378362f6fb5d376171a6b3274beb262941b35b441e86bf1cce52eba54 languageName: node linkType: hard From a16304b3dccbdd6678547ec3ca16529fa4be303e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 07:23:45 +0000 Subject: [PATCH 05/12] fix(deps): update dependency govuk-frontend to v5.7.0 (#3930) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- yarn.lock | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 482eae19d8..dbf571e9ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,7 +50,7 @@ "express-session": "1.18.1", "form-data": "4.0.1", "glob": "11.0.0", - "govuk-frontend": "5.6.0", + "govuk-frontend": "5.7.0", "helmet": "8.0.0", "http-status-codes": "2.3.0", "js-yaml": "4.1.0", @@ -14869,9 +14869,9 @@ } }, "node_modules/govuk-frontend": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.6.0.tgz", - "integrity": "sha512-yNA4bL7i7mNrg36wPNZ3RctHo9mjl82Phs8MWs1lwovxJuQ4ogEo/XWn2uB1HxkXNqgMlW4wnd0iiKgRMfxYfw==", + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.7.0.tgz", + "integrity": "sha512-kAaJbOCAJMYT30UN7rVHIWzQUvNjFq5Mw+FSIH2SM6xuCdCwyUcl+WYqxvYRqltWh6ZuAlzND0Rxr61lUoCGJA==", "license": "MIT", "engines": { "node": ">= 4.2.0" diff --git a/package.json b/package.json index a4d06f4f0a..fd13696aa2 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "express-session": "1.18.1", "form-data": "4.0.1", "glob": "11.0.0", - "govuk-frontend": "5.6.0", + "govuk-frontend": "5.7.0", "helmet": "8.0.0", "http-status-codes": "2.3.0", "js-yaml": "4.1.0", diff --git a/yarn.lock b/yarn.lock index cc7daf0c7f..426045c18e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9835,10 +9835,10 @@ __metadata: languageName: node linkType: hard -"govuk-frontend@npm:5.6.0": - version: 5.6.0 - resolution: "govuk-frontend@npm:5.6.0" - checksum: ad78858d9ca6df73e4e4662731efeb2e39619a876c955b716c678f9f4f659d3c035549a2aad49d09a92c7c9b60e61eed404fdecf24ec9bd014ac334e7536abb1 +"govuk-frontend@npm:5.7.0": + version: 5.7.0 + resolution: "govuk-frontend@npm:5.7.0" + checksum: f489ddcf2bec9fb975829a046be913d97f5cae296d0302805bc03e42dc22cdc46032097a3a10f1b1c6cd51658201116c31e2fd7a68589320c8167fbf935f7c53 languageName: node linkType: hard @@ -13714,7 +13714,7 @@ __metadata: express-session: 1.18.1 form-data: 4.0.1 glob: 11.0.0 - govuk-frontend: 5.6.0 + govuk-frontend: 5.7.0 helmet: 8.0.0 html-webpack-plugin: 5.6.0 http-status-codes: 2.3.0 From ea6bc9037a6e1637acb6bea343590a040b4013fe Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 08:17:15 +0000 Subject: [PATCH 06/12] chore(deps): update dependency cookie to v1 (#3931) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index fd13696aa2..7fbe48a3e3 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "resolutions": { "http-cache-semantics": "4.1.1", "axios": "1.7.7", - "cookie": "0.7.2" + "cookie": "1.0.0" }, "packageManager": "yarn@3.8.5" } diff --git a/yarn.lock b/yarn.lock index 426045c18e..df0834cc0c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6859,10 +6859,10 @@ __metadata: languageName: node linkType: hard -"cookie@npm:0.7.2": - version: 0.7.2 - resolution: "cookie@npm:0.7.2" - checksum: 9bf8555e33530affd571ea37b615ccad9b9a34febbf2c950c86787088eb00a8973690833b0f8ebd6b69b753c62669ea60cec89178c1fb007bf0749abed74f93e +"cookie@npm:1.0.0": + version: 1.0.0 + resolution: "cookie@npm:1.0.0" + checksum: a35e0746c9eefa2736cd55aa905351727f16e8d2f68219cd369c0a7b95f38288daec84082cf789bf1408d7cb09d48a568077c8e2417a664bca298615eb21b7df languageName: node linkType: hard From f294fb7e687db135dbd1bc56e009b553edd99932 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 07:23:12 +0000 Subject: [PATCH 07/12] chore(deps): update dependency cookie to v1.0.1 (#3933) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 31 ++++++++++++++++++++----------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 7fbe48a3e3..4fc6198ec2 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "resolutions": { "http-cache-semantics": "4.1.1", "axios": "1.7.7", - "cookie": "1.0.0" + "cookie": "1.0.1" }, "packageManager": "yarn@3.8.5" } diff --git a/yarn.lock b/yarn.lock index df0834cc0c..67cd840155 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6859,10 +6859,10 @@ __metadata: languageName: node linkType: hard -"cookie@npm:1.0.0": - version: 1.0.0 - resolution: "cookie@npm:1.0.0" - checksum: a35e0746c9eefa2736cd55aa905351727f16e8d2f68219cd369c0a7b95f38288daec84082cf789bf1408d7cb09d48a568077c8e2417a664bca298615eb21b7df +"cookie@npm:1.0.1": + version: 1.0.1 + resolution: "cookie@npm:1.0.1" + checksum: e2ff4879d816ea27dab69651c06d328b1f4214ccefa1023b6ebf85787bc23b3cad777ed51b4e54c01d161c374a05fc86e45e51ee3d9fafb48a836439c56b2458 languageName: node linkType: hard @@ -12660,14 +12660,14 @@ __metadata: linkType: hard "memfs@npm:^4.6.0": - version: 4.13.0 - resolution: "memfs@npm:4.13.0" + version: 4.14.0 + resolution: "memfs@npm:4.14.0" dependencies: "@jsonjoy.com/json-pack": ^1.0.3 "@jsonjoy.com/util": ^1.3.0 tree-dump: ^1.0.1 tslib: ^2.0.0 - checksum: 8eb8113f6623e6147bfd19ee2208b959cbab0b87781e97a6ddcc596d185cf4c3560d4a2521b77fb9aed0a15ffe9b893a299ea4fe6f659bf84dedc1299c6d3d51 + checksum: 162e61510983488b0c524bd24191ab8be0f8a95636906ee305c10f2027e6a9f90831f42c072657aaf5fa859bb5132c5e97aa97aa96dfd959810327aec5b067c3 languageName: node linkType: hard @@ -14712,7 +14712,7 @@ __metadata: languageName: node linkType: hard -"parse5@npm:7.1.2, parse5@npm:^7.0.0, parse5@npm:^7.1.2": +"parse5@npm:7.1.2": version: 7.1.2 resolution: "parse5@npm:7.1.2" dependencies: @@ -14721,6 +14721,15 @@ __metadata: languageName: node linkType: hard +"parse5@npm:^7.0.0, parse5@npm:^7.1.2": + version: 7.2.0 + resolution: "parse5@npm:7.2.0" + dependencies: + entities: ^4.5.0 + checksum: 78a3286521d5ae09837ed3112a3c817cc718ee444951aced617c46a229b9872b10b7b20941d4d0ca7176c7f37f13dbf013206abe2e5e533563d635d36a9a3dc6 + languageName: node + linkType: hard + "parseurl@npm:~1.3.2, parseurl@npm:~1.3.3": version: 1.3.3 resolution: "parseurl@npm:1.3.3" @@ -15059,9 +15068,9 @@ __metadata: linkType: hard "preact@npm:^10.5.13": - version: 10.24.2 - resolution: "preact@npm:10.24.2" - checksum: 429584bbe65d5322b4cd449abd54d61d777f329a23badead36ad510f91d04f42d0615ad2bc4d5e80c3c531be53081932a027ee5f2d6f2805e10666f2ac3d70db + version: 10.24.3 + resolution: "preact@npm:10.24.3" + checksum: 372f601576f52d6417a750a8732cd83c4fc133b0b136f82ea69f013092266ad0213c160b71ae421a0fc7ab04caacb651c29dbf515e3aec26d82b0a8675e8786e languageName: node linkType: hard From eef58584a091accbe99df424fdbcae0a91a3169b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 09:44:14 +0000 Subject: [PATCH 08/12] chore(deps): update webdriverio monorepo to v9.2.1 (#3936) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 84 +++++++++++++++++++++++------------------------ package.json | 6 ++-- yarn.lock | 84 +++++++++++++++++++++++------------------------ 3 files changed, 87 insertions(+), 87 deletions(-) diff --git a/package-lock.json b/package-lock.json index dbf571e9ca..f0c9b8e849 100644 --- a/package-lock.json +++ b/package-lock.json @@ -80,8 +80,8 @@ "@types/jest": "29.5.13", "@typescript-eslint/eslint-plugin": "7.18.0", "@typescript-eslint/parser": "7.18.0", - "@wdio/cli": "9.1.5", - "@wdio/sauce-service": "9.1.5", + "@wdio/cli": "9.2.1", + "@wdio/sauce-service": "9.2.1", "allure-commandline": "2.30.0", "axios-debug-log": "1.0.0", "codeceptjs": "3.6.7", @@ -113,7 +113,7 @@ "style-loader": "4.0.0", "ts-jest": "29.2.5", "ts-loader": "9.5.1", - "webdriverio": "9.1.5", + "webdriverio": "9.2.1", "webpack": "5.95.0", "webpack-cli": "5.1.4", "webpack-dev-middleware": "7.4.2", @@ -6658,18 +6658,18 @@ } }, "node_modules/@wdio/cli": { - "version": "9.1.5", - "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-9.1.5.tgz", - "integrity": "sha512-AcOg5YIK5egz/JrXQpTySQTvPJUFc1Z2Aii+awmhB5PaTv0vlNO871F4PSUwAdCJ6Q1nab31oBytelCo+NsFUA==", + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-9.2.1.tgz", + "integrity": "sha512-lGz/JBkSQh4qH9sDFbNrPHfQNxrDtbm2tb3NgzMNXk88G2dq9AzoYriRgfXO7rKETc+nFreuEdULV+MMhRHk/A==", "dev": true, "license": "MIT", "dependencies": { "@types/node": "^20.1.1", "@vitest/snapshot": "^2.1.1", "@wdio/config": "9.1.3", - "@wdio/globals": "9.1.5", + "@wdio/globals": "9.2.1", "@wdio/logger": "9.1.3", - "@wdio/protocols": "9.0.8", + "@wdio/protocols": "9.2.0", "@wdio/types": "9.1.3", "@wdio/utils": "9.1.3", "async-exit-hook": "^2.0.1", @@ -6687,7 +6687,7 @@ "read-pkg-up": "^10.0.0", "recursive-readdir": "^2.2.3", "tsx": "^4.7.2", - "webdriverio": "9.1.5", + "webdriverio": "9.2.1", "yargs": "^17.7.2" }, "bin": { @@ -6769,9 +6769,9 @@ } }, "node_modules/@wdio/cli/node_modules/@wdio/protocols": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-9.0.8.tgz", - "integrity": "sha512-xRH54byFf623/w/KW62xkf/C2mGyigSfMm+UT3tNEAd5ZA9X2VAWQWQBPzdcrsck7Fxk4zlQX8Kb34RSs7Cy4Q==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-9.2.0.tgz", + "integrity": "sha512-lSdKCwLtqMxSIW+cl8au21GlNkvmLNGgyuGYdV/lFdWflmMYH1zusruM6Km6Kpv2VUlWySjjGknYhe7XVTOeMw==", "dev": true, "license": "MIT" }, @@ -7150,9 +7150,9 @@ } }, "node_modules/@wdio/globals": { - "version": "9.1.5", - "resolved": "https://registry.npmjs.org/@wdio/globals/-/globals-9.1.5.tgz", - "integrity": "sha512-A53AHRw+JYMp9+2tP0yFY4lG4yXhDKRUqRUO8rpnLpFLIfQjDXHMb3l+1NFAUftxRigCB7bMnjNAzUfVPAHDZg==", + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/@wdio/globals/-/globals-9.2.1.tgz", + "integrity": "sha512-svPSPbV9ZxunmkJVmcCw5A7vzGBYpO1kPmBK9LLZFfVhXiwps0EOl+j6KtqwbQ0cTvC6PEHzm/bwmX4DEzBAzA==", "dev": true, "license": "MIT", "engines": { @@ -7160,7 +7160,7 @@ }, "optionalDependencies": { "expect-webdriverio": "^5.0.1", - "webdriverio": "9.1.5" + "webdriverio": "9.2.1" } }, "node_modules/@wdio/globals/node_modules/@wdio/logger": { @@ -7333,9 +7333,9 @@ } }, "node_modules/@wdio/sauce-service": { - "version": "9.1.5", - "resolved": "https://registry.npmjs.org/@wdio/sauce-service/-/sauce-service-9.1.5.tgz", - "integrity": "sha512-5elsvA1H0JuGJTpyuN2WtZMjyhUX8uWzC5ljt5uSI2hY5NfG3p5XsEt6yxSXMDCRhGjx+4rw32y6KJSZk6EzMA==", + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/@wdio/sauce-service/-/sauce-service-9.2.1.tgz", + "integrity": "sha512-UZa0vZErfWri12ibDGViuxkyMZga25Ra1KagAxCI+kbkzXpJRfg7WG7iVR4SPwDOaS886klZthi2qpG0hmuc3g==", "dev": true, "license": "MIT", "dependencies": { @@ -7344,7 +7344,7 @@ "@wdio/utils": "9.1.3", "ip": "^2.0.1", "saucelabs": "8.0.0", - "webdriverio": "9.1.5" + "webdriverio": "9.2.1" }, "engines": { "node": ">=18.20.0" @@ -18223,9 +18223,9 @@ "license": "MIT" }, "node_modules/magic-string": { - "version": "0.30.11", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz", - "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==", + "version": "0.30.12", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz", + "integrity": "sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==", "dev": true, "license": "MIT", "dependencies": { @@ -21378,13 +21378,13 @@ } }, "node_modules/parse5-htmlparser2-tree-adapter": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz", - "integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.1.0.tgz", + "integrity": "sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==", "dev": true, "license": "MIT", "dependencies": { - "domhandler": "^5.0.2", + "domhandler": "^5.0.3", "parse5": "^7.0.0" }, "funding": { @@ -25868,9 +25868,9 @@ } }, "node_modules/webdriver": { - "version": "9.1.5", - "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-9.1.5.tgz", - "integrity": "sha512-0W1CsGtAPVEiINkL4r/HSSkVvPwEQmQho0YMAFGiubFPPmMQGM60KgtHErpNjOJggDyN2TKvdoCGQpW1YQ4Jlg==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-9.2.0.tgz", + "integrity": "sha512-UrhuHSLq4m3OgncvX75vShfl5w3gmjAy8LvLb6/L6V+a+xcqMRelFx/DQ72Mr84F4m8Li6wjtebrOH1t9V/uOQ==", "dev": true, "license": "MIT", "dependencies": { @@ -25878,7 +25878,7 @@ "@types/ws": "^8.5.3", "@wdio/config": "9.1.3", "@wdio/logger": "9.1.3", - "@wdio/protocols": "9.0.8", + "@wdio/protocols": "9.2.0", "@wdio/types": "9.1.3", "@wdio/utils": "9.1.3", "deepmerge-ts": "^7.0.3", @@ -25947,9 +25947,9 @@ } }, "node_modules/webdriver/node_modules/@wdio/protocols": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-9.0.8.tgz", - "integrity": "sha512-xRH54byFf623/w/KW62xkf/C2mGyigSfMm+UT3tNEAd5ZA9X2VAWQWQBPzdcrsck7Fxk4zlQX8Kb34RSs7Cy4Q==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-9.2.0.tgz", + "integrity": "sha512-lSdKCwLtqMxSIW+cl8au21GlNkvmLNGgyuGYdV/lFdWflmMYH1zusruM6Km6Kpv2VUlWySjjGknYhe7XVTOeMw==", "dev": true, "license": "MIT" }, @@ -26148,9 +26148,9 @@ } }, "node_modules/webdriverio": { - "version": "9.1.5", - "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.1.5.tgz", - "integrity": "sha512-X2l6bT3/oxDeBlsjra985BnHFmqRnYNFB+qpGrCd/vXKPOexagsFVB3430BCE+PXQTS7TLuB6r/iuP3QR8jI0g==", + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.2.1.tgz", + "integrity": "sha512-AI7xzqTmFiU7oAx4fpEF1U1MA7smhCPVDeM0gxPqG5qWepzib3WDX2SsRtcmhdVW+vLJ3m4bf8rAXxZ2M1msWA==", "dev": true, "license": "MIT", "dependencies": { @@ -26158,7 +26158,7 @@ "@types/sinonjs__fake-timers": "^8.1.5", "@wdio/config": "9.1.3", "@wdio/logger": "9.1.3", - "@wdio/protocols": "9.0.8", + "@wdio/protocols": "9.2.0", "@wdio/repl": "9.0.8", "@wdio/types": "9.1.3", "@wdio/utils": "9.1.3", @@ -26180,7 +26180,7 @@ "rgb2hex": "0.2.5", "serialize-error": "^11.0.3", "urlpattern-polyfill": "^10.0.0", - "webdriver": "9.1.5" + "webdriver": "9.2.0" }, "engines": { "node": ">=18.20.0" @@ -26253,9 +26253,9 @@ } }, "node_modules/webdriverio/node_modules/@wdio/protocols": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-9.0.8.tgz", - "integrity": "sha512-xRH54byFf623/w/KW62xkf/C2mGyigSfMm+UT3tNEAd5ZA9X2VAWQWQBPzdcrsck7Fxk4zlQX8Kb34RSs7Cy4Q==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-9.2.0.tgz", + "integrity": "sha512-lSdKCwLtqMxSIW+cl8au21GlNkvmLNGgyuGYdV/lFdWflmMYH1zusruM6Km6Kpv2VUlWySjjGknYhe7XVTOeMw==", "dev": true, "license": "MIT" }, diff --git a/package.json b/package.json index 4fc6198ec2..55cee94cd6 100644 --- a/package.json +++ b/package.json @@ -111,8 +111,8 @@ "@types/jest": "29.5.13", "@typescript-eslint/eslint-plugin": "7.18.0", "@typescript-eslint/parser": "7.18.0", - "@wdio/cli": "9.1.5", - "@wdio/sauce-service": "9.1.5", + "@wdio/cli": "9.2.1", + "@wdio/sauce-service": "9.2.1", "allure-commandline": "2.30.0", "axios-debug-log": "1.0.0", "codeceptjs": "3.6.7", @@ -144,7 +144,7 @@ "style-loader": "4.0.0", "ts-jest": "29.2.5", "ts-loader": "9.5.1", - "webdriverio": "9.1.5", + "webdriverio": "9.2.1", "webpack": "5.95.0", "webpack-cli": "5.1.4", "webpack-dev-middleware": "7.4.2", diff --git a/yarn.lock b/yarn.lock index 67cd840155..920ad92286 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4011,16 +4011,16 @@ __metadata: languageName: node linkType: hard -"@wdio/cli@npm:9.1.5": - version: 9.1.5 - resolution: "@wdio/cli@npm:9.1.5" +"@wdio/cli@npm:9.2.1": + version: 9.2.1 + resolution: "@wdio/cli@npm:9.2.1" dependencies: "@types/node": ^20.1.1 "@vitest/snapshot": ^2.1.1 "@wdio/config": 9.1.3 - "@wdio/globals": 9.1.5 + "@wdio/globals": 9.2.1 "@wdio/logger": 9.1.3 - "@wdio/protocols": 9.0.8 + "@wdio/protocols": 9.2.0 "@wdio/types": 9.1.3 "@wdio/utils": 9.1.3 async-exit-hook: ^2.0.1 @@ -4038,11 +4038,11 @@ __metadata: read-pkg-up: ^10.0.0 recursive-readdir: ^2.2.3 tsx: ^4.7.2 - webdriverio: 9.1.5 + webdriverio: 9.2.1 yargs: ^17.7.2 bin: wdio: ./bin/wdio.js - checksum: 7ed4b0e45b7027ad7ae104395457c6534b1fcc4b4bc2bb3ea391e354c78d1cf248426a2f05becc159eb5a23cb42658f4914675464d16b122b1020cba2784c44e + checksum: 4f266804a52287bf4032b0ba16ff5a6d569a5bb4493cb5e694aea96e6a8ed28622efffd3b33e50557f25b3705bd413a85325eaeb5e9ff9d1470f42c103f6b1d6 languageName: node linkType: hard @@ -4076,18 +4076,18 @@ __metadata: languageName: node linkType: hard -"@wdio/globals@npm:9.1.5": - version: 9.1.5 - resolution: "@wdio/globals@npm:9.1.5" +"@wdio/globals@npm:9.2.1": + version: 9.2.1 + resolution: "@wdio/globals@npm:9.2.1" dependencies: expect-webdriverio: ^5.0.1 - webdriverio: 9.1.5 + webdriverio: 9.2.1 dependenciesMeta: expect-webdriverio: optional: true webdriverio: optional: true - checksum: 648052b25fe9fd6102a57fb5660f9784cb4e69757c2398efdd21a5e8f94560d44b7b6b1db9632502658fc6ef9f1c53008328019e24ef44b56c26deafc6aec88f + checksum: e94fdac43f8a8c88c9831540b31c95fcd3b744cc67348d71a1b20138c2b01490c3da32a05bfa918cabb309c162f1da39845ee08ed96d9b61395fdd0914372c1e languageName: node linkType: hard @@ -4122,10 +4122,10 @@ __metadata: languageName: node linkType: hard -"@wdio/protocols@npm:9.0.8": - version: 9.0.8 - resolution: "@wdio/protocols@npm:9.0.8" - checksum: 8019def62e6994abde8f538c928dd812ce12c641e027e3c11e0b592bc36269d3bd743e3b88b1247f51ff2d71225f5ad20187da16629bb74f50a8b804c9510f38 +"@wdio/protocols@npm:9.2.0": + version: 9.2.0 + resolution: "@wdio/protocols@npm:9.2.0" + checksum: 81f383456846c75829d00e3593c1be46d9a90646a2949ba39c6e56ee67907d81c803d00e65f9bdba16573574fba1c69b922317a04c33097823a2bd0115cefbcb languageName: node linkType: hard @@ -4138,17 +4138,17 @@ __metadata: languageName: node linkType: hard -"@wdio/sauce-service@npm:9.1.5": - version: 9.1.5 - resolution: "@wdio/sauce-service@npm:9.1.5" +"@wdio/sauce-service@npm:9.2.1": + version: 9.2.1 + resolution: "@wdio/sauce-service@npm:9.2.1" dependencies: "@wdio/logger": 9.1.3 "@wdio/types": 9.1.3 "@wdio/utils": 9.1.3 ip: ^2.0.1 saucelabs: 8.0.0 - webdriverio: 9.1.5 - checksum: a13df45a0a9bfa431e8f403234f3387bff70aeb7bbfc6796e45bb3c839341172c95b02c51ace9f4e38e9e7764fb4b178d37cc47cd6925d50987f2f10deefd36f + webdriverio: 9.2.1 + checksum: 5538214ce4f083cdeb26fcc1564bd70ad0f8f54eb7466850c132aaad0bcbb831096d78936fdeb01209e026ac6d02726e89c7e26a8af36ca20061dc8aca19a965 languageName: node linkType: hard @@ -12502,11 +12502,11 @@ __metadata: linkType: hard "magic-string@npm:^0.30.11": - version: 0.30.11 - resolution: "magic-string@npm:0.30.11" + version: 0.30.12 + resolution: "magic-string@npm:0.30.12" dependencies: "@jridgewell/sourcemap-codec": ^1.5.0 - checksum: e041649453c9a3f31d2e731fc10e38604d50e20d3585cd48bc7713a6e2e1a3ad3012105929ca15750d59d0a3f1904405e4b95a23b7e69dc256db3c277a73a3ca + checksum: 3f0d23b74371765f0e6cad4284eebba0ac029c7a55e39292de5aa92281afb827138cb2323d24d2924f6b31f138c3783596c5ccaa98653fe9cf122e1f81325b59 languageName: node linkType: hard @@ -13687,8 +13687,8 @@ __metadata: "@uppy/file-input": 3.1.2 "@uppy/progress-bar": 3.1.1 "@uppy/xhr-upload": 3.6.8 - "@wdio/cli": 9.1.5 - "@wdio/sauce-service": 9.1.5 + "@wdio/cli": 9.2.1 + "@wdio/sauce-service": 9.2.1 allure-commandline: 2.30.0 applicationinsights: 2.9.6 autobind-decorator: 2.4.0 @@ -13758,7 +13758,7 @@ __metadata: tsconfig-paths: 4.2.0 typescript: 5.6.3 uuid: 10.0.0 - webdriverio: 9.1.5 + webdriverio: 9.2.1 webpack: 5.95.0 webpack-cli: 5.1.4 webpack-dev-middleware: 7.4.2 @@ -14694,12 +14694,12 @@ __metadata: linkType: hard "parse5-htmlparser2-tree-adapter@npm:^7.0.0": - version: 7.0.0 - resolution: "parse5-htmlparser2-tree-adapter@npm:7.0.0" + version: 7.1.0 + resolution: "parse5-htmlparser2-tree-adapter@npm:7.1.0" dependencies: - domhandler: ^5.0.2 + domhandler: ^5.0.3 parse5: ^7.0.0 - checksum: fc5d01e07733142a1baf81de5c2a9c41426c04b7ab29dd218acb80cd34a63177c90aff4a4aee66cf9f1d0aeecff1389adb7452ad6f8af0a5888e3e9ad6ef733d + checksum: 98326fc5443e2149e10695adbfd0b0b3383c54398799f858b4ac2914adb199af8fcc90c2143aa5f7fd5f9482338f26ef253b468722f34d50bb215ec075d89fe9 languageName: node linkType: hard @@ -18484,32 +18484,32 @@ __metadata: languageName: node linkType: hard -"webdriver@npm:9.1.5": - version: 9.1.5 - resolution: "webdriver@npm:9.1.5" +"webdriver@npm:9.2.0": + version: 9.2.0 + resolution: "webdriver@npm:9.2.0" dependencies: "@types/node": ^20.1.0 "@types/ws": ^8.5.3 "@wdio/config": 9.1.3 "@wdio/logger": 9.1.3 - "@wdio/protocols": 9.0.8 + "@wdio/protocols": 9.2.0 "@wdio/types": 9.1.3 "@wdio/utils": 9.1.3 deepmerge-ts: ^7.0.3 ws: ^8.8.0 - checksum: 838726252a89fdcd4fa50e0276d0cf549250ed19fef2b97734a254071fb16855cfd2d3ddf517f047aa18e32a4ea7e294aa2c4168371e3b644c8eb49ecef2ceb4 + checksum: 4c32715b6770cdcc0df1d5285d99e7e0f3c023a61b43919010dabe93de77b4501fc17d00ee5b70c3c2b1c36a217d9bda315321d1f47ab7b934b4f4d0a5f03e15 languageName: node linkType: hard -"webdriverio@npm:9.1.5": - version: 9.1.5 - resolution: "webdriverio@npm:9.1.5" +"webdriverio@npm:9.2.1": + version: 9.2.1 + resolution: "webdriverio@npm:9.2.1" dependencies: "@types/node": ^20.11.30 "@types/sinonjs__fake-timers": ^8.1.5 "@wdio/config": 9.1.3 "@wdio/logger": 9.1.3 - "@wdio/protocols": 9.0.8 + "@wdio/protocols": 9.2.0 "@wdio/repl": 9.0.8 "@wdio/types": 9.1.3 "@wdio/utils": 9.1.3 @@ -18531,13 +18531,13 @@ __metadata: rgb2hex: 0.2.5 serialize-error: ^11.0.3 urlpattern-polyfill: ^10.0.0 - webdriver: 9.1.5 + webdriver: 9.2.0 peerDependencies: puppeteer-core: ^22.3.0 peerDependenciesMeta: puppeteer-core: optional: true - checksum: ea7a6dd4a428a0482b925a261962030104a169d6665d72eda8a3cf19b30e36cc4ff0715378362f6fb5d376171a6b3274beb262941b35b441e86bf1cce52eba54 + checksum: 26af2484c749df3ac64f188a10b4996cbb1dc97e4bbe297935ce604eabea8633234240f41fc088576c2fc47b42121be159839f02e3692e7b9c00fc132b9ca857 languageName: node linkType: hard From d887a5b8dd1ad3063e16fa5e21a0ea911f2718dd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 10:31:55 +0000 Subject: [PATCH 09/12] fix(deps): update dependency govuk-frontend to v5.7.1 (#3934) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- yarn.lock | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index f0c9b8e849..66c6f443a2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,7 +50,7 @@ "express-session": "1.18.1", "form-data": "4.0.1", "glob": "11.0.0", - "govuk-frontend": "5.7.0", + "govuk-frontend": "5.7.1", "helmet": "8.0.0", "http-status-codes": "2.3.0", "js-yaml": "4.1.0", @@ -14869,9 +14869,9 @@ } }, "node_modules/govuk-frontend": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.7.0.tgz", - "integrity": "sha512-kAaJbOCAJMYT30UN7rVHIWzQUvNjFq5Mw+FSIH2SM6xuCdCwyUcl+WYqxvYRqltWh6ZuAlzND0Rxr61lUoCGJA==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.7.1.tgz", + "integrity": "sha512-jF1cq5rn57kxZmJRprUZhTQ31zaBBK4b5AyeJaPX3Yhg22lk90Mx/dQLvOk/ycV3wM7e0y+s4IPvb2fFaPlCGg==", "license": "MIT", "engines": { "node": ">= 4.2.0" diff --git a/package.json b/package.json index 55cee94cd6..611130cfb3 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "express-session": "1.18.1", "form-data": "4.0.1", "glob": "11.0.0", - "govuk-frontend": "5.7.0", + "govuk-frontend": "5.7.1", "helmet": "8.0.0", "http-status-codes": "2.3.0", "js-yaml": "4.1.0", diff --git a/yarn.lock b/yarn.lock index 920ad92286..95ef716c69 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9835,10 +9835,10 @@ __metadata: languageName: node linkType: hard -"govuk-frontend@npm:5.7.0": - version: 5.7.0 - resolution: "govuk-frontend@npm:5.7.0" - checksum: f489ddcf2bec9fb975829a046be913d97f5cae296d0302805bc03e42dc22cdc46032097a3a10f1b1c6cd51658201116c31e2fd7a68589320c8167fbf935f7c53 +"govuk-frontend@npm:5.7.1": + version: 5.7.1 + resolution: "govuk-frontend@npm:5.7.1" + checksum: 720098385758667ca4a2a9b408daf58c6f3a079256a5f6dfe1bd9d0975946a7182d7db444b7465d2ae1fb98bbc3e7109061c7d41bbb90ef1d397844a3509fdba languageName: node linkType: hard @@ -13714,7 +13714,7 @@ __metadata: express-session: 1.18.1 form-data: 4.0.1 glob: 11.0.0 - govuk-frontend: 5.7.0 + govuk-frontend: 5.7.1 helmet: 8.0.0 html-webpack-plugin: 5.6.0 http-status-codes: 2.3.0 From 60cee8405e36a1a5e9460814bd8e02664fd9719a Mon Sep 17 00:00:00 2001 From: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> Date: Mon, 14 Oct 2024 13:15:33 +0100 Subject: [PATCH 10/12] [NFDIV-4314] Use payment service requests created by case-api (Part 2) (#3895) * Retrieve fee service request ref from case data * Linter corrections * Link backend PR * Update case type * Create service request using new event * Lint corrections * Update tests * Refactor to simplify payment code and tests * Set payment callback on application submit * Linter corrections * Pass payment callback URL to backend * Remove unused import * Update tests * Formatting changes * Adjust backend PR reference * Remove references to backend PR * Eslint correction * Remove links to backend PR --- src/main/app/case/case.ts | 4 + src/main/app/case/definition.ts | 5 ++ .../controller/BasePaymentPostController.ts | 46 +++++------ src/main/app/payment/PaymentClient.test.ts | 56 ------------- src/main/app/payment/PaymentClient.ts | 36 --------- src/main/app/payment/PaymentModel.test.ts | 81 +------------------ src/main/app/payment/PaymentModel.ts | 29 ------- .../app/payment/__mocks__/PaymentClient.ts | 3 +- .../applicant1/pay-your-fee/post.test.ts | 10 +-- .../steps/applicant1/pay-your-fee/post.ts | 4 +- .../pay-your-final-order-fee/post.test.ts | 14 ++-- .../pay-your-final-order-fee/post.ts | 4 +- 12 files changed, 46 insertions(+), 246 deletions(-) diff --git a/src/main/app/case/case.ts b/src/main/app/case/case.ts index f0df6b9393..da9cb69222 100644 --- a/src/main/app/case/case.ts +++ b/src/main/app/case/case.ts @@ -110,7 +110,9 @@ export const formFieldsToCaseMapping: Partial applicant1SolicitorAddressOverseas: 'applicant1SolicitorAddressOverseas', accessCode: 'accessCode', applicationFeeOrderSummary: 'applicationFeeOrderSummary', + applicationFeeServiceRequestReference: 'applicationFeeServiceRequestReference', applicant2FinalOrderFeeOrderSummary: 'applicant2FinalOrderFeeOrderSummary', + applicant2FinalOrderFeeServiceRequestReference: 'applicant2FinalOrderFeeServiceRequestReference', applicationPayments: 'applicationPayments', finalOrderPayments: 'finalOrderPayments', confirmDisputeApplication: 'confirmDisputeApplication', @@ -317,7 +319,9 @@ export interface Case { applicationPayments: ListValue[]; finalOrderPayments: ListValue[]; applicationFeeOrderSummary: OrderSummary; + applicationFeeServiceRequestReference: string; applicant2FinalOrderFeeOrderSummary: OrderSummary; + applicant2FinalOrderFeeServiceRequestReference: string; applicant2Confirmation: YesOrNo; applicant2Explanation: string; applicant1PcqId?: string; diff --git a/src/main/app/case/definition.ts b/src/main/app/case/definition.ts index 497fc291fa..1b50b36ba2 100644 --- a/src/main/app/case/definition.ts +++ b/src/main/app/case/definition.ts @@ -415,7 +415,9 @@ export interface Application { pbaNumbers: DynamicList; feeAccountReference: string; applicationFeeOrderSummary: OrderSummary; + applicationFeeServiceRequestReference: string; applicant2FinalOrderFeeOrderSummary: OrderSummary; + applicant2FinalOrderFeeServiceRequestReference: string; applicant2AgreeToReceiveEmails: YesOrNo; applicant1KnowsApplicant2EmailAddress: YesOrNo; applicant1KnowsApplicant2Address: YesOrNo; @@ -677,7 +679,9 @@ export interface CaseData { pbaNumbers: DynamicList; feeAccountReference: string; applicationFeeOrderSummary: OrderSummary; + applicationFeeServiceRequestReference: string; applicant2FinalOrderFeeOrderSummary: OrderSummary; + applicant2FinalOrderFeeServiceRequestReference: string; applicant2AgreeToReceiveEmails: YesOrNo; applicant1KnowsApplicant2EmailAddress: YesOrNo; applicant1KnowsApplicant2Address: YesOrNo; @@ -2550,6 +2554,7 @@ export const CITIZEN_CREATE = 'citizen-create-application'; export const APPLICANT_2_NOT_BROKEN = 'applicant2-not-broken'; export const CITIZEN_RESEND_INVITE = 'citizen-resend-invite'; export const CITIZEN_SUBMIT = 'citizen-submit-application'; +export const CITIZEN_CREATE_SERVICE_REQUEST = 'citizen-create-service-request'; export const CITIZEN_UPDATE_CONTACT_DETAILS = 'citizen-update-contact-details'; export const APPLICANT_1_CONFIRM_RECEIPT = 'applicant1-confirm-receipt'; export const APPLICANT_2_CONFIRM_RECEIPT = 'applicant2-confirm-receipt'; diff --git a/src/main/app/controller/BasePaymentPostController.ts b/src/main/app/controller/BasePaymentPostController.ts index 768e89a4b0..db0adcb803 100644 --- a/src/main/app/controller/BasePaymentPostController.ts +++ b/src/main/app/controller/BasePaymentPostController.ts @@ -1,4 +1,3 @@ -import { Logger } from '@hmcts/nodejs-logging'; import autobind from 'autobind-decorator'; import config from 'config'; import { Response } from 'express'; @@ -7,6 +6,7 @@ import { PAYMENT_CALLBACK_URL, RESPONDENT, SAVE_AND_SIGN_OUT } from '../../steps import { ApplicationType, CITIZEN_ADD_PAYMENT, + CITIZEN_CREATE_SERVICE_REQUEST, CaseData, Fee, ListValue, @@ -18,8 +18,6 @@ import { AnyObject } from '../controller/PostController'; import { Payment, PaymentClient } from '../payment/PaymentClient'; import { PaymentModel } from '../payment/PaymentModel'; -const logger = Logger.getLogger('payment'); - @autobind export default abstract class BasePaymentPostController { public async post(req: AppRequest, res: Response): Promise { @@ -36,13 +34,20 @@ export default abstract class BasePaymentPostController { } const payments = new PaymentModel(req.session.userCase[this.paymentsCaseField()] || []); - if (payments.isPaymentInProgress()) { return this.saveAndRedirect(req, res, getPaymentCallbackPath(req)); } - const paymentClient = this.getPaymentClient(req, getPaymentCallbackUrl(req, res)); - const payment = await this.createServiceRefAndTakePayment(req, paymentClient, payments); + if (!this.getServiceReferenceForFee(req)) { + req.session.userCase = await req.locals.api.triggerEvent( + req.session.userCase.id, + { citizenPaymentCallbackUrl: getPaymentCallbackUrl(req, res) }, + CITIZEN_CREATE_SERVICE_REQUEST + ); + } + + const serviceReference = this.getServiceReferenceForFee(req); + const payment = await this.attemptPayment(req, payments, serviceReference, getPaymentCallbackUrl(req, res)); this.saveAndRedirect(req, res, payment.next_url); } @@ -61,25 +66,16 @@ export default abstract class BasePaymentPostController { return new PaymentClient(req.session, callbackUrl); } - private async createServiceRefAndTakePayment( + private async attemptPayment( req: AppRequest, - client: PaymentClient, - payments: PaymentModel + payments: PaymentModel, + serviceReference: string, + callbackUrl: string ): Promise { - const fee = this.getFeesFromOrderSummary(req)[0].value; - - let serviceRefNumberForFee = payments.getServiceRefNumberForFee(fee.FeeCode); - if (!serviceRefNumberForFee) { - logger.info('Cannot find service reference number for fee code. creating one'); - const serviceReqResponse = await client.createServiceRequest( - this.getResponsiblePartyName(req), - this.getFeesFromOrderSummary(req) - ); - serviceRefNumberForFee = serviceReqResponse.service_request_reference; - } - - //Take payment for service request reference - const payment = await client.create(serviceRefNumberForFee, this.getFeesFromOrderSummary(req)); + const fees = this.getFeesFromOrderSummary(req); + const fee = fees[0].value; + const client = this.getPaymentClient(req, callbackUrl); + const payment = await client.create(serviceReference, fees); const now = new Date().toISOString(); payments.add({ @@ -91,7 +87,7 @@ export default abstract class BasePaymentPostController { channel: payment.next_url, reference: payment.payment_reference, transactionId: payment.external_reference, - serviceRequestReference: serviceRefNumberForFee, + serviceRequestReference: serviceReference, }); const eventPayload = { [this.paymentsCaseField()]: payments.list }; @@ -107,8 +103,8 @@ export default abstract class BasePaymentPostController { protected abstract awaitingPaymentState(): State; protected abstract awaitingPaymentEvent(): string; protected abstract getFeesFromOrderSummary(req: AppRequest): ListValue[]; + protected abstract getServiceReferenceForFee(req: AppRequest): string; protected abstract paymentsCaseField(): keyof CaseData; - protected abstract getResponsiblePartyName(req: AppRequest): string | undefined; } export function getPaymentCallbackUrl(req: AppRequest, res: Response): string { diff --git a/src/main/app/payment/PaymentClient.test.ts b/src/main/app/payment/PaymentClient.test.ts index 7b7860a0cc..1bda38e320 100644 --- a/src/main/app/payment/PaymentClient.test.ts +++ b/src/main/app/payment/PaymentClient.test.ts @@ -133,60 +133,4 @@ describe('PaymentClient', () => { expect(mockLogger.error).toHaveBeenCalledWith('Error fetching payment', { some: 'error' }); }); - - it('creates service request reference number', async () => { - mockedConfig.get.mockReturnValueOnce('http://mock-service-url'); - mockedConfig.get.mockReturnValueOnce('mock-api-key'); - mockGetServiceAuthToken.mockReturnValueOnce('mock-server-auth-token'); - const mockPost = jest.fn().mockResolvedValueOnce({ - data: { mockPayment: 'data', service_request_reference: 'test1234' }, - }); - mockedAxios.create.mockReturnValueOnce({ post: mockPost } as unknown as AxiosInstance); - const orderSummaryFees: ListValue[] = [ - { - id: '1', - value: { - FeeAmount: '12345', - FeeCode: 'mock code', - FeeVersion: 'mock version', - FeeDescription: 'mock description', - }, - }, - ]; - const req = mockRequest({ - userCase: { - id: '1234', - applicant1FullNameOnCertificate: 'User 1', - applicationFeeOrderSummary: { - Fees: orderSummaryFees, - }, - }, - }); - - const client = new PaymentClient(req.session, 'http://return-url'); - const actual = await client.createServiceRequest('mock applicant', orderSummaryFees); - - expect(mockPost).toHaveBeenCalledWith('/service-request', { - call_back_url: 'http://return-url', - case_payment_request: { - action: 'payment', - responsible_party: 'mock applicant', - }, - case_reference: '1234', - ccd_case_number: '1234', - fees: [ - { - calculated_amount: '123.45', - code: 'mock code', - version: 'mock version', - }, - ], - hmcts_org_id: 'ABA1', - }); - - expect(actual).toEqual({ - mockPayment: 'data', - service_request_reference: 'test1234', - }); - }); }); diff --git a/src/main/app/payment/PaymentClient.ts b/src/main/app/payment/PaymentClient.ts index 04e3f3c67c..0cfd7ffd48 100644 --- a/src/main/app/payment/PaymentClient.ts +++ b/src/main/app/payment/PaymentClient.ts @@ -26,42 +26,6 @@ export class PaymentClient { this.returnUrl = returnUrl; } - public async createServiceRequest( - responsibleParty: string | undefined, - feesFromOrderSummary: ListValue[] - ): Promise { - const userCase = this.session.userCase; - const caseId = userCase.id.toString(); - const bodyServiceReq = { - call_back_url: this.returnUrl, - case_payment_request: { - action: 'payment', - responsible_party: responsibleParty, - }, - case_reference: caseId, - ccd_case_number: caseId, - fees: feesFromOrderSummary.map(fee => ({ - calculated_amount: `${parseInt(fee.value.FeeAmount, 10) / 100}`, - code: fee.value.FeeCode, - version: fee.value.FeeVersion, - })), - hmcts_org_id: 'ABA1', - }; - - try { - const serviceRequestResponse = await this.client.post('/service-request', bodyServiceReq); - logger.info(serviceRequestResponse.data); - if (!serviceRequestResponse.data) { - throw serviceRequestResponse; - } - return serviceRequestResponse.data; - } catch (e) { - const errMsg = 'Error creating service request number'; - logger.error(errMsg, e.data); - throw new Error(errMsg); - } - } - public async create(serviceRequestNumber: string, feesFromOrderSummary: ListValue[]): Promise { const total = feesFromOrderSummary.reduce((sum, item) => sum + +item.value.FeeAmount, 0) / 100; diff --git a/src/main/app/payment/PaymentModel.test.ts b/src/main/app/payment/PaymentModel.test.ts index 55cf2ea58f..9894ec095c 100644 --- a/src/main/app/payment/PaymentModel.test.ts +++ b/src/main/app/payment/PaymentModel.test.ts @@ -1,4 +1,4 @@ -import { Payment, PaymentStatus } from '../../app/case/definition'; +import { Payment } from '../../app/case/definition'; import { PaymentModel } from './PaymentModel'; @@ -38,83 +38,4 @@ describe('PaymentModel', () => { 'Unable to find transaction' ); }); - - it('returns blank service request reference since no payments matches the fee code', async () => { - const payment = new PaymentModel([ - { - id: '123', - value: { feeCode: 'FE003', status: PaymentStatus.ERROR, serviceRequestReference: '' } as unknown as Payment, - }, - //{ id: '456', value: { data: 'last one' } as unknown as Payment }, - ]); - expect(payment.getServiceRefNumberForFee('FE002')).toEqual(''); - }); - - it('returns blank service request reference since payments match the fee code but no service request reference present', async () => { - const payment = new PaymentModel([ - { - id: '123', - value: { feeCode: 'FE002', status: PaymentStatus.ERROR } as unknown as Payment, - }, - //{ id: '456', value: { data: 'last one' } as unknown as Payment }, - ]); - expect(payment.getServiceRefNumberForFee('FE002')).toEqual(''); - }); - - it('returns blank service request reference since payments match the fee code but no existing SRN', async () => { - const payment = new PaymentModel([ - { - id: '123', - value: { feeCode: 'FE002', status: PaymentStatus.ERROR, serviceRequestReference: '' } as unknown as Payment, - }, - //{ id: '456', value: { data: 'last one' } as unknown as Payment }, - ]); - expect(payment.getServiceRefNumberForFee('FE002')).toEqual(''); - }); - - it('returns blank service request reference since no unsuccessful SRN present for fee code', async () => { - const payment = new PaymentModel([ - { - id: '123', - value: { - feeCode: 'FE002', - status: PaymentStatus.SUCCESS, - serviceRequestReference: 'sr123', - } as unknown as Payment, - }, - //{ id: '456', value: { data: 'last one' } as unknown as Payment }, - ]); - expect(payment.getServiceRefNumberForFee('FE002')).toEqual(''); - }); - - it('returns a service request reference since has srn with no successful payment for fee code', async () => { - const payment = new PaymentModel([ - { - id: '123', - value: { - feeCode: 'FE002', - status: PaymentStatus.ERROR, - serviceRequestReference: 'sr123', - } as unknown as Payment, - }, - { - id: '789', - value: { - feeCode: 'FE002', - status: PaymentStatus.ERROR, - serviceRequestReference: 'sr125', - } as unknown as Payment, - }, - { - id: '456', - value: { - feeCode: 'FE002', - status: PaymentStatus.SUCCESS, - serviceRequestReference: 'sr123', - } as unknown as Payment, - }, - //{ id: '456', value: { data: 'last one' } as unknown as Payment }, - ]); - expect(payment.getServiceRefNumberForFee('FE002')).toEqual('sr125'); - }); }); diff --git a/src/main/app/payment/PaymentModel.ts b/src/main/app/payment/PaymentModel.ts index 8b18d1f0d3..f58f79ab9b 100644 --- a/src/main/app/payment/PaymentModel.ts +++ b/src/main/app/payment/PaymentModel.ts @@ -46,33 +46,4 @@ export class PaymentModel { this.hasPayment && this.lastPayment.status === PaymentStatus.IN_PROGRESS && this.lastPayment.reference !== null ); } - - public getServiceRefNumberForFee(feeCode: string): string { - const filteredPayments = this.payments.filter(payment => payment.value.feeCode === feeCode); - - //if no payments match the given fee code, return blank - if (filteredPayments.length === 0) { - return ''; - } - - //create a map to track payment statuses by reference number - const referenceMap = new Map(); - - //Populate map with payment statuses - filteredPayments.forEach(payment => { - if (!referenceMap.has(payment.value.serviceRequestReference)) { - referenceMap.set(payment.value.serviceRequestReference, []); - } - referenceMap.get(payment.value.serviceRequestReference).push(payment.value.status); - }); - - //Find a reference number with no successful payment - for (const [referenceNumber, statuses] of referenceMap) { - if (!statuses.includes(PaymentStatus.SUCCESS)) { - return referenceNumber || ''; - } - } - - return ''; - } } diff --git a/src/main/app/payment/__mocks__/PaymentClient.ts b/src/main/app/payment/__mocks__/PaymentClient.ts index b15562dec3..7af2b1bb1e 100644 --- a/src/main/app/payment/__mocks__/PaymentClient.ts +++ b/src/main/app/payment/__mocks__/PaymentClient.ts @@ -1,6 +1,5 @@ export const mockCreate = jest.fn(); -export const mockCreateServiceRequest = jest.fn(); export const mockGet = jest.fn(); export const PaymentClient = jest.fn().mockImplementation(() => { - return { createServiceRequest: mockCreateServiceRequest, create: mockCreate, get: mockGet }; + return { create: mockCreate, get: mockGet }; }); diff --git a/src/main/steps/applicant1/pay-your-fee/post.test.ts b/src/main/steps/applicant1/pay-your-fee/post.test.ts index b75d7b55c5..6e1b1fd177 100644 --- a/src/main/steps/applicant1/pay-your-fee/post.test.ts +++ b/src/main/steps/applicant1/pay-your-fee/post.test.ts @@ -7,7 +7,7 @@ import PaymentPostController from './post'; jest.mock('../../../app/payment/PaymentClient'); -const { mockCreateServiceRequest, mockCreate, mockGet } = require('../../../app/payment/PaymentClient'); +const { mockCreate, mockGet } = require('../../../app/payment/PaymentClient'); describe('PaymentPostController', () => { const paymentController = new PaymentPostController(); @@ -15,7 +15,6 @@ describe('PaymentPostController', () => { beforeEach(() => { mockCreate.mockClear(); mockGet.mockClear(); - mockCreateServiceRequest.mockClear(); }); describe('payment', () => { @@ -23,6 +22,7 @@ describe('PaymentPostController', () => { const req = mockRequest({ userCase: { state: State.AwaitingPayment, + applicationFeeServiceRequestReference: '/payment-callback', applicationFeeOrderSummary: { Fees: [{ value: { FeeCode: 'mock fee code', FeeAmount: 123 } }], }, @@ -67,6 +67,7 @@ describe('PaymentPostController', () => { applicationFeeOrderSummary: { Fees: [{ value: { FeeCode: 'mock fee code', FeeAmount: 123 } }], }, + applicationFeeServiceRequestReference: '/payment-callback', }); (mockCreate as jest.Mock).mockReturnValueOnce({ @@ -76,10 +77,6 @@ describe('PaymentPostController', () => { _links: { next_url: { href: 'http://example.com/pay' } }, }); - (mockCreateServiceRequest as jest.Mock).mockReturnValueOnce({ - service_request_reference: 'test1234', - }); - await paymentController.post(req, res); expect(req.locals.api.triggerEvent).toHaveBeenCalledWith( @@ -93,6 +90,7 @@ describe('PaymentPostController', () => { const req = mockRequest({ userCase: { state: State.AwaitingPayment, + applicationFeeServiceRequestReference: '/payment-callback', applicationPayments: [ { id: 'mock external reference payment id', diff --git a/src/main/steps/applicant1/pay-your-fee/post.ts b/src/main/steps/applicant1/pay-your-fee/post.ts index 897de164a1..ac40633602 100644 --- a/src/main/steps/applicant1/pay-your-fee/post.ts +++ b/src/main/steps/applicant1/pay-your-fee/post.ts @@ -23,7 +23,7 @@ export default class PaymentPostController extends BasePaymentPostController { return 'applicationPayments' as keyof CaseData; } - protected getResponsiblePartyName(req: AppRequest): string | undefined { - return req.session.userCase.applicant1FullNameOnCertificate; + protected getServiceReferenceForFee(req: AppRequest): string { + return req.session.userCase.applicationFeeServiceRequestReference; } } diff --git a/src/main/steps/respondent/pay-your-final-order-fee/post.test.ts b/src/main/steps/respondent/pay-your-final-order-fee/post.test.ts index 2a700854ac..35855723f7 100644 --- a/src/main/steps/respondent/pay-your-final-order-fee/post.test.ts +++ b/src/main/steps/respondent/pay-your-final-order-fee/post.test.ts @@ -7,7 +7,7 @@ import PaymentPostController from './post'; jest.mock('../../../app/payment/PaymentClient'); -const { mockCreateServiceRequest, mockCreate, mockGet } = require('../../../app/payment/PaymentClient'); +const { mockCreate, mockGet } = require('../../../app/payment/PaymentClient'); describe('PaymentPostController', () => { const paymentController = new PaymentPostController(); @@ -15,7 +15,6 @@ describe('PaymentPostController', () => { beforeEach(() => { mockCreate.mockClear(); mockGet.mockClear(); - mockCreateServiceRequest.mockClear(); }); describe('payment', () => { @@ -23,7 +22,8 @@ describe('PaymentPostController', () => { const req = mockRequest({ userCase: { state: State.AwaitingFinalOrderPayment, - applicationFeeOrderSummary: { + applicant2FinalOrderFeeServiceRequestReference: '/payment-callback', + applicant2FinalOrderFeeOrderSummary: { Fees: [{ value: { FeeCode: 'mock fee code', FeeAmount: 123 } }], }, finalOrderPayments: [ @@ -41,7 +41,7 @@ describe('PaymentPostController', () => { (req.locals.api.triggerPaymentEvent as jest.Mock).mockReturnValueOnce({ finalOrderPayments: [{ new: 'payment' }], - applicationFeeOrderSummary: { + applicant2FinalOrderFeeOrderSummary: { Fees: [{ value: { FeeCode: 'mock fee code', FeeAmount: 123 } }], }, }); @@ -64,6 +64,7 @@ describe('PaymentPostController', () => { (req.locals.api.triggerEvent as jest.Mock).mockReturnValueOnce({ state: State.AwaitingFinalOrder, + applicant2FinalOrderFeeServiceRequestReference: '/payment-callback', applicant2FinalOrderFeeOrderSummary: { Fees: [{ value: { FeeCode: 'mock fee code', FeeAmount: 123 } }], }, @@ -76,10 +77,6 @@ describe('PaymentPostController', () => { _links: { next_url: { href: 'http://example.com/pay' } }, }); - (mockCreateServiceRequest as jest.Mock).mockReturnValueOnce({ - service_request_reference: 'test1234', - }); - await paymentController.post(req, res); expect(req.locals.api.triggerEvent).toHaveBeenCalledWith( @@ -93,6 +90,7 @@ describe('PaymentPostController', () => { const req = mockRequest({ userCase: { state: State.AwaitingFinalOrderPayment, + applicant2FinalOrderFeeServiceRequestReference: '/payment-callback', finalOrderPayments: [ { id: 'mock external reference payment id', diff --git a/src/main/steps/respondent/pay-your-final-order-fee/post.ts b/src/main/steps/respondent/pay-your-final-order-fee/post.ts index b30ef5de54..24f6405bf4 100644 --- a/src/main/steps/respondent/pay-your-final-order-fee/post.ts +++ b/src/main/steps/respondent/pay-your-final-order-fee/post.ts @@ -23,7 +23,7 @@ export default class FinalOrderPaymentPostController extends BasePaymentPostCont return 'finalOrderPayments' as keyof CaseData; } - protected getResponsiblePartyName(req: AppRequest): string | undefined { - return req.session.userCase.applicant2FullNameOnCertificate; + protected getServiceReferenceForFee(req: AppRequest): string { + return req.session.userCase.applicant2FinalOrderFeeServiceRequestReference; } } From 47c1201f3c3a33e3073562240104e423706c6152 Mon Sep 17 00:00:00 2001 From: FaisalMoJ <100577377+FaisalMoJ@users.noreply.github.com> Date: Mon, 14 Oct 2024 16:09:04 +0100 Subject: [PATCH 11/12] NFDIV-4299: Add fortify scans to nightly pipeline (#3935) * NFDIV-4299: Add fortify scans to nightly pipeline * Update config/fortify-client.properties Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * NFDIV-4299: Remove redundant gitignore file * NFDIV-4299: Enable fortify in pipeline * NFDIV-4299: Revert adding code to JenkinsFile * NFDIV-4299: Fix issue with fortify path * NFDIV-4299: Fix issue with fortify scan settings * NFDIV-4299: Remove unwanted fortify properties file --------- Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> --- .gitignore | 11 + Jenkinsfile_nightly | 2 + package.json | 3 +- src/test/java/build.gradle | 32 +++ .../java/config/fortify-client.properties | 1 + .../java/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + src/test/java/gradlew | 252 ++++++++++++++++++ src/test/java/gradlew.bat | 94 +++++++ 9 files changed, 401 insertions(+), 1 deletion(-) create mode 100644 src/test/java/build.gradle create mode 100644 src/test/java/config/fortify-client.properties create mode 100644 src/test/java/gradle/wrapper/gradle-wrapper.jar create mode 100644 src/test/java/gradle/wrapper/gradle-wrapper.properties create mode 100755 src/test/java/gradlew create mode 100644 src/test/java/gradlew.bat diff --git a/.gitignore b/.gitignore index e52b3d90f4..1c31875058 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,8 @@ node_modules/ .idea/ *.iml +*.iws +*.ipr *swp *log @@ -13,11 +15,20 @@ node_modules/ src/**/*.js src/main/public/* +Fortify Scan/ +lib/ node-rpm-packaging/ mochawesome-report/ npm-debug.log.* +.gradle/ +out/ +bin/ +build/ + +.classpath +target/ .project .settings/ dist/ diff --git a/Jenkinsfile_nightly b/Jenkinsfile_nightly index 599f7aa418..5bf97dab01 100644 --- a/Jenkinsfile_nightly +++ b/Jenkinsfile_nightly @@ -46,6 +46,8 @@ def pipelineConf = new AppPipelineConfig() pipelineConf.vaultSecrets = secrets withNightlyPipeline(type, product, component) { + enableFortifyScan() + afterSuccess('fortify-scan') { steps.archiveArtifacts allowEmptyArchive: true, artifacts: '**/Fortify Scan/**/*' } enableCrossBrowserTest() enableFullFunctionalTest() loadVaultSecrets(secrets) diff --git a/package.json b/package.json index 611130cfb3..c09a430a1e 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,8 @@ "test:crossbrowser:playwright:docker": "docker pull mcr.microsoft.com/playwright:focal && docker run --rm --volume $PWD:/home/app --workdir='/home/app' --env TEST_PASSWORD --env TEST_URL mcr.microsoft.com/playwright:focal bash -x src/test/docker-yarn.sh test:crossbrowser:playwright $UID", "test:crossbrowser:sauce": "SAUCE='true' yarn test:crossbrowser:codeceptjs run --grep '^(?!.*@flaky)'", "test:crossbrowser:codeceptjs": "codeceptjs run --config ./src/test/cross-browser/codecept.conf.js", - "cichecks": "yarn && run-p build lint test" + "cichecks": "yarn && run-p build lint test", + "fortifyScan": "./src/test/java/gradlew -p ./src/test/java fortifyScan" }, "dependencies": { "@hmcts/cookie-manager": "1.0.0", diff --git a/src/test/java/build.gradle b/src/test/java/build.gradle new file mode 100644 index 0000000000..4da3476d47 --- /dev/null +++ b/src/test/java/build.gradle @@ -0,0 +1,32 @@ +plugins { + id 'application' +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +// tag::repositories[] +repositories { + mavenLocal() + mavenCentral() + maven { + url 'https://jitpack.io' + } +} +// end::repositories[] + +// tag::dependencies[] +dependencies { + testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.36' + testImplementation 'com.github.hmcts:fortify-client:1.2.0:all' +} +// end::dependencies[] + +task fortifyScan(type: JavaExec) { + main = "uk.gov.hmcts.fortifyclient.FortifyClientMainApp" + classpath += sourceSets.test.runtimeClasspath + jvmArgs = ['--add-opens=java.base/java.lang.reflect=ALL-UNNAMED'] +} diff --git a/src/test/java/config/fortify-client.properties b/src/test/java/config/fortify-client.properties new file mode 100644 index 0000000000..2733836445 --- /dev/null +++ b/src/test/java/config/fortify-client.properties @@ -0,0 +1 @@ +fortify.client.releaseId=134904 \ No newline at end of file diff --git a/src/test/java/gradle/wrapper/gradle-wrapper.jar b/src/test/java/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/src/test/java/gradle/wrapper/gradle-wrapper.properties b/src/test/java/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..df97d72b8b --- /dev/null +++ b/src/test/java/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/src/test/java/gradlew b/src/test/java/gradlew new file mode 100755 index 0000000000..f5feea6d6b --- /dev/null +++ b/src/test/java/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/src/test/java/gradlew.bat b/src/test/java/gradlew.bat new file mode 100644 index 0000000000..9b42019c79 --- /dev/null +++ b/src/test/java/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From 1507320742b5ae8792c5803f2f71a040a3cffca6 Mon Sep 17 00:00:00 2001 From: FaisalMoJ <100577377+FaisalMoJ@users.noreply.github.com> Date: Tue, 15 Oct 2024 10:41:33 +0100 Subject: [PATCH 12/12] NFDIV-4299: Temporary disable fortify scan to fix issues (#3939) * NFDIV-4299: Add fortify scans to nightly pipeline * Update config/fortify-client.properties Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * NFDIV-4299: Remove redundant gitignore file * NFDIV-4299: Enable fortify in pipeline * NFDIV-4299: Revert adding code to JenkinsFile * NFDIV-4299: Fix issue with fortify path * NFDIV-4299: Fix issue with fortify scan settings * NFDIV-4299: Remove unwanted fortify properties file * NFDIV-4299: Temporarily disable fortify scan --------- Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> --- Jenkinsfile_nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile_nightly b/Jenkinsfile_nightly index 5bf97dab01..d01813e54c 100644 --- a/Jenkinsfile_nightly +++ b/Jenkinsfile_nightly @@ -46,8 +46,8 @@ def pipelineConf = new AppPipelineConfig() pipelineConf.vaultSecrets = secrets withNightlyPipeline(type, product, component) { - enableFortifyScan() - afterSuccess('fortify-scan') { steps.archiveArtifacts allowEmptyArchive: true, artifacts: '**/Fortify Scan/**/*' } + //enableFortifyScan() + //afterSuccess('fortify-scan') { steps.archiveArtifacts allowEmptyArchive: true, artifacts: '**/Fortify Scan/**/*' } enableCrossBrowserTest() enableFullFunctionalTest() loadVaultSecrets(secrets)