From 3056eae75525d9a925c04b55aca787fae4b2719c Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 7 Mar 2023 16:56:04 +0100 Subject: [PATCH 1/5] add caverage thresholds to jest configs --- admin/jest.config.js | 5 +++++ backend/jest.config.js | 6 +++++- dht-node/jest.config.js | 6 +++++- federation/jest.config.js | 6 +++++- frontend/jest.config.js | 6 +++++- 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/admin/jest.config.js b/admin/jest.config.js index 9233dd2e7..302b1ccc0 100644 --- a/admin/jest.config.js +++ b/admin/jest.config.js @@ -6,6 +6,11 @@ module.exports = { '!src/assets/**', '!**/?(*.)+(spec|test).js?(x)', ], + coverageThreshold: { + global: { + lines: 97, + }, + }, moduleFileExtensions: [ 'js', // 'jsx', diff --git a/backend/jest.config.js b/backend/jest.config.js index d6683d292..bc4bde3c8 100644 --- a/backend/jest.config.js +++ b/backend/jest.config.js @@ -2,8 +2,12 @@ module.exports = { verbose: true, preset: 'ts-jest', - collectCoverage: true, collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**', '!src/seeds/**', '!build/**'], + coverageThreshold: { + global: { + lines: 80, + }, + }, setupFiles: ['/test/testSetup.ts'], setupFilesAfterEnv: ['/test/extensions.ts'], modulePathIgnorePatterns: ['/build/'], diff --git a/dht-node/jest.config.js b/dht-node/jest.config.js index 10c87bddb..f502c1865 100644 --- a/dht-node/jest.config.js +++ b/dht-node/jest.config.js @@ -2,8 +2,12 @@ module.exports = { verbose: true, preset: 'ts-jest', - collectCoverage: true, collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**', '!src/seeds/**', '!build/**'], + coverageThreshold: { + global: { + lines: 80, + }, + }, setupFiles: ['/test/testSetup.ts'], setupFilesAfterEnv: [], modulePathIgnorePatterns: ['/build/'], diff --git a/federation/jest.config.js b/federation/jest.config.js index 742f35fbb..65fd8d151 100644 --- a/federation/jest.config.js +++ b/federation/jest.config.js @@ -2,13 +2,17 @@ module.exports = { verbose: true, preset: 'ts-jest', - collectCoverage: true, collectCoverageFrom: [ 'src/**/*.ts', '!**/node_modules/**', '!src/seeds/**', '!build/**', ], + coverageThreshold: { + global: { + lines: 72, + }, + }, setupFiles: ['/test/testSetup.ts'], setupFilesAfterEnv: [], modulePathIgnorePatterns: ['/build/'], diff --git a/frontend/jest.config.js b/frontend/jest.config.js index a32330f3b..257729b91 100644 --- a/frontend/jest.config.js +++ b/frontend/jest.config.js @@ -1,13 +1,17 @@ module.exports = { verbose: true, collectCoverageFrom: ['src/**/*.{js,vue}', '!**/node_modules/**', '!**/?(*.)+(spec|test).js?(x)'], + coverageThreshold: { + global: { + lines: 95, + }, + }, moduleFileExtensions: [ 'js', // 'jsx', 'json', 'vue', ], - // coverageReporters: ['lcov', 'text'], moduleNameMapper: { '\\.(css|less)$': 'identity-obj-proxy', '\\.(scss)$': '/src/assets/mocks/styleMock.js', From 17e7d3d08e9a638fdebeb9be65eb200498532b73 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 7 Mar 2023 17:01:01 +0100 Subject: [PATCH 2/5] remove separate coverage check from github test wirkflows --- .github/workflows/test.yml | 45 ++------------------------- .github/workflows/test_dht-node.yml | 14 +-------- .github/workflows/test_federation.yml | 11 ------- 3 files changed, 4 insertions(+), 66 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5eadf1e94..26f70a49b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -335,20 +335,7 @@ jobs: # UNIT TESTS FRONTEND #################################################### ########################################################################## - name: Frontend | Unit tests - run: | - cd frontend && yarn && yarn run test - cp -r ./coverage ../ - ########################################################################## - # COVERAGE CHECK FRONTEND ################################################ - ########################################################################## - - name: frontend | Coverage check - uses: webcraftmedia/coverage-check-action@master - with: - report_name: Coverage Frontend - type: lcov - result_path: ./frontend/coverage/lcov.info - min_coverage: 95 - token: ${{ github.token }} + run: cd frontend && yarn && yarn run test ############################################################################## # JOB: UNIT TEST ADMIN INTERFACE ############################################# @@ -366,20 +353,7 @@ jobs: # UNIT TESTS ADMIN INTERFACE ############################################# ########################################################################## - name: Admin Interface | Unit tests - run: | - cd admin && yarn && yarn run test - cp -r ./coverage ../ - ########################################################################## - # COVERAGE CHECK ADMIN INTERFACE ######################################### - ########################################################################## - - name: Admin Interface | Coverage check - uses: webcraftmedia/coverage-check-action@master - with: - report_name: Coverage Admin Interface - type: lcov - result_path: ./admin/coverage/lcov.info - min_coverage: 97 - token: ${{ github.token }} + run: cd admin && yarn && yarn run test ############################################################################## # JOB: UNIT TEST BACKEND #################################################### @@ -415,20 +389,7 @@ jobs: - name: backend | docker-compose database run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database - name: backend Unit tests | test - run: | - cd database && yarn && yarn build && cd ../backend && yarn && yarn test - cp -r ./coverage ../ - ########################################################################## - # COVERAGE CHECK BACKEND ################################################# - ########################################################################## - - name: backend | Coverage check - uses: webcraftmedia/coverage-check-action@master - with: - report_name: Coverage Backend - type: lcov - result_path: ./backend/coverage/lcov.info - min_coverage: 80 - token: ${{ github.token }} + run: cd database && yarn && yarn build && cd ../backend && yarn && yarn test ########################################################################## # DATABASE MIGRATION TEST UP + RESET ##################################### diff --git a/.github/workflows/test_dht-node.yml b/.github/workflows/test_dht-node.yml index 4ac475351..0b7580a17 100644 --- a/.github/workflows/test_dht-node.yml +++ b/.github/workflows/test_dht-node.yml @@ -83,16 +83,4 @@ jobs: #- name: Unit tests # run: cd database && yarn && yarn build && cd ../dht-node && yarn && yarn test - name: Unit tests - run: | - docker run --env NODE_ENV=test --env DB_HOST=mariadb --network gradido_internal-net -v ~/coverage:/app/coverage --rm gradido/dht-node:test yarn run test - cp -r ~/coverage ./coverage - - - name: Coverage check - uses: webcraftmedia/coverage-check-action@master - with: - report_name: Coverage DHT Node - type: lcov - #result_path: ./dht-node/coverage/lcov.info - result_path: ./coverage/lcov.info - min_coverage: 79 - token: ${{ github.token }} + run: docker run --env NODE_ENV=test --env DB_HOST=mariadb --network gradido_internal-net -v ~/coverage:/app/coverage --rm gradido/dht-node:test yarn run test diff --git a/.github/workflows/test_federation.yml b/.github/workflows/test_federation.yml index ab943eedd..8fe6d2aa1 100644 --- a/.github/workflows/test_federation.yml +++ b/.github/workflows/test_federation.yml @@ -85,14 +85,3 @@ jobs: - name: Unit tests run: | docker run --env NODE_ENV=test --env DB_HOST=mariadb --network gradido_internal-net -v ~/coverage:/app/coverage --rm gradido/federation:test yarn run test - cp -r ~/coverage ./coverage - - - name: Coverage check - uses: webcraftmedia/coverage-check-action@master - with: - report_name: Coverage Federation - type: lcov - #result_path: ./federation/coverage/lcov.info - result_path: ./coverage/lcov.info - min_coverage: 72 - token: ${{ github.token }} From 2c809fec6ea2b0dc44e30808334878dc3f3d657e Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 7 Mar 2023 17:26:45 +0100 Subject: [PATCH 3/5] remove coverage volume bindings from dht and federation test workflows --- .github/workflows/test_dht-node.yml | 2 +- .github/workflows/test_federation.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_dht-node.yml b/.github/workflows/test_dht-node.yml index 0b7580a17..fbda230ee 100644 --- a/.github/workflows/test_dht-node.yml +++ b/.github/workflows/test_dht-node.yml @@ -83,4 +83,4 @@ jobs: #- name: Unit tests # run: cd database && yarn && yarn build && cd ../dht-node && yarn && yarn test - name: Unit tests - run: docker run --env NODE_ENV=test --env DB_HOST=mariadb --network gradido_internal-net -v ~/coverage:/app/coverage --rm gradido/dht-node:test yarn run test + run: docker run --env NODE_ENV=test --env DB_HOST=mariadb --network gradido_internal-net --rm gradido/dht-node:test yarn run test diff --git a/.github/workflows/test_federation.yml b/.github/workflows/test_federation.yml index 8fe6d2aa1..7d92f1f84 100644 --- a/.github/workflows/test_federation.yml +++ b/.github/workflows/test_federation.yml @@ -84,4 +84,4 @@ jobs: # run: cd database && yarn && yarn build && cd ../dht-node && yarn && yarn test - name: Unit tests run: | - docker run --env NODE_ENV=test --env DB_HOST=mariadb --network gradido_internal-net -v ~/coverage:/app/coverage --rm gradido/federation:test yarn run test + docker run --env NODE_ENV=test --env DB_HOST=mariadb --network gradido_internal-net --rm gradido/federation:test yarn run test From a38d19076e68b47984e19b4979e992a1aa37d569 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 7 Mar 2023 20:38:27 +0100 Subject: [PATCH 4/5] keep collectCoverage parameter in jest condig files --- admin/jest.config.js | 1 + backend/jest.config.js | 1 + dht-node/jest.config.js | 1 + federation/jest.config.js | 1 + frontend/jest.config.js | 1 + 5 files changed, 5 insertions(+) diff --git a/admin/jest.config.js b/admin/jest.config.js index 302b1ccc0..b6ec1dc80 100644 --- a/admin/jest.config.js +++ b/admin/jest.config.js @@ -1,5 +1,6 @@ module.exports = { verbose: true, + collectCoverage: true, collectCoverageFrom: [ 'src/**/*.{js,vue}', '!**/node_modules/**', diff --git a/backend/jest.config.js b/backend/jest.config.js index bc4bde3c8..cd63f11d8 100644 --- a/backend/jest.config.js +++ b/backend/jest.config.js @@ -2,6 +2,7 @@ module.exports = { verbose: true, preset: 'ts-jest', + collectCoverage: true, collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**', '!src/seeds/**', '!build/**'], coverageThreshold: { global: { diff --git a/dht-node/jest.config.js b/dht-node/jest.config.js index f502c1865..fa00ed868 100644 --- a/dht-node/jest.config.js +++ b/dht-node/jest.config.js @@ -2,6 +2,7 @@ module.exports = { verbose: true, preset: 'ts-jest', + collectCoverage: true, collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**', '!src/seeds/**', '!build/**'], coverageThreshold: { global: { diff --git a/federation/jest.config.js b/federation/jest.config.js index 65fd8d151..dff5ab169 100644 --- a/federation/jest.config.js +++ b/federation/jest.config.js @@ -2,6 +2,7 @@ module.exports = { verbose: true, preset: 'ts-jest', + collectCoverage: true, collectCoverageFrom: [ 'src/**/*.ts', '!**/node_modules/**', diff --git a/frontend/jest.config.js b/frontend/jest.config.js index 257729b91..023fd64fd 100644 --- a/frontend/jest.config.js +++ b/frontend/jest.config.js @@ -1,5 +1,6 @@ module.exports = { verbose: true, + collectCoverage: true, collectCoverageFrom: ['src/**/*.{js,vue}', '!**/node_modules/**', '!**/?(*.)+(spec|test).js?(x)'], coverageThreshold: { global: { From c2de11e399aaae66824c26c9b6cee16e1a6387b8 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 7 Mar 2023 20:41:04 +0100 Subject: [PATCH 5/5] remove parameter --coverage from packages.json files --- admin/package.json | 2 +- backend/package.json | 2 +- dht-node/package.json | 2 +- federation/package.json | 2 +- frontend/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/package.json b/admin/package.json index 2b9f3032f..1393d2a92 100644 --- a/admin/package.json +++ b/admin/package.json @@ -14,7 +14,7 @@ "analyse-bundle": "yarn build && webpack-bundle-analyzer dist/webpack.stats.json", "lint": "eslint --max-warnings=0 --ext .js,.vue,.json .", "stylelint": "stylelint --max-warnings=0 '**/*.{scss,vue}'", - "test": "cross-env TZ=UTC jest --coverage", + "test": "cross-env TZ=UTC jest", "locales": "scripts/sort.sh" }, "dependencies": { diff --git a/backend/package.json b/backend/package.json index 08a9bf54d..337fded3a 100644 --- a/backend/package.json +++ b/backend/package.json @@ -13,7 +13,7 @@ "start": "cross-env TZ=UTC TS_NODE_BASEURL=./build node -r tsconfig-paths/register build/src/index.js", "dev": "cross-env TZ=UTC nodemon -w src --ext ts --exec ts-node -r tsconfig-paths/register src/index.ts", "lint": "eslint --max-warnings=0 --ext .js,.ts .", - "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles", + "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --forceExit --detectOpenHandles", "seed": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/index.ts", "klicktipp": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/util/klicktipp.ts", "locales": "scripts/sort.sh" diff --git a/dht-node/package.json b/dht-node/package.json index ac9b88968..15426e606 100644 --- a/dht-node/package.json +++ b/dht-node/package.json @@ -13,7 +13,7 @@ "start": "cross-env TZ=UTC TS_NODE_BASEURL=./build node -r tsconfig-paths/register build/src/index.js", "dev": "cross-env TZ=UTC nodemon -w src --ext ts --exec ts-node -r dotenv/config -r tsconfig-paths/register src/index.ts", "lint": "eslint --max-warnings=0 --ext .js,.ts .", - "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles" + "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --forceExit --detectOpenHandles" }, "dependencies": { "@hyperswarm/dht": "^6.4.4", diff --git a/federation/package.json b/federation/package.json index 8a0153cc5..e7e067435 100644 --- a/federation/package.json +++ b/federation/package.json @@ -11,7 +11,7 @@ "build": "tsc --build", "clean": "tsc --build --clean", "start": "cross-env TZ=UTC TS_NODE_BASEURL=./build node -r tsconfig-paths/register build/src/index.js", - "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles", + "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --forceExit --detectOpenHandles", "dev": "cross-env TZ=UTC nodemon -w src --ext ts --exec ts-node -r dotenv/config -r tsconfig-paths/register src/index.ts", "lint": "eslint --max-warnings=0 --ext .js,.ts ." }, diff --git a/frontend/package.json b/frontend/package.json index 180959bc5..f8619dc19 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -10,7 +10,7 @@ "analyse-bundle": "yarn build && webpack-bundle-analyzer dist/webpack.stats.json", "lint": "eslint --max-warnings=0 --ext .js,.vue,.json .", "stylelint": "stylelint --max-warnings=0 '**/*.{scss,vue}'", - "test": "cross-env TZ=UTC jest --coverage", + "test": "cross-env TZ=UTC jest", "locales": "scripts/sort.sh" }, "dependencies": {