diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa94965..ecbf7ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,8 +21,8 @@ testing: script: - yarn install - ./node_modules/.bin/sequelize db:migrate - - yarn test --ci --collectCoverage=true - coverage: /All files\s*\|\s*([\d\.]+)/ + - yarn test --ci --collectCoverage=true --coverage + coverage: /All files[^|]*\|[^|]*\s+([\d\.]+)/ artifacts: paths: - junit.xml diff --git a/docker-compose.yml b/docker-compose.yml index 33e53ed..456f527 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: ./node_modules/.bin/sequelize db:migrate:undo:all && ./node_modules/.bin/sequelize db:migrate && ./node_modules/.bin/sequelize db:seed:all && - yarn test --ci --collectCoverage=true" + yarn test --ci --coverage" volumes: - ./:/home/node/app - /home/node/node_modules diff --git a/package.json b/package.json index ae6b0d0..45536d7 100644 --- a/package.json +++ b/package.json @@ -47,10 +47,11 @@ "setupFilesAfterEnv": [ "/test/utils/setup.js" ], + "collectCoverage": true, "coverageReporters": [ + "text", "html", - "cobertura", - "jest-junit" + "cobertura" ], "reporters": [ "default",