diff --git a/apps/desktop/src/app/layout/desktop-layout.component.spec.ts b/apps/desktop/src/app/layout/desktop-layout.component.spec.ts index 356b6203f61..7b80dc94565 100644 --- a/apps/desktop/src/app/layout/desktop-layout.component.spec.ts +++ b/apps/desktop/src/app/layout/desktop-layout.component.spec.ts @@ -3,20 +3,12 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { RouterModule } from "@angular/router"; import { mock } from "jest-mock-extended"; -import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; -import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { FakeGlobalStateProvider } from "@bitwarden/common/spec"; -import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service"; -import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; -import { DialogService, NavigationModule } from "@bitwarden/components"; +import { NavigationModule } from "@bitwarden/components"; import { GlobalStateProvider } from "@bitwarden/state"; -import { - RoutedVaultFilterService, - VaultFilterServiceAbstraction as VaultFilterService, -} from "@bitwarden/vault"; -import { DesktopRoutedVaultFilterBridgeService } from "../services/desktop-routed-vault-filter-bridge.service"; +import { VaultFilterComponent } from "../../vault/app/vault-v3/vault-filter/vault-filter.component"; import { SendFiltersNavComponent } from "../tools/send-v2/send-filters-nav.component"; import { DesktopLayoutComponent } from "./desktop-layout.component"; @@ -29,6 +21,13 @@ import { DesktopLayoutComponent } from "./desktop-layout.component"; }) class MockSendFiltersNavComponent {} +@Component({ + selector: "app-vault-filter", + template: "", + changeDetection: ChangeDetectionStrategy.OnPush, +}) +class MockVaultFiltersNavComponent {} + Object.defineProperty(window, "matchMedia", { writable: true, value: jest.fn().mockImplementation((query) => ({ @@ -57,38 +56,6 @@ describe("DesktopLayoutComponent", () => { provide: I18nService, useValue: mock(), }, - { - provide: DesktopRoutedVaultFilterBridgeService, - useValue: mock(), - }, - { - provide: RoutedVaultFilterService, - useValue: mock(), - }, - { - provide: VaultFilterService, - useValue: mock(), - }, - { - provide: AccountService, - useValue: mock(), - }, - { - provide: CipherArchiveService, - useValue: mock(), - }, - { - provide: FolderService, - useValue: mock(), - }, - { - provide: PolicyService, - useValue: mock(), - }, - { - provide: DialogService, - useValue: mock(), - }, { provide: GlobalStateProvider, useValue: fakeGlobalStateProvider, @@ -96,8 +63,8 @@ describe("DesktopLayoutComponent", () => { ], }) .overrideComponent(DesktopLayoutComponent, { - remove: { imports: [SendFiltersNavComponent] }, - add: { imports: [MockSendFiltersNavComponent] }, + remove: { imports: [SendFiltersNavComponent, VaultFilterComponent] }, + add: { imports: [MockSendFiltersNavComponent, MockVaultFiltersNavComponent] }, }) .compileComponents(); @@ -130,4 +97,11 @@ describe("DesktopLayoutComponent", () => { expect(sendFiltersNav).toBeTruthy(); }); + + it("renders vault filters navigation component", () => { + const compiled = fixture.nativeElement; + const vaultFiltersNav = compiled.querySelector("app-vault-filter"); + + expect(vaultFiltersNav).toBeTruthy(); + }); });