diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6ef22f962fa0fb83552bb25d78b4c347e56a5c8..3e2725688bca24a89b638733e2b32b0e3b2a9659 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,8 +4,8 @@ services: - docker:dind stages: - - sonar-analysis - test + - sonar-analysis - build - deploy @@ -40,8 +40,8 @@ test: stage: test image: node:14.15.4 script: - - npm - - npm run test:cov --reporters=jest-junit + - npm i + - npm run test:cov coverage: /All files[^|]*\|[^|]*\s+([\d\.]+)/ artifacts: when: always diff --git a/package-lock.json b/package-lock.json index 79f04ea9cdf353befa5208e0589b66e944947e34..dd0cf3051fb7cef516891070be8d1a06be625123 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8179,6 +8179,42 @@ } } }, + "jest-junit": { + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-12.0.0.tgz", + "integrity": "sha512-+8K35LlboWiPuCnXSyiid7rFdxNlpCWWM20WEYe6IZH6psfUWKZmSpSRQ5tk0C0cBeDsvsnIzcef5mYhyJsbug==", + "requires": { + "mkdirp": "^1.0.4", + "strip-ansi": "^5.2.0", + "uuid": "^3.3.3", + "xml": "^1.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + } + } + }, "jest-leak-detector": { "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz", @@ -14097,6 +14133,11 @@ "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", "dev": true }, + "xml": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz", + "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=" + }, "xml-name-validator": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", diff --git a/package.json b/package.json index 90ae0fdddaac8809f3130644fb8b17761d5db708..f1b2685c2e0be7567e49e862272642fa77b171ee 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "init-db": "node ./scripts/init-db.js", "test": "jest", "test:watch": "jest --watch", - "test:cov": "jest --config ./test/jest.json --coverage", + "test:cov": "jest --config ./test/jest.json --coverage --ci --reporters=default --reporters=jest-junit", "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand", "test:e2e": "jest --config ./test/jest-e2e.json" }, @@ -65,6 +65,7 @@ "eslint-config-prettier": "^6.15.0", "eslint-plugin-prettier": "^3.1.4", "jest": "^26.6.3", + "jest-junit": "^12.0.0", "nodemon": "^2.0.6", "prettier": "^2.1.2", "supertest": "^6.0.0", diff --git a/test/jest.json b/test/jest.json index b49b407c310bf8565635494da17373ed57019508..42ebab047a86e8e6ecaf5a0852056c3df9973cc1 100644 --- a/test/jest.json +++ b/test/jest.json @@ -5,5 +5,6 @@ "transform": { "^.+\\.(t|j)s$": "ts-jest" }, + "reporters": ["default", "jest-junit"], "collectCoverage": true }