Merge pull request #235 from WodenWang820118/guanxinwang0118/tc-175-a…

…op-logging

fix: add test coverage to SonarCloud

.husky/pre-commit

@@ -1,2 +1,2 @@
-pnpm run test:e2e
-pnpm run test-back:unit
+pnpm run test:cov
+node merge-coverage.cjs

README.md

@@ -1,5 +1,7 @@
 # GTM Container Review and Analytics Validation Tool
 
+// TODO: combine lcov.info to SonarCloud
+
 ## Table of Contents
 
 - [Overview](#overview)

apps/nest-backend/project.json

@@ -45,7 +45,7 @@
       "executor": "@nx/vite:test",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/nest-backend/jest.config.ts",
+        "jestConfig": "apps/nest-backend/vitest.config.ts",
         "passWithNoTests": true
       },
       "configurations": {

apps/nest-backend/src/waiter/configuration/waiter-configuration.controller.ts

@@ -16,6 +16,7 @@ export class WaiterConfigurationController {
   constructor(private waiterConfigurationService: WaiterConfigurationService) {}
 
   @Get('/debug-sentry')
+  @Log()
   getError() {
     throw new Error('My first Sentry error!');
   }

apps/nest-backend/vitest.config.ts

@@ -12,6 +12,15 @@ export default defineConfig({
     ],
     reporters: ['verbose'],
     testTimeout: 120000,
+    coverage: {
+      enabled: true,
+      reportsDirectory: '../../coverage/apps/nest-backend',
+      provider: 'v8',
+      reporter: ['lcov'],
+    },
+  },
+  esbuild: {
+    target: 'es2020',
   },
   plugins: [
     nxViteTsPaths(),

apps/ng-frontend/jest.config.ts

@@ -4,6 +4,7 @@ export default {
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
   coverageDirectory: '../../coverage/apps/ng-frontend',
+  testEnvironment: 'jsdom',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',

apps/ng-frontend/jest.preset.js

@@ -0,0 +1,3 @@
+import nxPreset from '@nx/jest/preset.js';
+
+export default { ...nxPreset };

apps/ng-frontend/project.json

@@ -139,7 +139,14 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/ng-frontend/jest.config.ts"
+        "jestConfig": "apps/ng-frontend/jest.config.ts",
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
       }
     },
     "serve-static": {

apps/ng-tag-build/project.json

@@ -76,7 +76,14 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/ng-tag-build/jest.config.ts"
+        "jestConfig": "apps/ng-tag-build/jest.config.ts",
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
       }
     }
   }

apps/ng-tag-build/src/test-setup.ts

@@ -0,0 +1,8 @@
+// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
+globalThis.ngJest = {
+  testEnvironmentOptions: {
+    errorOnUnknownElements: true,
+    errorOnUnknownProperties: true,
+  },
+};
+import 'jest-preset-angular/setup-jest';

jest.preset.js

@@ -1,3 +1,3 @@
-const nxPreset = require('@nx/jest/preset').default;
+import nxPreset from '@nx/jest/preset.js';
 
-module.exports = { ...nxPreset };
+export default { ...nxPreset };

libs/data-access/project.json

@@ -10,7 +10,8 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/ui/jest.config.ts"
+        "jestConfig": "libs/ui/jest.config.ts",
+        "passWithNoTests": true
       }
     },
     "lint": {

libs/data-access/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "./../../tsconfig.base.json",
   "compilerOptions": {
     "module": "commonjs",
     "forceConsistentCasingInFileNames": true,

libs/ui/jest.config.ts

@@ -4,6 +4,7 @@ export default {
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
   coverageDirectory: '../../coverage/libs/ui',
+  testEnvironment: 'jsdom',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',

libs/ui/project.json

@@ -10,7 +10,8 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/ui/jest.config.ts"
+        "jestConfig": "libs/ui/jest.config.ts",
+        "passWithNoTests": true
       }
     },
     "lint": {

libs/ui/src/lib/components/article/article.component.spec.ts

@@ -1,5 +1,4 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-
 import { ArticleComponent } from './article.component';
 
 describe('ArticleComponent', () => {
@@ -8,7 +7,7 @@ describe('ArticleComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      declarations: [ArticleComponent]
+      imports: [ArticleComponent],
     });
     fixture = TestBed.createComponent(ArticleComponent);
     component = fixture.componentInstance;

libs/ui/src/lib/components/footer/footer.component.spec.ts

@@ -1,5 +1,4 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-
 import { FooterComponent } from './footer.component';
 
 describe('FooterComponent', () => {
@@ -8,7 +7,7 @@ describe('FooterComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      declarations: [FooterComponent]
+      imports: [FooterComponent],
     });
     fixture = TestBed.createComponent(FooterComponent);
     component = fixture.componentInstance;

libs/ui/src/lib/components/progress-spinner/progress-spinner.component.spec.ts

@@ -8,7 +8,7 @@ describe('ProgressSpinnerComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      declarations: [ProgressSpinnerComponent]
+      imports: [ProgressSpinnerComponent],
     });
     fixture = TestBed.createComponent(ProgressSpinnerComponent);
     component = fixture.componentInstance;