From 2b73eae2a1fb2272da75d399e8a6286f73b63100 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Nov 2023 12:13:34 +0100 Subject: [PATCH 1/9] Bump nock from 13.3.3 to 13.3.7 (#189) Bumps [nock](https://github.com/nock/nock) from 13.3.3 to 13.3.7. - [Release notes](https://github.com/nock/nock/releases) - [Changelog](https://github.com/nock/nock/blob/main/CHANGELOG.md) - [Commits](https://github.com/nock/nock/compare/v13.3.3...v13.3.7) --- updated-dependencies: - dependency-name: nock dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4ab4c01..3806224 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "eslint": "8.45.0", "jest": "29.6.1", "jest-junit": "16.0.0", - "nock": "13.3.3" + "nock": "13.3.7" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -4866,14 +4866,13 @@ } }, "node_modules/nock": { - "version": "13.3.3", - "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.3.tgz", - "integrity": "sha512-z+KUlILy9SK/RjpeXDiDUEAq4T94ADPHE3qaRkf66mpEhzc/ytOMm3Bwdrbq6k1tMWkbdujiKim3G2tfQARuJw==", + "version": "13.3.7", + "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.7.tgz", + "integrity": "sha512-z3voRxo6G0JxqCsjuzERh1ReFC4Vp2b7JpSgcMJB6jnJbUszf88awAeQLIID2UNMwbMh9/Zm5sFscagj0QYHEg==", "dev": true, "dependencies": { "debug": "^4.1.0", "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.21", "propagate": "^2.0.0" }, "engines": { diff --git a/package.json b/package.json index 60575ab..42554bb 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,6 @@ "eslint": "8.45.0", "jest": "29.6.1", "jest-junit": "16.0.0", - "nock": "13.3.3" + "nock": "13.3.7" } } From d949797a5674c7eb62501703b0b8902ca588964b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Nov 2023 12:21:01 +0100 Subject: [PATCH 2/9] Bump eslint from 8.45.0 to 8.52.0 (#190) Bumps [eslint](https://github.com/eslint/eslint) from 8.45.0 to 8.52.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.45.0...v8.52.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 93 +++++++++++++++++++++++++---------------------- package.json | 2 +- 2 files changed, 51 insertions(+), 44 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3806224..b09ee58 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "@octokit/fixtures": "22.0.6", "@vercel/ncc": "0.36.1", "enzyme": "3.11.0", - "eslint": "8.45.0", + "eslint": "8.52.0", "jest": "29.6.1", "jest-junit": "16.0.0", "nock": "13.3.7" @@ -819,18 +819,18 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz", - "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/eslintrc": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz", - "integrity": "sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", + "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -851,9 +851,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.44.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz", - "integrity": "sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz", + "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -869,12 +869,12 @@ } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz", - "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==", + "version": "0.11.13", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", + "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", "dev": true, "dependencies": { - "@humanwhocodes/object-schema": "^1.2.1", + "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", "minimatch": "^3.0.5" }, @@ -896,9 +896,9 @@ } }, "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", "dev": true }, "node_modules/@istanbuljs/load-nyc-config": { @@ -1904,6 +1904,12 @@ "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", "dev": true }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, "node_modules/@vercel/ncc": { "version": "0.36.1", "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.36.1.tgz", @@ -1914,9 +1920,9 @@ } }, "node_modules/acorn": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", - "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", + "version": "8.11.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", + "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -2882,27 +2888,28 @@ } }, "node_modules/eslint": { - "version": "8.45.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz", - "integrity": "sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz", + "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.4.0", - "@eslint/eslintrc": "^2.1.0", - "@eslint/js": "8.44.0", - "@humanwhocodes/config-array": "^0.11.10", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.2", + "@eslint/js": "8.52.0", + "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.10.0", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.3.2", "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.0", - "eslint-visitor-keys": "^3.4.1", - "espree": "^9.6.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -2936,9 +2943,9 @@ } }, "node_modules/eslint-scope": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz", - "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", @@ -2952,9 +2959,9 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz", - "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -3344,9 +3351,9 @@ } }, "node_modules/globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -5348,9 +5355,9 @@ } }, "node_modules/punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, "engines": { "node": ">=6" diff --git a/package.json b/package.json index 42554bb..518d94a 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "@octokit/fixtures": "22.0.6", "@vercel/ncc": "0.36.1", "enzyme": "3.11.0", - "eslint": "8.45.0", + "eslint": "8.52.0", "jest": "29.6.1", "jest-junit": "16.0.0", "nock": "13.3.7" From b733e5fa061525ff7b49ff145fd60d3b5cedf8ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:30:20 +0100 Subject: [PATCH 3/9] Bump actions/setup-node from 3 to 4 (#191) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b3c9c82..9773472 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,7 +49,7 @@ jobs: check_name: Example Go Report report_paths: go/report.xml file_name_in_stack_trace: true - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 16 cache: npm From 7f7a8752e78ade74ec16b8851e5d8010145d1eaa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 12:23:21 +0100 Subject: [PATCH 4/9] Bump @actions/core from 1.10.0 to 1.10.1 (#192) Bumps [@actions/core](https://github.com/actions/toolkit/tree/HEAD/packages/core) from 1.10.0 to 1.10.1. - [Changelog](https://github.com/actions/toolkit/blob/main/packages/core/RELEASES.md) - [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/core) --- updated-dependencies: - dependency-name: "@actions/core" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index b09ee58..73f9639 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "Apache-2.0", "dependencies": { - "@actions/core": "1.10.0", + "@actions/core": "1.10.1", "@actions/github": "5.1.1", "@actions/glob": "0.4.0", "@octokit/plugin-retry": "6.0.0", @@ -36,9 +36,9 @@ } }, "node_modules/@actions/core": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz", - "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.1.tgz", + "integrity": "sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==", "dependencies": { "@actions/http-client": "^2.0.1", "uuid": "^8.3.2" diff --git a/package.json b/package.json index 518d94a..e5d0578 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "titleTemplate": "{title}" }, "dependencies": { - "@actions/core": "1.10.0", + "@actions/core": "1.10.1", "@actions/github": "5.1.1", "@actions/glob": "0.4.0", "@octokit/rest": "19.0.11", From 21d3eaf2ba433fe3aa5090c28d3d621f008f1c02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 12:23:47 +0100 Subject: [PATCH 5/9] Bump eslint from 8.52.0 to 8.54.0 (#193) Bumps [eslint](https://github.com/eslint/eslint) from 8.52.0 to 8.54.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.52.0...v8.54.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 73f9639..78939ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "@octokit/fixtures": "22.0.6", "@vercel/ncc": "0.36.1", "enzyme": "3.11.0", - "eslint": "8.52.0", + "eslint": "8.54.0", "jest": "29.6.1", "jest-junit": "16.0.0", "nock": "13.3.7" @@ -828,9 +828,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", - "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", + "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -851,9 +851,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.52.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz", - "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==", + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", + "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -2888,15 +2888,15 @@ } }, "node_modules/eslint": { - "version": "8.52.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz", - "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==", + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", + "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "8.52.0", + "@eslint/eslintrc": "^2.1.3", + "@eslint/js": "8.54.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -3539,9 +3539,9 @@ } }, "node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz", + "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==", "dev": true, "engines": { "node": ">= 4" diff --git a/package.json b/package.json index e5d0578..37c1cbb 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "@octokit/fixtures": "22.0.6", "@vercel/ncc": "0.36.1", "enzyme": "3.11.0", - "eslint": "8.52.0", + "eslint": "8.54.0", "jest": "29.6.1", "jest-junit": "16.0.0", "nock": "13.3.7" From b51833dace290e71e014770f95056348077aa18b Mon Sep 17 00:00:00 2001 From: PlatformEngineering Date: Tue, 19 Dec 2023 16:35:00 +0000 Subject: [PATCH 6/9] GHA: Copilot contributor check See https://github.com/ScaCap/terraform/pull/13918/ for more details. --- .github/workflows/copilot-check.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/workflows/copilot-check.yml diff --git a/.github/workflows/copilot-check.yml b/.github/workflows/copilot-check.yml new file mode 100644 index 0000000..c9d6f30 --- /dev/null +++ b/.github/workflows/copilot-check.yml @@ -0,0 +1,11 @@ +on: + pull_request + +jobs: + check-contributors: + name: Check contributors + uses: scacap/infra.gh-actions/.github/workflows/copilot-contributor-check.yml@v1 + secrets: inherit + with: + repository: ${{ github.repository }} + pull_request_number: ${{ github.event.pull_request.number }} From 9e99e42245b5f2979bbaa541d615d5e2d26d7d6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 13:34:23 +0100 Subject: [PATCH 7/9] Bump actions/setup-go from 4 to 5 (#195) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4 to 5. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9773472..7bab9aa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: with: check_name: Example Pytest Report report_paths: python/report.xml - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: 1.18.x - run: | From a27556b71f611a52b07bd3bf084aacc6731872dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 13:34:41 +0100 Subject: [PATCH 8/9] Bump eslint from 8.54.0 to 8.56.0 (#196) Bumps [eslint](https://github.com/eslint/eslint) from 8.54.0 to 8.56.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.54.0...v8.56.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 36 ++++++++++++++++++------------------ package.json | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 78939ed..7a09564 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "@octokit/fixtures": "22.0.6", "@vercel/ncc": "0.36.1", "enzyme": "3.11.0", - "eslint": "8.54.0", + "eslint": "8.56.0", "jest": "29.6.1", "jest-junit": "16.0.0", "nock": "13.3.7" @@ -828,9 +828,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", - "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -851,9 +851,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.54.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", - "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz", + "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1920,9 +1920,9 @@ } }, "node_modules/acorn": { - "version": "8.11.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", - "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", + "version": "8.11.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", + "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -2888,15 +2888,15 @@ } }, "node_modules/eslint": { - "version": "8.54.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", - "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz", + "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.3", - "@eslint/js": "8.54.0", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.56.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -3351,9 +3351,9 @@ } }, "node_modules/globals": { - "version": "13.23.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", - "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "dev": true, "dependencies": { "type-fest": "^0.20.2" diff --git a/package.json b/package.json index 37c1cbb..8513c05 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "@octokit/fixtures": "22.0.6", "@vercel/ncc": "0.36.1", "enzyme": "3.11.0", - "eslint": "8.54.0", + "eslint": "8.56.0", "jest": "29.6.1", "jest-junit": "16.0.0", "nock": "13.3.7" From 687f107f48aa55aff279cc5ce598fd9860871a81 Mon Sep 17 00:00:00 2001 From: Ghais Zaher Date: Mon, 15 Jan 2024 14:59:51 +0100 Subject: [PATCH 9/9] GH-184: ignore incompatible XML reports (#198) Fixes #184 Ignore files that don't have testsuites Reorganize the folders --- .github/workflows/build.yml | 13 ++--- action.test.fixtures.js | 24 ++++----- dist/index.js | 46 +++++++++++------- ...pro.taskana.common.api.ListUtilTest-H2.xml | 0 .../TEST-test.MyIntegrationTestSuite.xml | 0 {go => integration-tests/go}/go.mod | 0 {go => integration-tests/go}/go.sum | 0 {go => integration-tests/go}/main_test.go | 0 .../go}/utils/string_test.go | 0 .../report/email/EmailAddressTest.class | Bin .../maven}/email/pom.xml | 0 .../surefire/report/email/EmailAddress.java | 0 .../email/InvalidEmailAddressException.java | 0 .../report/email/EmailAddressTest.java | 0 .../maven}/evil_twins/pom.xml | 0 .../surefire/report/twin/first/Twin.java | 0 .../surefire/report/twin/second/Twin.java | 0 .../surefire/report/twin/first/TwinTest.java | 0 .../surefire/report/twin/second/TwinTest.java | 0 {tests => integration-tests/maven}/pom.xml | 13 +++++ .../maven}/utils/pom.xml | 0 .../surefire/report/calc/CalcUtils.java | 0 .../surefire/report/calc/StringUtils.java | 0 .../surefire/report/calc/AllOkTest.java | 0 .../surefire/report/calc/CalcUtilsTest.kt | 0 .../surefire/report/calc/StringUtilsTest.java | 2 +- .../python}/__init__.py | 0 .../python}/test_sample.py | 0 .../report/email/EmailAddressTest.class | Bin 2786 -> 0 bytes utils.js | 44 +++++++++++------ utils.test.js | 40 ++++++++------- 31 files changed, 109 insertions(+), 73 deletions(-) rename {custom_reports => integration-tests/custom_reports}/TEST-pro.taskana.common.api.ListUtilTest-H2.xml (100%) rename {custom_reports => integration-tests/custom_reports}/TEST-test.MyIntegrationTestSuite.xml (100%) rename {go => integration-tests/go}/go.mod (100%) rename {go => integration-tests/go}/go.sum (100%) rename {go => integration-tests/go}/main_test.go (100%) rename {go => integration-tests/go}/utils/string_test.go (100%) rename {tests => integration-tests/maven}/email/build/java/test/action/surefire/report/email/EmailAddressTest.class (100%) rename {tests => integration-tests/maven}/email/pom.xml (100%) rename {tests => integration-tests/maven}/email/src/main/java/action/surefire/report/email/EmailAddress.java (100%) rename {tests => integration-tests/maven}/email/src/main/java/action/surefire/report/email/InvalidEmailAddressException.java (100%) rename {tests => integration-tests/maven}/email/src/test/java/action/surefire/report/email/EmailAddressTest.java (100%) rename {tests => integration-tests/maven}/evil_twins/pom.xml (100%) rename {tests => integration-tests/maven}/evil_twins/src/main/java/action/surefire/report/twin/first/Twin.java (100%) rename {tests => integration-tests/maven}/evil_twins/src/main/java/action/surefire/report/twin/second/Twin.java (100%) rename {tests => integration-tests/maven}/evil_twins/src/test/java/action/surefire/report/twin/first/TwinTest.java (100%) rename {tests => integration-tests/maven}/evil_twins/src/test/java/action/surefire/report/twin/second/TwinTest.java (100%) rename {tests => integration-tests/maven}/pom.xml (85%) rename {tests => integration-tests/maven}/utils/pom.xml (100%) rename {tests => integration-tests/maven}/utils/src/main/java/action/surefire/report/calc/CalcUtils.java (100%) rename {tests => integration-tests/maven}/utils/src/main/java/action/surefire/report/calc/StringUtils.java (100%) rename {tests => integration-tests/maven}/utils/src/test/java/action/surefire/report/calc/AllOkTest.java (100%) rename {tests => integration-tests/maven}/utils/src/test/java/action/surefire/report/calc/CalcUtilsTest.kt (100%) rename {tests => integration-tests/maven}/utils/src/test/java/action/surefire/report/calc/StringUtilsTest.java (99%) rename {python => integration-tests/python}/__init__.py (100%) rename {python => integration-tests/python}/test_sample.py (100%) delete mode 100644 tests/email/target/test-classes/action/surefire/report/email/EmailAddressTest.class diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7bab9aa..2ed75f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,24 +22,25 @@ jobs: java-version: 8 distribution: 'temurin' cache: 'maven' - - run: cd tests && mvn clean test --batch-mode -Dmaven.test.failure.ignore=true + - run: cd integration-tests/maven && mvn clean verify --batch-mode -Dmaven.test.failure.ignore=true - uses: ./ if: github.ref != 'refs/heads/master' with: check_name: Example Surefire Test Report + report_paths: '**/surefire-reports/*.xml, **/failsafe-reports/*.xml' - uses: cclauss/GitHub-Action-for-pytest@0.5.0 with: - args: pytest --junit-xml=python/report.xml python/ || exit 0 + args: pytest integration-tests/python/ --junit-xml=integration-tests/python/report.xml || exit 0 - uses: ./ if: github.ref != 'refs/heads/master' with: check_name: Example Pytest Report - report_paths: python/report.xml + report_paths: integration-tests/python/report.xml - uses: actions/setup-go@v5 with: - go-version: 1.18.x + go-version: 1.21.x - run: | - cd go && + cd integration-tests/go && go install github.com/jstemmer/go-junit-report/v2@latest && go test -v 2>&1 ./... | go-junit-report -out report.xml @@ -47,7 +48,7 @@ jobs: if: github.ref != 'refs/heads/master' with: check_name: Example Go Report - report_paths: go/report.xml + report_paths: integration-tests/go/report.xml file_name_in_stack_trace: true - uses: actions/setup-node@v4 with: diff --git a/action.test.fixtures.js b/action.test.fixtures.js index c93fd2a..c37f92c 100644 --- a/action.test.fixtures.js +++ b/action.test.fixtures.js @@ -9,7 +9,7 @@ const finishedWithFailures = { annotations: [ { path: - 'tests/email/src/test/java/action/surefire/report/email/EmailAddressTest.java', + 'integration-tests/maven/email/src/test/java/action/surefire/report/email/EmailAddressTest.java', start_line: 39, end_line: 39, start_column: 0, @@ -22,7 +22,7 @@ const finishedWithFailures = { }, { path: - 'tests/email/src/test/java/action/surefire/report/email/EmailAddressTest.java', + 'integration-tests/maven/email/src/test/java/action/surefire/report/email/EmailAddressTest.java', start_line: 49, end_line: 49, start_column: 0, @@ -35,7 +35,7 @@ const finishedWithFailures = { }, { path: - 'tests/email/src/test/java/action/surefire/report/email/EmailAddressTest.java', + 'integration-tests/maven/email/src/test/java/action/surefire/report/email/EmailAddressTest.java', start_line: 57, end_line: 57, start_column: 0, @@ -48,7 +48,7 @@ const finishedWithFailures = { }, { path: - 'tests/email/src/test/java/action/surefire/report/email/EmailAddressTest.java', + 'integration-tests/maven/email/src/test/java/action/surefire/report/email/EmailAddressTest.java', start_line: 18, end_line: 18, start_column: 0, @@ -61,7 +61,7 @@ const finishedWithFailures = { }, { path: - 'tests/email/src/test/java/action/surefire/report/email/EmailAddressTest.java', + 'integration-tests/maven/email/src/test/java/action/surefire/report/email/EmailAddressTest.java', start_line: 32, end_line: 32, start_column: 0, @@ -74,7 +74,7 @@ const finishedWithFailures = { }, { path: - 'tests/email/src/test/java/action/surefire/report/email/EmailAddressTest.java', + 'integration-tests/maven/email/src/test/java/action/surefire/report/email/EmailAddressTest.java', start_line: 25, end_line: 25, start_column: 0, @@ -88,7 +88,7 @@ const finishedWithFailures = { }, { path: - 'tests/email/src/test/java/action/surefire/report/email/EmailAddressTest.java', + 'integration-tests/maven/email/src/test/java/action/surefire/report/email/EmailAddressTest.java', start_line: 66, end_line: 66, start_column: 0, @@ -101,7 +101,7 @@ const finishedWithFailures = { }, { path: - 'tests/evil_twins/src/test/java/action/surefire/report/twin/second/TwinTest.java', + 'integration-tests/maven/evil_twins/src/test/java/action/surefire/report/twin/second/TwinTest.java', start_line: 13, end_line: 13, start_column: 0, @@ -113,7 +113,7 @@ const finishedWithFailures = { "java.lang.AssertionError: \n\nExpected: \"Good Twin\"\n but: was \"Evil Twin\"\n\tat action.surefire.report.twin.second.TwinTest.should_always_fail(TwinTest.java:13)" }, { - path: 'tests/utils/src/test/java/action/surefire/report/calc/CalcUtilsTest.kt', + path: 'integration-tests/maven/utils/src/test/java/action/surefire/report/calc/CalcUtilsTest.kt', start_line: 27, end_line: 27, start_column: 0, @@ -126,7 +126,7 @@ const finishedWithFailures = { 'java.lang.AssertionError: unexpected exception type thrown; expected: but was:\n\tat action.surefire.report.calc.CalcUtilsTest.test error handling(CalcUtilsTest.kt:27)\nCaused by: java.lang.IllegalArgumentException: Amount must have max 2 non-zero decimal places\n\tat action.surefire.report.calc.CalcUtilsTest.scale(CalcUtilsTest.kt:31)\n\tat action.surefire.report.calc.CalcUtilsTest.access$scale(CalcUtilsTest.kt:9)\n\tat action.surefire.report.calc.CalcUtilsTest.test error handling(CalcUtilsTest.kt:27)' }, { - path: 'tests/utils/src/test/java/action/surefire/report/calc/CalcUtilsTest.kt', + path: 'integration-tests/maven/utils/src/test/java/action/surefire/report/calc/CalcUtilsTest.kt', start_line: 15, end_line: 15, start_column: 0, @@ -138,7 +138,7 @@ const finishedWithFailures = { 'java.lang.AssertionError: \n\nExpected: <100.10>\n but: was <100.11>\n\tat action.surefire.report.calc.CalcUtilsTest.test scale(CalcUtilsTest.kt:15)' }, { - path: 'tests/utils/src/test/java/action/surefire/report/calc/StringUtilsTest.java', + path: 'integration-tests/maven/utils/src/test/java/action/surefire/report/calc/StringUtilsTest.java', start_line: 27, end_line: 27, start_column: 0, @@ -151,7 +151,7 @@ const finishedWithFailures = { 'java.lang.AssertionError: \n\nExpected: (an instance of java.lang.IllegalArgumentException and exception with message a string containing "This is unexpected")\n but: exception with message a string containing "This is unexpected" message was "Input=\'\' didn\'t match condition."\nStacktrace was: java.lang.IllegalArgumentException: Input=\'\' didn\'t match condition.\n\tat action.surefire.report.calc.StringUtils.requireNotBlank(StringUtils.java:25)\n\tat action.surefire.report.calc.StringUtils.requireNotBlank(StringUtils.java:18)\n\tat action.surefire.report.calc.StringUtilsTest.require_fail(StringUtilsTest.java:27)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n\tat java.lang.reflect.Method.invoke(Method.java:498)\n\tat org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)\n\tat org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)\n\tat org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56)\n\tat org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)\n\tat org.junit.rules.ExpectedException$ExpectedExceptionStatement.evaluate(ExpectedException.java:258)\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\n\tat org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)\n\tat org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)\n\tat org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)\n\tat org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)\n\tat org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)\n\tat org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)\n\tat org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\n\tat org.junit.runners.ParentRunner.run(ParentRunner.java:413)\n\tat org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:365)\n\tat org.apache.maven.surefire.junit4.JUnit4Provider.executeWithRerun(JUnit4Provider.java:273)\n\tat org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:238)\n\tat org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:159)\n\tat org.apache.maven.surefire.booter.ForkedBooter.invokeProviderInSameClassLoader(ForkedBooter.java:384)\n\tat org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:345)\n\tat org.apache.maven.surefire.booter.ForkedBooter.execute(ForkedBooter.java:126)\n\tat org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:418)' }, { - path: 'tests/utils/src/test/java/action/surefire/report/calc/StringUtilsTest.java', + path: 'integration-tests/maven/utils/src/test/java/action/surefire/report/calc/StringUtilsTest.java', start_line: 20, end_line: 20, start_column: 0, diff --git a/dist/index.js b/dist/index.js index 40f8d1f..08816d7 100644 --- a/dist/index.js +++ b/dist/index.js @@ -679,7 +679,7 @@ class OidcClient { .catch(error => { throw new Error(`Failed to get ID Token. \n Error Code : ${error.statusCode}\n - Error Message: ${error.result.message}`); + Error Message: ${error.message}`); }); const id_token = (_a = res.result) === null || _a === void 0 ? void 0 : _a.value; if (!id_token) { @@ -19994,24 +19994,24 @@ const resolveFileAndLine = (file, classname, output, isFilenameInOutput) => { let filenameWithPackage; if (isFilenameInOutput) { filename = output.split(':')[0].trim(); - filenameWithPackage = filename + filenameWithPackage = filename; } else { filename = file ? file : classname.split('.').slice(-1)[0].split('(')[0]; - filenameWithPackage = classname.replace(/\./g, "/"); + filenameWithPackage = classname.replace(/\./g, '/'); } const matches = output.match(new RegExp(`${filename}.*?:\\d+`, 'g')); - if (!matches) return { filename: filename, filenameWithPackage: filenameWithPackage, line: 1 }; + if (!matches) return {filename: filename, filenameWithPackage: filenameWithPackage, line: 1}; const [lastItem] = matches.slice(-1); const [, line] = lastItem.split(':'); core.debug(`Resolved file ${filenameWithPackage} with name ${filename} and line ${line}`); - return { filename, filenameWithPackage, line: parseInt(line) }; + return {filename, filenameWithPackage, line: parseInt(line)}; }; const resolvePath = async filenameWithPackage => { core.debug(`Resolving path for ${filenameWithPackage}`); - const globber = await glob.create([`**/${filenameWithPackage}.*`, `**/${filenameWithPackage}`].join('\n'), { followSymbolicLinks: false }); + const globber = await glob.create([`**/${filenameWithPackage}.*`, `**/${filenameWithPackage}`].join('\n'), {followSymbolicLinks: false}); const results = await globber.glob(); core.debug(`Matched files: ${results}`); const searchPath = globber.getSearchPaths()[0]; @@ -20034,6 +20034,19 @@ const resolvePath = async filenameWithPackage => { return canonicalPath; }; +function getTestsuites(report) { + if (report.testsuite) { + return [report.testsuite]; + } + if (!report.testsuites || !report.testsuites.testsuite) { + return []; + } + if (Array.isArray(report.testsuites.testsuite)) { + return report.testsuites.testsuite; + } + return [report.testsuites.testsuite]; +} + async function parseFile(file, isFilenameInStackTrace) { core.debug(`Parsing file ${file}`); let count = 0; @@ -20042,12 +20055,11 @@ async function parseFile(file, isFilenameInStackTrace) { const data = await fs.promises.readFile(file); - const report = JSON.parse(parser.xml2json(data, { compact: true })); - const testsuites = report.testsuite - ? [report.testsuite] - : Array.isArray(report.testsuites.testsuite) - ? report.testsuites.testsuite - : [report.testsuites.testsuite]; + const report = JSON.parse(parser.xml2json(data, {compact: true})); + core.debug(`parsed report: ${JSON.stringify(report)}`); + + const testsuites = getTestsuites(report); + core.debug(`test suites: ${JSON.stringify(testsuites)}`); for (const testsuite of testsuites) { const testcases = Array.isArray(testsuite.testcase) @@ -20084,7 +20096,7 @@ async function parseFile(file, isFilenameInStackTrace) { testcase._attributes.name ).trim(); - const { filename, filenameWithPackage, line } = resolveFileAndLine( + const {filename, filenameWithPackage, line} = resolveFileAndLine( testcase._attributes.file, testcase._attributes.classname, stackTrace, @@ -20109,22 +20121,22 @@ async function parseFile(file, isFilenameInStackTrace) { } } } - return { count, skipped, annotations }; + return {count, skipped, annotations}; } const parseTestReports = async (reportPaths, isFilenameInStackTrace) => { - const globber = await glob.create(reportPaths, { followSymbolicLinks: false }); + const globber = await glob.create(reportPaths, {followSymbolicLinks: false}); let annotations = []; let count = 0; let skipped = 0; for await (const file of globber.globGenerator()) { - const { count: c, skipped: s, annotations: a } = await parseFile(file, isFilenameInStackTrace); + const {count: c, skipped: s, annotations: a} = await parseFile(file, isFilenameInStackTrace); if (c === 0) continue; count += c; skipped += s; annotations = annotations.concat(a); } - return { count, skipped, annotations }; + return {count, skipped, annotations}; }; module.exports = { resolveFileAndLine, resolvePath, parseFile, parseTestReports }; diff --git a/custom_reports/TEST-pro.taskana.common.api.ListUtilTest-H2.xml b/integration-tests/custom_reports/TEST-pro.taskana.common.api.ListUtilTest-H2.xml similarity index 100% rename from custom_reports/TEST-pro.taskana.common.api.ListUtilTest-H2.xml rename to integration-tests/custom_reports/TEST-pro.taskana.common.api.ListUtilTest-H2.xml diff --git a/custom_reports/TEST-test.MyIntegrationTestSuite.xml b/integration-tests/custom_reports/TEST-test.MyIntegrationTestSuite.xml similarity index 100% rename from custom_reports/TEST-test.MyIntegrationTestSuite.xml rename to integration-tests/custom_reports/TEST-test.MyIntegrationTestSuite.xml diff --git a/go/go.mod b/integration-tests/go/go.mod similarity index 100% rename from go/go.mod rename to integration-tests/go/go.mod diff --git a/go/go.sum b/integration-tests/go/go.sum similarity index 100% rename from go/go.sum rename to integration-tests/go/go.sum diff --git a/go/main_test.go b/integration-tests/go/main_test.go similarity index 100% rename from go/main_test.go rename to integration-tests/go/main_test.go diff --git a/go/utils/string_test.go b/integration-tests/go/utils/string_test.go similarity index 100% rename from go/utils/string_test.go rename to integration-tests/go/utils/string_test.go diff --git a/tests/email/build/java/test/action/surefire/report/email/EmailAddressTest.class b/integration-tests/maven/email/build/java/test/action/surefire/report/email/EmailAddressTest.class similarity index 100% rename from tests/email/build/java/test/action/surefire/report/email/EmailAddressTest.class rename to integration-tests/maven/email/build/java/test/action/surefire/report/email/EmailAddressTest.class diff --git a/tests/email/pom.xml b/integration-tests/maven/email/pom.xml similarity index 100% rename from tests/email/pom.xml rename to integration-tests/maven/email/pom.xml diff --git a/tests/email/src/main/java/action/surefire/report/email/EmailAddress.java b/integration-tests/maven/email/src/main/java/action/surefire/report/email/EmailAddress.java similarity index 100% rename from tests/email/src/main/java/action/surefire/report/email/EmailAddress.java rename to integration-tests/maven/email/src/main/java/action/surefire/report/email/EmailAddress.java diff --git a/tests/email/src/main/java/action/surefire/report/email/InvalidEmailAddressException.java b/integration-tests/maven/email/src/main/java/action/surefire/report/email/InvalidEmailAddressException.java similarity index 100% rename from tests/email/src/main/java/action/surefire/report/email/InvalidEmailAddressException.java rename to integration-tests/maven/email/src/main/java/action/surefire/report/email/InvalidEmailAddressException.java diff --git a/tests/email/src/test/java/action/surefire/report/email/EmailAddressTest.java b/integration-tests/maven/email/src/test/java/action/surefire/report/email/EmailAddressTest.java similarity index 100% rename from tests/email/src/test/java/action/surefire/report/email/EmailAddressTest.java rename to integration-tests/maven/email/src/test/java/action/surefire/report/email/EmailAddressTest.java diff --git a/tests/evil_twins/pom.xml b/integration-tests/maven/evil_twins/pom.xml similarity index 100% rename from tests/evil_twins/pom.xml rename to integration-tests/maven/evil_twins/pom.xml diff --git a/tests/evil_twins/src/main/java/action/surefire/report/twin/first/Twin.java b/integration-tests/maven/evil_twins/src/main/java/action/surefire/report/twin/first/Twin.java similarity index 100% rename from tests/evil_twins/src/main/java/action/surefire/report/twin/first/Twin.java rename to integration-tests/maven/evil_twins/src/main/java/action/surefire/report/twin/first/Twin.java diff --git a/tests/evil_twins/src/main/java/action/surefire/report/twin/second/Twin.java b/integration-tests/maven/evil_twins/src/main/java/action/surefire/report/twin/second/Twin.java similarity index 100% rename from tests/evil_twins/src/main/java/action/surefire/report/twin/second/Twin.java rename to integration-tests/maven/evil_twins/src/main/java/action/surefire/report/twin/second/Twin.java diff --git a/tests/evil_twins/src/test/java/action/surefire/report/twin/first/TwinTest.java b/integration-tests/maven/evil_twins/src/test/java/action/surefire/report/twin/first/TwinTest.java similarity index 100% rename from tests/evil_twins/src/test/java/action/surefire/report/twin/first/TwinTest.java rename to integration-tests/maven/evil_twins/src/test/java/action/surefire/report/twin/first/TwinTest.java diff --git a/tests/evil_twins/src/test/java/action/surefire/report/twin/second/TwinTest.java b/integration-tests/maven/evil_twins/src/test/java/action/surefire/report/twin/second/TwinTest.java similarity index 100% rename from tests/evil_twins/src/test/java/action/surefire/report/twin/second/TwinTest.java rename to integration-tests/maven/evil_twins/src/test/java/action/surefire/report/twin/second/TwinTest.java diff --git a/tests/pom.xml b/integration-tests/maven/pom.xml similarity index 85% rename from tests/pom.xml rename to integration-tests/maven/pom.xml index e7c4613..fb2f956 100644 --- a/tests/pom.xml +++ b/integration-tests/maven/pom.xml @@ -78,6 +78,19 @@ true + + org.apache.maven.plugins + maven-failsafe-plugin + 2.22.2 + + + + integration-test + verify + + + + diff --git a/tests/utils/pom.xml b/integration-tests/maven/utils/pom.xml similarity index 100% rename from tests/utils/pom.xml rename to integration-tests/maven/utils/pom.xml diff --git a/tests/utils/src/main/java/action/surefire/report/calc/CalcUtils.java b/integration-tests/maven/utils/src/main/java/action/surefire/report/calc/CalcUtils.java similarity index 100% rename from tests/utils/src/main/java/action/surefire/report/calc/CalcUtils.java rename to integration-tests/maven/utils/src/main/java/action/surefire/report/calc/CalcUtils.java diff --git a/tests/utils/src/main/java/action/surefire/report/calc/StringUtils.java b/integration-tests/maven/utils/src/main/java/action/surefire/report/calc/StringUtils.java similarity index 100% rename from tests/utils/src/main/java/action/surefire/report/calc/StringUtils.java rename to integration-tests/maven/utils/src/main/java/action/surefire/report/calc/StringUtils.java diff --git a/tests/utils/src/test/java/action/surefire/report/calc/AllOkTest.java b/integration-tests/maven/utils/src/test/java/action/surefire/report/calc/AllOkTest.java similarity index 100% rename from tests/utils/src/test/java/action/surefire/report/calc/AllOkTest.java rename to integration-tests/maven/utils/src/test/java/action/surefire/report/calc/AllOkTest.java diff --git a/tests/utils/src/test/java/action/surefire/report/calc/CalcUtilsTest.kt b/integration-tests/maven/utils/src/test/java/action/surefire/report/calc/CalcUtilsTest.kt similarity index 100% rename from tests/utils/src/test/java/action/surefire/report/calc/CalcUtilsTest.kt rename to integration-tests/maven/utils/src/test/java/action/surefire/report/calc/CalcUtilsTest.kt diff --git a/tests/utils/src/test/java/action/surefire/report/calc/StringUtilsTest.java b/integration-tests/maven/utils/src/test/java/action/surefire/report/calc/StringUtilsTest.java similarity index 99% rename from tests/utils/src/test/java/action/surefire/report/calc/StringUtilsTest.java rename to integration-tests/maven/utils/src/test/java/action/surefire/report/calc/StringUtilsTest.java index 1a7498a..2c9784c 100644 --- a/tests/utils/src/test/java/action/surefire/report/calc/StringUtilsTest.java +++ b/integration-tests/maven/utils/src/test/java/action/surefire/report/calc/StringUtilsTest.java @@ -48,4 +48,4 @@ public void require_withNullMsg() { thrown.expectMessage("Input='' didn't match condition."); StringUtils.requireNotBlank(""); } -} \ No newline at end of file +} diff --git a/python/__init__.py b/integration-tests/python/__init__.py similarity index 100% rename from python/__init__.py rename to integration-tests/python/__init__.py diff --git a/python/test_sample.py b/integration-tests/python/test_sample.py similarity index 100% rename from python/test_sample.py rename to integration-tests/python/test_sample.py diff --git a/tests/email/target/test-classes/action/surefire/report/email/EmailAddressTest.class b/tests/email/target/test-classes/action/surefire/report/email/EmailAddressTest.class deleted file mode 100644 index d121cb09e73d47ac04b87a4dd97c65b01305d5a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2786 zcmb7FTW=Fb6h7-1yqFMza{-4-oNx;cYZH?IAwX>B0s$vb90HVZ8SjqmP1ZB+?m7wd z^27`3L!bKAcT}lTn@SZ3seLGKeS#kW>aVDJX4W_xunM)TvpaLn`Mx=~*}wjI@dp45 zLn#dVVN8W{VK@&L!q5lfDx_7&sE}1*LWM~crc{_#;i3wcRG3lWvIZiV4Cd>)27uo!~7A-Jc&)^jE^-3tn|3>;ffAUMGd zs=&^i$>?0IQlR!cDOk7@$#I=n3&b|Xy1p57%ci41GDmdRRI_{VPy-u0eEF()Va&Am9UMrQSxt%8#b&A~9kuQ3^#$2;P7fi=Q z!VF{FC4vO`+H>44C6{V=@MImZ-2(!j=`--PoEn9cO}9s+>{gqJK|AGr^fl zOeSNy#2ulGzptEOF14BDCYJe#8p3dnR45vcc*YrBr&ad@!%2>jGiiFmFN|Mo@R6hOr=Y7VuvRnx@|ay4O{ zcCo313q~Q`8(Lwiz_F#8<7y7CP;6IL(%dp}HB&RVhCQXNij}v8soN%8B!~iS^4$`B zFKDnXazi-K72g?%=30gV9a8&poiO9&3vrwTLGq~FU1OSt``W1rN$Cw;XQrSprZG)v zx<)Ehi+VxqnYO917|U9`RB|?}x-N5?SVYb0=KW~D@Tt4>Z`N%m1(Gh1f(O3))vvF= zef{{=FXEXdj)8wq(~U=exo#~l8AVKhD~8rnw2S->{`u6G=gv3Z{rvXHk8jq$PyhYf zg~r^n%~x4$ zhOOW%8vYLSb$k0pD_<=v;Ut8h&RF|La=A zM*C!Y1p>UNz<9H<{PfEdFH&Eq-dN*}jyGt9V7rbsLBHc0b1yez$9!A$s{wI0ZrF^2 zBY|+iB6b9RkNWTfC4Sp+ByrYJ9>P@;pE#wkCH@SQb$kiHVU%0t<~BHj@2#Ez9EAZ~ zVY<*cAe~2WC7eT%z;kH1x#1p01ArX})8>N+)gj`j69j`2?sx<45_$=^NL+aa!FXhg zlv`15AV(l5EMNB)BT&wk8x&JYo;Vz8A^%`6xP? zQY4yDgeCZPDO;OR#E_y7Df*G(;72Kv4T_O^6rp%z$0k@W?MD%Izz5en?I(P2@2c3= ztcu4GPWvd_Py;SsKV38)*(pPBmvWbskxl3A#xep7Awde$a1zrn40~Y2M;2|G?No#8 zZk?<*9_f$-ol { let filenameWithPackage; if (isFilenameInOutput) { filename = output.split(':')[0].trim(); - filenameWithPackage = filename + filenameWithPackage = filename; } else { filename = file ? file : classname.split('.').slice(-1)[0].split('(')[0]; - filenameWithPackage = classname.replace(/\./g, "/"); + filenameWithPackage = classname.replace(/\./g, '/'); } const matches = output.match(new RegExp(`${filename}.*?:\\d+`, 'g')); - if (!matches) return { filename: filename, filenameWithPackage: filenameWithPackage, line: 1 }; + if (!matches) return {filename: filename, filenameWithPackage: filenameWithPackage, line: 1}; const [lastItem] = matches.slice(-1); const [, line] = lastItem.split(':'); core.debug(`Resolved file ${filenameWithPackage} with name ${filename} and line ${line}`); - return { filename, filenameWithPackage, line: parseInt(line) }; + return {filename, filenameWithPackage, line: parseInt(line)}; }; const resolvePath = async filenameWithPackage => { core.debug(`Resolving path for ${filenameWithPackage}`); - const globber = await glob.create([`**/${filenameWithPackage}.*`, `**/${filenameWithPackage}`].join('\n'), { followSymbolicLinks: false }); + const globber = await glob.create([`**/${filenameWithPackage}.*`, `**/${filenameWithPackage}`].join('\n'), {followSymbolicLinks: false}); const results = await globber.glob(); core.debug(`Matched files: ${results}`); const searchPath = globber.getSearchPaths()[0]; @@ -49,6 +49,19 @@ const resolvePath = async filenameWithPackage => { return canonicalPath; }; +function getTestsuites(report) { + if (report.testsuite) { + return [report.testsuite]; + } + if (!report.testsuites || !report.testsuites.testsuite) { + return []; + } + if (Array.isArray(report.testsuites.testsuite)) { + return report.testsuites.testsuite; + } + return [report.testsuites.testsuite]; +} + async function parseFile(file, isFilenameInStackTrace) { core.debug(`Parsing file ${file}`); let count = 0; @@ -57,12 +70,11 @@ async function parseFile(file, isFilenameInStackTrace) { const data = await fs.promises.readFile(file); - const report = JSON.parse(parser.xml2json(data, { compact: true })); - const testsuites = report.testsuite - ? [report.testsuite] - : Array.isArray(report.testsuites.testsuite) - ? report.testsuites.testsuite - : [report.testsuites.testsuite]; + const report = JSON.parse(parser.xml2json(data, {compact: true})); + core.debug(`parsed report: ${JSON.stringify(report)}`); + + const testsuites = getTestsuites(report); + core.debug(`test suites: ${JSON.stringify(testsuites)}`); for (const testsuite of testsuites) { const testcases = Array.isArray(testsuite.testcase) @@ -99,7 +111,7 @@ async function parseFile(file, isFilenameInStackTrace) { testcase._attributes.name ).trim(); - const { filename, filenameWithPackage, line } = resolveFileAndLine( + const {filename, filenameWithPackage, line} = resolveFileAndLine( testcase._attributes.file, testcase._attributes.classname, stackTrace, @@ -124,22 +136,22 @@ async function parseFile(file, isFilenameInStackTrace) { } } } - return { count, skipped, annotations }; + return {count, skipped, annotations}; } const parseTestReports = async (reportPaths, isFilenameInStackTrace) => { - const globber = await glob.create(reportPaths, { followSymbolicLinks: false }); + const globber = await glob.create(reportPaths, {followSymbolicLinks: false}); let annotations = []; let count = 0; let skipped = 0; for await (const file of globber.globGenerator()) { - const { count: c, skipped: s, annotations: a } = await parseFile(file, isFilenameInStackTrace); + const {count: c, skipped: s, annotations: a} = await parseFile(file, isFilenameInStackTrace); if (c === 0) continue; count += c; skipped += s; annotations = annotations.concat(a); } - return { count, skipped, annotations }; + return {count, skipped, annotations}; }; module.exports = { resolveFileAndLine, resolvePath, parseFile, parseTestReports }; diff --git a/utils.test.js b/utils.test.js index 433bdb9..3a87225 100644 --- a/utils.test.js +++ b/utils.test.js @@ -99,32 +99,32 @@ describe('resolvePath', () => { it('should find correct file for Java filename', async () => { const path = await resolvePath('EmailAddressTest'); expect(path).toBe( - 'tests/email/src/test/java/action/surefire/report/email/EmailAddressTest.java' + 'integration-tests/maven/email/src/test/java/action/surefire/report/email/EmailAddressTest.java' ); }); it('should find correct file for Kotlin filename', async () => { const path = await resolvePath('CalcUtilsTest'); - expect(path).toBe('tests/utils/src/test/java/action/surefire/report/calc/CalcUtilsTest.kt'); + expect(path).toBe('integration-tests/maven/utils/src/test/java/action/surefire/report/calc/CalcUtilsTest.kt'); }); it('should find correct file when extension is included', async () => { const path = await resolvePath('CalcUtilsTest.kt'); - expect(path).toBe('tests/utils/src/test/java/action/surefire/report/calc/CalcUtilsTest.kt'); + expect(path).toBe('integration-tests/maven/utils/src/test/java/action/surefire/report/calc/CalcUtilsTest.kt'); }); }); describe('parseFile', () => { it('should parse CalcUtils results', async () => { const { count, skipped, annotations } = await parseFile( - 'tests/utils/target/surefire-reports/TEST-action.surefire.report.calc.CalcUtilsTest.xml' + 'integration-tests/maven/utils/target/surefire-reports/TEST-action.surefire.report.calc.CalcUtilsTest.xml' ); expect(count).toBe(2); expect(skipped).toBe(0); expect(annotations).toStrictEqual([ { - path: 'tests/utils/src/test/java/action/surefire/report/calc/CalcUtilsTest.kt', + path: 'integration-tests/maven/utils/src/test/java/action/surefire/report/calc/CalcUtilsTest.kt', start_line: 27, end_line: 27, start_column: 0, @@ -133,11 +133,10 @@ describe('parseFile', () => { title: 'CalcUtilsTest.test error handling', message: 'unexpected exception type thrown; expected: but was:', - raw_details: - 'java.lang.AssertionError: unexpected exception type thrown; expected: but was:\n\tat action.surefire.report.calc.CalcUtilsTest.test error handling(CalcUtilsTest.kt:27)\nCaused by: java.lang.IllegalArgumentException: Amount must have max 2 non-zero decimal places\n\tat action.surefire.report.calc.CalcUtilsTest.scale(CalcUtilsTest.kt:31)\n\tat action.surefire.report.calc.CalcUtilsTest.access$scale(CalcUtilsTest.kt:9)\n\tat action.surefire.report.calc.CalcUtilsTest.test error handling(CalcUtilsTest.kt:27)' + raw_details: expect.stringContaining('at action.surefire.report.calc.CalcUtilsTest.test error handling(CalcUtilsTest.kt:27)') }, { - path: 'tests/utils/src/test/java/action/surefire/report/calc/CalcUtilsTest.kt', + path: 'integration-tests/maven/utils/src/test/java/action/surefire/report/calc/CalcUtilsTest.kt', start_line: 15, end_line: 15, start_column: 0, @@ -145,19 +144,18 @@ describe('parseFile', () => { annotation_level: 'failure', title: 'CalcUtilsTest.test scale', message: 'Expected: <100.10>\n but: was <100.11>', - raw_details: - 'java.lang.AssertionError: \n\nExpected: <100.10>\n but: was <100.11>\n\tat action.surefire.report.calc.CalcUtilsTest.test scale(CalcUtilsTest.kt:15)' + raw_details: expect.stringContaining('at action.surefire.report.calc.CalcUtilsTest.test scale(CalcUtilsTest.kt:15)') } ]); }); it('should parse pytest results', async () => { - const { count, skipped, annotations } = await parseFile('python/report.xml'); + const { count, skipped, annotations } = await parseFile('integration-tests/python/report.xml'); expect(count).toBe(3); expect(skipped).toBe(0); expect(annotations).toStrictEqual([ { - path: 'python/test_sample.py', + path: 'integration-tests/python/test_sample.py', start_line: 10, end_line: 10, start_column: 0, @@ -166,10 +164,10 @@ describe('parseFile', () => { title: 'test_sample.test_which_fails', message: "AssertionError: assert 'test' == 'xyz'\n - xyz\n + test", raw_details: - "def test_which_fails():\n event = { 'attr': 'test'}\n> assert event['attr'] == 'xyz'\nE AssertionError: assert 'test' == 'xyz'\nE - xyz\nE + test\n\npython/test_sample.py:10: AssertionError" + "def test_which_fails():\n event = { 'attr': 'test'}\n> assert event['attr'] == 'xyz'\nE AssertionError: assert 'test' == 'xyz'\nE - xyz\nE + test\n\nintegration-tests/python/test_sample.py:10: AssertionError" }, { - path: 'python/test_sample.py', + path: 'integration-tests/python/test_sample.py', start_line: 14, end_line: 14, start_column: 0, @@ -178,19 +176,19 @@ describe('parseFile', () => { title: 'test_sample.test_with_error', message: "AttributeError: 'dict' object has no attribute 'attr'", raw_details: - "def test_with_error():\n event = { 'attr': 'test'}\n> assert event.attr == 'test'\nE AttributeError: 'dict' object has no attribute 'attr'\n\npython/test_sample.py:14: AttributeError" + "def test_with_error():\n event = { 'attr': 'test'}\n> assert event.attr == 'test'\nE AttributeError: 'dict' object has no attribute 'attr'\n\nintegration-tests/python/test_sample.py:14: AttributeError" } ]); }); it('should parse go results', async () => { - const {count, skipped, annotations} = await parseFile('go/report.xml', true); + const {count, skipped, annotations} = await parseFile('integration-tests/go/report.xml', true); expect(count).toBe(3); expect(skipped).toBe(0); // noinspection RegExpRepeatedSpace expect(annotations).toStrictEqual([ { - path: 'go/main_test.go', + path: 'integration-tests/go/main_test.go', start_line: 12, end_line: 12, start_column: 0, @@ -201,7 +199,7 @@ describe('parseFile', () => { raw_details: 'main_test.go:12: failing test' }, { - path: 'go/utils/string_test.go', + path: 'integration-tests/go/utils/string_test.go', start_line: 7, end_line: 7, start_column: 0, @@ -210,7 +208,7 @@ describe('parseFile', () => { title: 'string_test.go.TestFailing', message: 'Failed', raw_details: expect.stringMatching(new RegExp(`string_test.go:7: -\\s*Error Trace:.*action-surefire-report/go/utils/string_test.go:7 +\\s*Error Trace:.*action-surefire-report/integration-tests/go/utils/string_test.go:7 \\s*Error: \\s*Not equal: \\s*expected: "1" \\s*actual : "2" @@ -227,7 +225,7 @@ describe('parseFile', () => { }); it('should parse custom report with details as an array', async () => { const { count, skipped, annotations } = await parseFile( - 'custom_reports/TEST-pro.taskana.common.api.ListUtilTest-H2.xml' + 'integration-tests/custom_reports/TEST-pro.taskana.common.api.ListUtilTest-H2.xml' ); expect(count).toBe(1); @@ -282,7 +280,7 @@ describe('parseFile', () => { it('should parse custom report with flaky failures', async () => { const { count, skipped, annotations } = await parseFile( - 'custom_reports/TEST-test.MyIntegrationTestSuite.xml' + 'integration-tests/custom_reports/TEST-test.MyIntegrationTestSuite.xml' ); expect(count).toBe(5);