Merge branch 'master' into feature/org-admin-refresh

apps/web/jest.config.js

@@ -2,12 +2,12 @@ const { pathsToModuleNameMapper } = require("ts-jest");
 
 const { compilerOptions } = require("./tsconfig");
 
+const sharedConfig = require("../../libs/shared/jest.config.base");
+
 module.exports = {
-  collectCoverage: true,
-  coverageReporters: ["html", "lcov"],
-  coverageDirectory: "coverage",
+  ...sharedConfig,
   preset: "jest-preset-angular",
-  setupFilesAfterEnv: ["<rootDir>/test.config.ts"],
+  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
     prefix: "<rootDir>/",
   }),

apps/web/src/app/accounts/trial-initiation/trial-initiation.component.spec.ts

@@ -12,6 +12,7 @@ import { I18nPipe } from "@bitwarden/angular/pipes/i18n.pipe";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { StateService as BaseStateService } from "@bitwarden/common/abstractions/state.service";
 import { PlanType } from "@bitwarden/common/enums/planType";
@@ -75,6 +76,10 @@ describe("TrialInitiationComponent", () => {
         { provide: LogService, useClass: Substitute.for<LogService>() },
         { provide: I18nService, useClass: Substitute.for<I18nService>() },
         { provide: TitleCasePipe, useClass: Substitute.for<TitleCasePipe>() },
+        {
+          provide: PolicyApiServiceAbstraction,
+          useClass: Substitute.for<PolicyApiServiceAbstraction>(),
+        },
         {
           provide: VerticalStepperComponent,
           useClass: VerticalStepperStubComponent,

apps/web/tsconfig.json

@@ -16,5 +16,5 @@
     "preserveWhitespaces": true
   },
   "files": ["src/polyfills.ts", "src/main.ts", "../../bitwarden_license/bit-web/src/main.ts"],
-  "include": ["src/connectors/*.ts", "src/**/*.stories.ts"]
+  "include": ["src/connectors/*.ts", "src/**/*.stories.ts", "src/**/*.spec.ts"]
 }

apps/web/tsconfig.spec.json

@@ -1,3 +1,4 @@
 {
-  "extends": "./tsconfig.json"
+  "extends": "./tsconfig.json",
+  "files": ["./test.setup.ts"]
 }