From a37c21d54b3eaca28a797cbce2e650ab325f728a Mon Sep 17 00:00:00 2001 From: jaasen-livefront Date: Wed, 17 Jul 2024 10:57:13 -0700 Subject: [PATCH] add specs for send list filters --- jest.config.js | 1 + .../vault-export/vault-export-core/tsconfig.json | 2 +- libs/tools/send/send-ui/jest.config.js | 6 +++--- .../services/send-list-filters.service.spec.ts | 10 ---------- .../src/services/send-list-filters.service.ts | 15 --------------- libs/tools/send/send-ui/test.setup.ts | 1 + libs/tools/send/send-ui/tsconfig.spec.json | 5 ++++- 7 files changed, 10 insertions(+), 30 deletions(-) create mode 100644 libs/tools/send/send-ui/test.setup.ts diff --git a/jest.config.js b/jest.config.js index 57f9b3c3229..6526237261f 100644 --- a/jest.config.js +++ b/jest.config.js @@ -35,6 +35,7 @@ module.exports = { "/libs/tools/generator/extensions/history/jest.config.js", "/libs/tools/generator/extensions/legacy/jest.config.js", "/libs/tools/generator/extensions/navigation/jest.config.js", + "/libs/tools/send/send-ui/jest.config.js", "/libs/importer/jest.config.js", "/libs/platform/jest.config.js", "/libs/node/jest.config.js", diff --git a/libs/tools/export/vault-export/vault-export-core/tsconfig.json b/libs/tools/export/vault-export/vault-export-core/tsconfig.json index 5cb90260371..8d8209b8dbd 100644 --- a/libs/tools/export/vault-export/vault-export-core/tsconfig.json +++ b/libs/tools/export/vault-export/vault-export-core/tsconfig.json @@ -1,5 +1,5 @@ { "extends": "../../../../shared/tsconfig.libs", - "include": ["src"], + "include": ["src", "../../../send/send-ui/src/services/send-list-filters.service.spec.ts"], "exclude": ["node_modules", "dist"] } diff --git a/libs/tools/send/send-ui/jest.config.js b/libs/tools/send/send-ui/jest.config.js index 100075fc7a7..b68bda8d5ca 100644 --- a/libs/tools/send/send-ui/jest.config.js +++ b/libs/tools/send/send-ui/jest.config.js @@ -5,9 +5,9 @@ const { compilerOptions } = require("../../../shared/tsconfig.libs"); /** @type {import('jest').Config} */ module.exports = { testMatch: ["**/+(*.)+(spec).+(ts)"], - preset: "ts-jest", - testEnvironment: "jsdom", + preset: "jest-preset-angular", + setupFilesAfterEnv: ["/test.setup.ts"], moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, { - prefix: "/../../../", + prefix: "/../../", }), }; diff --git a/libs/tools/send/send-ui/src/services/send-list-filters.service.spec.ts b/libs/tools/send/send-ui/src/services/send-list-filters.service.spec.ts index afe831aeb1e..f922c7dcfed 100644 --- a/libs/tools/send/send-ui/src/services/send-list-filters.service.spec.ts +++ b/libs/tools/send/send-ui/src/services/send-list-filters.service.spec.ts @@ -6,19 +6,13 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; import { Send } from "@bitwarden/common/tools/send/models/domain/send"; -import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; import { SendListFiltersService } from "./send-list-filters.service"; describe("SendListFiltersService", () => { let service: SendListFiltersService; - const sends$ = new BehaviorSubject({}); const policyAppliesToActiveUser$ = new BehaviorSubject(false); - const sendService = { - sends$, - } as unknown as SendService; - const i18nService = { t: (key: string) => key, } as I18nService; @@ -33,10 +27,6 @@ describe("SendListFiltersService", () => { TestBed.configureTestingModule({ providers: [ - { - provide: SendService, - useValue: sendService, - }, { provide: I18nService, useValue: i18nService, diff --git a/libs/tools/send/send-ui/src/services/send-list-filters.service.ts b/libs/tools/send/send-ui/src/services/send-list-filters.service.ts index eb12477da13..58762c28903 100644 --- a/libs/tools/send/send-ui/src/services/send-list-filters.service.ts +++ b/libs/tools/send/send-ui/src/services/send-list-filters.service.ts @@ -5,7 +5,6 @@ import { map, Observable, startWith } from "rxjs"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; import { Send } from "@bitwarden/common/tools/send/models/domain/send"; -import { SendService } from "@bitwarden/common/tools/send/services/send.service"; import { ITreeNodeObject, TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { ChipSelectOption } from "@bitwarden/components"; @@ -33,23 +32,9 @@ export class SendListFiltersService { startWith(INITIAL_FILTERS), ) as Observable; - /** - * All available sends - **/ - - private sends: Send[] = []; - - private sends$: Observable = this.sendService.sends$.pipe( - map((sends) => { - this.sends = sends; - return sends; - }), - ); - constructor( private i18nService: I18nService, private formBuilder: FormBuilder, - private sendService: SendService, ) {} /** diff --git a/libs/tools/send/send-ui/test.setup.ts b/libs/tools/send/send-ui/test.setup.ts new file mode 100644 index 00000000000..a702c633967 --- /dev/null +++ b/libs/tools/send/send-ui/test.setup.ts @@ -0,0 +1 @@ +import "jest-preset-angular/setup-jest"; diff --git a/libs/tools/send/send-ui/tsconfig.spec.json b/libs/tools/send/send-ui/tsconfig.spec.json index fc8520e7376..919530506de 100644 --- a/libs/tools/send/send-ui/tsconfig.spec.json +++ b/libs/tools/send/send-ui/tsconfig.spec.json @@ -1,3 +1,6 @@ { - "extends": "./tsconfig.json" + "extends": "./tsconfig.json", + "include": ["src"], + "files": ["./test.setup.ts"], + "exclude": ["node_modules", "dist"] }