Skip to content

Commit

Permalink
a
Browse files Browse the repository at this point in the history
  • Loading branch information
EduardoGurgel committed Dec 3, 2023
1 parent a28edaa commit 1d4b852
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 26 deletions.
54 changes: 41 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,47 @@
name: Build
on:
push:
branches:
- master
pull_request:
types: [opened, synchronize, reopened]
push:
branches:
- develop
- release-sonar
- release-retroativo1
pull_request:
types: [opened, synchronize, reopened]
jobs:
sonarqube:
name: sonarqube
test-unit:
name: Test Unit & Scan
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Install dependencies
run: yarn
- name: Test and coverage
run: yarn jest --coverage
fetch-depth: 0

- name: Test Unit
id: test-unit
run: |
docker-compose -f docker-compose.test.yml up -V --force-recreate --build --abort-on-container-exit --exit-code-from gerocuidado-usuario-api-test
env:
TEST: unit

- name: SonarCloud Scan
uses: SonarSource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

test-e2e:
name: Test E2E
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Test E2E
id: test-e2e
run: |
docker-compose -f docker-compose.test.yml up -V --force-recreate --build --abort-on-container-exit --exit-code-from gerocuidado-usuario-api-test
env:
TEST: e2e
29 changes: 23 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,21 @@
"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 --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 --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",
"typeorm:revert": "npm run typeorm migration:revert -- -d src/ormconfig.ts",
"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": {
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
19 changes: 12 additions & 7 deletions sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
sonar.projectKey=fga-eps-mds_2023-2-GEROcuidado-APIUsuario
sonar.organization=fga-eps-mds-1

sonar.projectName=2023-2-GEROcuidado-APIUsuario

sonar.sources=./src
sonar.sources.exclusions=./e2e, /.vscode
sonar.host.url=https://sonarcloud.io

sonar.tests=./e2e
sonar.sourceEncoding=UTF-8
sonar.python.version=3

sonar.dynamicAnalysis=reuseReports
sonar.core.codeCoveragePlugin=cobertura
sonar.javascript.lcov.reportPaths=./coverage/lcov.info
sonar.testExecutionReportPaths=./coverage/sonar-report.xml
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

0 comments on commit 1d4b852

Please sign in to comment.