From 773abd5de8d4ed4b039a38c5413461bbc00140a2 Mon Sep 17 00:00:00 2001 From: art1505 Date: Mon, 4 Dec 2023 00:58:40 -0300 Subject: [PATCH] =?UTF-8?q?Adiciona=20configura=C3=A7=C3=A3o=20retroativo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 30 ++++++++++++++---------------- package.json | 31 ++++++++++++++++++++++++------- sonar-project.properties | 18 ++++++++++-------- 3 files changed, 48 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0afd1eb..0d427cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,8 +3,11 @@ on: push: branches: - main + - develop + - sonar/teste + - release-sonar pull_request: - types: [opened, synchronize, reopened] + types: [opened, synchronize, reopened] jobs: test-unit: name: Test Unit & Scan @@ -28,6 +31,15 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + - name: Sincroniza cobertura de testes com o Codecov + uses: codecov/codecov-action@v3 + with: + token: ${{ secrets.CODECOV_TOKEN }} + fail_ci_if_error: true + flags: jest + name: 2023-2-GEROcuidado-APIForum + verbose: true + test-e2e: name: Test E2E runs-on: ubuntu-latest @@ -42,18 +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 - - sonarcloud: - name: SonarCloud - needs: ['test-unit', 'test-e2e'] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: SonarCloud Scan - uses: SonarSource/sonarcloud-github-action@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + TEST: e2e \ No newline at end of file diff --git a/package.json b/package.json index 0c1350c..97d25f1 100644 --- a/package.json +++ b/package.json @@ -11,15 +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 --no-cache --colors --detectOpenHandles", + "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", @@ -27,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": { @@ -54,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", @@ -76,7 +79,7 @@ "@types/cors": "2.8.12", "@types/express": "4.17.13", "@types/express-actuator": "1.8.0", - "@types/jest": "27.0.2", + "@types/jest": "^29.5.6", "@types/node": "18.17.0", "@types/passport-jwt": "3.0.6", "@types/passport-local": "1.0.34", @@ -88,12 +91,14 @@ "eslint-config-prettier": "8.4.0", "eslint-plugin-prettier": "4.0.0", "graphql": "16.6.0", - "jest": "27.5.1", + "jest": "^29.2.1", + "jest-mock-extended": "^3.0.5", + "jest-sonar": "^0.2.16", "prettier": "2.5.1", "sonarqube-scanner": "2.8.1", "source-map-support": "0.5.21", "supertest": "6.2.2", - "ts-jest": "27.1.3", + "ts-jest": "^29.1.1", "ts-loader": "9.2.7", "ts-node": "10.6.0", "tsconfig-paths": "3.12.0", @@ -115,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", diff --git a/sonar-project.properties b/sonar-project.properties index 67ac018..8646efe 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,18 +1,20 @@ sonar.projectKey=fga-eps-mds_2023-2-GEROcuidado-APIForum 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.python.version=3 -sonar.sources=./src -sonar.inclusions=** -sonar.exclusions=**/main.ts,**/ormconfig.ts,**/*.module.ts,src/migration/*.ts,src/migrations.ts,**/*.spec.ts +sonar.sources=src +sonar.exclusions=**/main.ts,**/ormconfig.ts,**/*.module.ts,src/migration/*.ts,src/migrations.ts + +sonar.javascript.lcov.reportPaths=coverage/unit/lcov.info + +sonar.tests=src +sonar.test.inclusions=**/*.spec.ts +sonar.testExecutionReportPaths=reports/sonar-report.xml + + -sonar.javascript.lcov.reportPaths=./coverage/unit/lcov.info -sonar.dynamicAnalysis=reuseReports -sonar.core.codeCoveragePlugin=cobertura