Merge pull request #161 from Arquisoft/develop

Fixing sonar coverage
Arquisoft · Apr 30, 2023 · a85527b · a85527b
2 parents 98ef0db + 8dca016
commit a85527b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 37 deletions.
diff --git a/.github/workflows/lomap_es2c.yml b/.github/workflows/lomap_es2c.yml
@@ -15,6 +15,8 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3
+              with:
+                fetch-depth: 0
             - uses: actions/setup-node@v3
               with:
                 node-version: 18
@@ -23,7 +25,7 @@ jobs:
             - run: npm --prefix webapp test --coverage --watchAll
             - run: npm --prefix restapi test --coverage --watchAll
             - name: Analyze with SonarCloud
-              uses: sonarsource/sonarcloud-github-action@master
+              uses: sonarsource/sonarcloud-github-action@v1.8
               env:
                 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                 SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

diff --git a/restapi/jest.config.ts b/restapi/jest.config.ts
@@ -0,0 +1,15 @@
+export default {
+    rootDir: './',
+    transform: {
+        "^.+\\.tsx?$": "ts-jest"
+    },
+    collectCoverage: true,
+    collectCoverageFrom: ["src/controllers/*.{ts,tsx}",
+        "src/facade.ts",
+        "!server.ts",
+        "api.ts",
+        "src/persistence/*.{ts,tsx}",
+        "src/persistence/DefaultMongo.ts",
+        "src/entities/*.{ts,tsx}",
+    ]
+}
diff --git a/restapi/package.json b/restapi/package.json
@@ -3,21 +3,8 @@
     "version": "1.0.0",
     "scripts": {
         "start": "ts-node-dev ./server.ts",
-        "test": "cd tests && jest --coverage"
+        "test": "jest --runInBand --coverage"
     },
-
-    "jest": {
-        "collectCoverage": true,
-        "coverageReporters": [
-            "json",
-            "lcov",
-            "text",
-            "clover"
-        ],
-        "coverageDirectory": "coverage"
-    }
-
-    ,
     "keywords": [],
     "author": "",
     "license": "ISC",

diff --git a/restapi/tests/jest.config.ts b/restapi/tests/jest.config.ts