diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 804fd0d..0d427cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,9 @@ on: push: branches: - main + - develop - sonar/teste + - release-sonar pull_request: types: [opened, synchronize, reopened] jobs: @@ -52,4 +54,4 @@ jobs: run: | docker-compose -f docker-compose.test.yml up -V --force-recreate --build --abort-on-container-exit --exit-code-from gerocuidado-forum-api-test env: - TEST: e2e + TEST: e2e \ No newline at end of file diff --git a/package.json b/package.json index 291846d..714bb1d 100644 --- a/package.json +++ b/package.json @@ -11,16 +11,16 @@ "format": "prettier --write \"src/**/*.ts\" \"e2e/**/*.ts\"", "start": "nest start --preserveWatchOutput", "start:dev": "nest start --watch --preserveWatchOutput", - "start:debug": "nest start --debug 0.0.0.0:7002 --watch --preserveWatchOutput", + "start:debug": "nest start --debug 0.0.0.0:7001 --watch --preserveWatchOutput", "start:prod": "node dist/main", "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix", - "test": "jest --passWithNoTests --no-cache --runInBand", "test:all": "CI=true npm run test -- --coverage", + "test": "jest --passWithNoTests --no-cache --runInBand --detectOpenHandles --coverage --colors", "test:watch": "jest --watchAll", - "test:cov": "jest --forceExit --detectOpenHandles --runInBand --coverage --colors", + "test:cov": "jest --runInBand --coverage --colors", "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand", "test:e2e": "jest --forceExit --detectOpenHandles --colors --config ./e2e/jest-e2e.json", - "test:e2e:cov": "jest --forceExit --detectOpenHandles --runInBand --colors --coverage --config ./e2e/jest-e2e.json", + "test:e2e:cov": "jest --runInBand --forceExit --detectOpenHandles --colors --coverage --config ./e2e/jest-e2e.json", "test:e2e:watch": "jest --detectOpenHandles --config ./e2e/jest-e2e.json --watchAll", "typeorm": "node --require ts-node/register ./node_modules/typeorm/cli.js", "typeorm:create": "npm run typeorm migration:create", @@ -28,6 +28,7 @@ "typeorm:migrate": "npm run typeorm migration:generate -- -d src/ormconfig.ts", "typeorm:run": "./node_modules/.bin/typeorm-ts-node-commonjs migration:run -d src/ormconfig.ts", "schema:drop": "npm run typeorm schema:drop", + "sonar": "sonar-scanner", "schema:sync": "npm run typeorm schema:sync" }, "dependencies": { @@ -55,6 +56,7 @@ "dotenv": "10.0.0", "express-actuator": "1.8.2", "helmet": "6.0.0", + "jest-sonar-reporter": "^2.0.0", "passport": "0.5.2", "passport-jwt": "4.0.0", "passport-local": "1.0.0", @@ -89,11 +91,9 @@ "eslint-config-prettier": "8.4.0", "eslint-plugin-prettier": "4.0.0", "graphql": "16.6.0", - "jest": "^29.7.0", - "jest-junit": "^16.0.0", + "jest": "^29.2.1", + "jest-mock-extended": "^3.0.5", "jest-sonar": "^0.2.16", - "jest-sonar-reporter": "^2.0.0", - "jest-mock-extended": "^3.0.5", "prettier": "2.5.1", "sonarqube-scanner": "2.8.1", "source-map-support": "0.5.21", @@ -109,7 +109,7 @@ "esbenp.prettier-vscode", "rbbit.typescript-hero" ], - "jest": { + "jest": { "moduleFileExtensions": [ "js", "json", @@ -120,9 +120,21 @@ "transform": { "^.+\\.(t|j)s$": "ts-jest" }, + "collectCoverage": true, "collectCoverageFrom": [ "**/*.(t|j)s" ], + "reporters": [ + "default", + [ + "jest-sonar", + { + "outputDirectory": "reports", + "outputName": "sonar-report.xml", + "relativeRootDir": "." + } + ] + ], "coverageDirectory": "../coverage/unit", "coveragePathIgnorePatterns": [ "src/migration", @@ -136,18 +148,6 @@ ".factory.ts$", "src/migration" ], - "testEnvironment": "node", - "reporters": [ - "default", - [ - "jest-sonar", - { - "outputDirectory": "reports", - "outputName": "sonar-report.xml", - "sonarQubeVersion": "LATEST" - } - ] - ] + "testEnvironment": "node" } } - diff --git a/sonar-project.properties b/sonar-project.properties index 2789a68..8646efe 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -3,33 +3,18 @@ sonar.organization=fga-eps-mds-1 sonar.projectName=2023-2-GEROcuidado-APIForum sonar.host.url=https://sonarcloud.io -sonar.language=ts sonar.sourceEncoding=UTF-8 - -sonar.typescript.tsconfigPath=./tsconfig.json +sonar.python.version=3 sonar.sources=src +sonar.exclusions=**/main.ts,**/ormconfig.ts,**/*.module.ts,src/migration/*.ts,src/migrations.ts -sonar.inclusions=** - - -sonar.exclusions=node_modules/**,**/main.ts,**/ormconfig.ts,**/*.module.ts,src/migration/*.ts,src/migrations.ts +sonar.javascript.lcov.reportPaths=coverage/unit/lcov.info -sonar.javascript.lcov.reportPaths=./coverage/unit/lcov.info -sonar.dynamicAnalysis=reuseReports -sonar.core.codeCoveragePlugin=cobertura - -sonar.junit.reportPaths=junit.xml sonar.tests=src - -sonar.test.inclusions=**/*.spec.ts,**/*.spec.tsx,**/*.spec.js,**/*.test.ts,**/*.test.tsx - +sonar.test.inclusions=**/*.spec.ts sonar.testExecutionReportPaths=reports/sonar-report.xml -sonar.typescript.tslint.reportPaths=reports/tslint-report.json - - -