From a79947e37acda23128b654938fd873a8668db863 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 13 Apr 2021 23:59:14 +0200 Subject: [PATCH 1/9] frontend coverage test & report --- .github/workflows/test.yml | 23 ++++++++++++++++++++++- webapp/package.json | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1bca06b08..5760145d5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -238,4 +238,25 @@ jobs: - name: backend | docker-compose run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp - name: webapp | Unit tests - run: docker-compose exec -T webapp yarn test \ No newline at end of file + run: | + docker-compose -v ~/coverage:/app/coverage exec -T webapp yarn test + cp -r ~/coverage ./coverage + ########################################################################## + # COVERAGE REPORT FRONTEND ################################################ + ########################################################################## + # TODO: Maybe remove this later on to avoid spam? + - name: frontend | Coverage report + uses: romeovs/lcov-reporter-action@v0.2.21 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + lcov-file: ./coverage/lcov.info + ########################################################################## + # COVERAGE CHECK FRONTEND ################################################ + ########################################################################## + - name: frontend | Coverage check + uses: devmasx/coverage-check-action@v1.2.0 + with: + type: lcov + result_path: ./coverage/lcov.info + min_coverage: 45 + token: ${{ github.token }} \ No newline at end of file diff --git a/webapp/package.json b/webapp/package.json index 57967b32a..84cdcbc7c 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -17,7 +17,7 @@ "lint": "eslint --ext .js,.vue .", "locales": "../scripts/translations/missing-keys.sh && ../scripts/translations/sort.sh", "precommit": "yarn lint", - "test": "cross-env NODE_ENV=test jest", + "test": "cross-env NODE_ENV=test jest --coverage", "test:unit:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --no-cache --runInBand" }, "jest": { From 138143761044a8b44bc28270631503ae44a3f767 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 14 Apr 2021 00:21:38 +0200 Subject: [PATCH 2/9] bind coverage volume in docker-compose.test.yml file --- .github/workflows/test.yml | 6 ++---- docker-compose.test.yml | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5760145d5..6f6323be6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -236,11 +236,9 @@ jobs: - name: backend | copy env files backend run: cp backend/.env.template backend/.env - name: backend | docker-compose - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up -v ~/coverage:/app/coverage --detach --no-deps webapp - name: webapp | Unit tests - run: | - docker-compose -v ~/coverage:/app/coverage exec -T webapp yarn test - cp -r ~/coverage ./coverage + run: docker-compose exec -T webapp yarn test ########################################################################## # COVERAGE REPORT FRONTEND ################################################ ########################################################################## diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 2d382d606..131942d4f 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -10,6 +10,8 @@ services: target: test environment: - NODE_ENV="test" + volumes: + - ./coverage:/app/coverage ######################################################## # BACKEND ############################################## From 77800346f26caa48ddb13de5fdcec5710b07f8d8 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 14 Apr 2021 00:29:47 +0200 Subject: [PATCH 3/9] removed volume override from command --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6f6323be6..111a48c00 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -236,7 +236,7 @@ jobs: - name: backend | copy env files backend run: cp backend/.env.template backend/.env - name: backend | docker-compose - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up -v ~/coverage:/app/coverage --detach --no-deps webapp + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp - name: webapp | Unit tests run: docker-compose exec -T webapp yarn test ########################################################################## From 4b2413aa7334471e1e4723e5eff5bc2a1c20a303 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 14 Apr 2021 00:42:30 +0200 Subject: [PATCH 4/9] to many characters --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 111a48c00..bfecb3696 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -244,7 +244,7 @@ jobs: ########################################################################## # TODO: Maybe remove this later on to avoid spam? - name: frontend | Coverage report - uses: romeovs/lcov-reporter-action@v0.2.21 + uses: mszlgr/lcov-reporter-action@v0.2.23 with: github-token: ${{ secrets.GITHUB_TOKEN }} lcov-file: ./coverage/lcov.info From 17d79f640350e147c06629bb9cd9a4bd02e78bcd Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 14 Apr 2021 01:00:22 +0200 Subject: [PATCH 5/9] no report to PR (bug) minimum 52% coverage --- .github/workflows/test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bfecb3696..b846c7edc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -243,11 +243,11 @@ jobs: # COVERAGE REPORT FRONTEND ################################################ ########################################################################## # TODO: Maybe remove this later on to avoid spam? - - name: frontend | Coverage report - uses: mszlgr/lcov-reporter-action@v0.2.23 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - lcov-file: ./coverage/lcov.info + #- name: frontend | Coverage report + # uses: romeovs/lcov-reporter-action@v0.2.21 + # with: + # github-token: ${{ secrets.GITHUB_TOKEN }} + # lcov-file: ./coverage/lcov.info ########################################################################## # COVERAGE CHECK FRONTEND ################################################ ########################################################################## @@ -256,5 +256,5 @@ jobs: with: type: lcov result_path: ./coverage/lcov.info - min_coverage: 45 + min_coverage: 52 token: ${{ github.token }} \ No newline at end of file From f6b6e21a8d95f433931b1971156956b992fc630a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 14 Apr 2021 01:27:27 +0200 Subject: [PATCH 6/9] also have backend coverage some typos --- .github/workflows/test.yml | 14 ++++++++++++-- backend/package.json | 2 +- docker-compose.test.yml | 2 ++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b846c7edc..6937fa0ae 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -204,6 +204,16 @@ jobs: run: docker-compose exec -T backend yarn db:migrate init - name: backend | Unit test run: docker-compose exec -T backend yarn test + ########################################################################## + # COVERAGE CHECK BACKEND ################################################# + ########################################################################## + - name: backend | Coverage check + uses: devmasx/coverage-check-action@v1.2.0 + with: + type: lcov + result_path: ./coverage/lcov.info + min_coverage: 52 + token: ${{ github.token }} ############################################################################## # JOB: UNIT TEST WEBAPP ###################################################### @@ -249,9 +259,9 @@ jobs: # github-token: ${{ secrets.GITHUB_TOKEN }} # lcov-file: ./coverage/lcov.info ########################################################################## - # COVERAGE CHECK FRONTEND ################################################ + # COVERAGE CHECK WEBAPP ################################################## ########################################################################## - - name: frontend | Coverage check + - name: webapp | Coverage check uses: devmasx/coverage-check-action@v1.2.0 with: type: lcov diff --git a/backend/package.json b/backend/package.json index a5c5a1ddc..8148593c4 100644 --- a/backend/package.json +++ b/backend/package.json @@ -15,7 +15,7 @@ "dev": "nodemon --exec babel-node src/ -e js,gql", "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/ -e js,gql", "lint": "eslint src --config .eslintrc.js", - "test": "cross-env NODE_ENV=test jest --forceExit --detectOpenHandles --runInBand", + "test": "cross-env NODE_ENV=test jest --forceExit --detectOpenHandles --runInBand --coverage", "db:clean": "babel-node src/db/clean.js", "db:reset": "yarn run db:clean", "db:seed": "babel-node src/db/seed.js", diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 131942d4f..be130881e 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -22,6 +22,8 @@ services: target: test environment: - NODE_ENV="test" + volumes: + - ./coverage:/app/coverage ######################################################## # NEO4J ################################################ From f4e6b474be96b3e7e7ecd512281a143bccc6e13f Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 14 Apr 2021 01:40:35 +0200 Subject: [PATCH 7/9] 58% minimum coverage for the backend --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6937fa0ae..9a374d5f0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -212,7 +212,7 @@ jobs: with: type: lcov result_path: ./coverage/lcov.info - min_coverage: 52 + min_coverage: 58 token: ${{ github.token }} ############################################################################## From d92caaa26f7468af82255412422963c2594865dd Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 14 Apr 2021 11:50:53 +0200 Subject: [PATCH 8/9] try my fork for coverage --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9a374d5f0..c256496c0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -208,8 +208,9 @@ jobs: # COVERAGE CHECK BACKEND ################################################# ########################################################################## - name: backend | Coverage check - uses: devmasx/coverage-check-action@v1.2.0 + uses: webcraftmedia/coverage-check-action@master with: + name: Coverage Backend type: lcov result_path: ./coverage/lcov.info min_coverage: 58 @@ -262,8 +263,9 @@ jobs: # COVERAGE CHECK WEBAPP ################################################## ########################################################################## - name: webapp | Coverage check - uses: devmasx/coverage-check-action@v1.2.0 + uses: webcraftmedia/coverage-check-action@master with: + name: Coverage Webapp type: lcov result_path: ./coverage/lcov.info min_coverage: 52 From bf4214775f930372bb24432a266a13657083bf83 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 14 Apr 2021 12:11:27 +0200 Subject: [PATCH 9/9] adjusted workflow parameter name --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c256496c0..15744bfe3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -210,7 +210,7 @@ jobs: - name: backend | Coverage check uses: webcraftmedia/coverage-check-action@master with: - name: Coverage Backend + report_name: Coverage Backend type: lcov result_path: ./coverage/lcov.info min_coverage: 58 @@ -265,7 +265,7 @@ jobs: - name: webapp | Coverage check uses: webcraftmedia/coverage-check-action@master with: - name: Coverage Webapp + report_name: Coverage Webapp type: lcov result_path: ./coverage/lcov.info min_coverage: 52