From 9e1a683c44f9df8c066468a655d6e32ab8e4e6f9 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Fri, 29 Aug 2025 13:58:22 +0200 Subject: [PATCH 1/3] Fix test --- .../main-biometrics.service.spec.ts | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/apps/desktop/src/key-management/biometrics/main-biometrics.service.spec.ts b/apps/desktop/src/key-management/biometrics/main-biometrics.service.spec.ts index bc57a7e55fb..a86367161e6 100644 --- a/apps/desktop/src/key-management/biometrics/main-biometrics.service.spec.ts +++ b/apps/desktop/src/key-management/biometrics/main-biometrics.service.spec.ts @@ -1,7 +1,5 @@ import { mock, MockProxy } from "jest-mock-extended"; -import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service"; -import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { EncryptionType } from "@bitwarden/common/platform/enums"; @@ -35,8 +33,6 @@ describe("MainBiometricsService", function () { const windowMain = mock(); const logService = mock(); const biometricStateService = mock(); - const cryptoFunctionService = mock(); - const encryptService = mock(); it("Should call the platformspecific methods", async () => { const sut = new MainBiometricsService( @@ -45,8 +41,6 @@ describe("MainBiometricsService", function () { logService, process.platform, biometricStateService, - encryptService, - cryptoFunctionService, ); const mockService = mock(); @@ -64,8 +58,6 @@ describe("MainBiometricsService", function () { logService, "win32", biometricStateService, - encryptService, - cryptoFunctionService, ); const internalService = (sut as any).osBiometricsService; @@ -80,8 +72,6 @@ describe("MainBiometricsService", function () { logService, "darwin", biometricStateService, - encryptService, - cryptoFunctionService, ); const internalService = (sut as any).osBiometricsService; expect(internalService).not.toBeNull(); @@ -95,8 +85,6 @@ describe("MainBiometricsService", function () { logService, "linux", biometricStateService, - encryptService, - cryptoFunctionService, ); const internalService = (sut as any).osBiometricsService; @@ -116,8 +104,6 @@ describe("MainBiometricsService", function () { logService, process.platform, biometricStateService, - encryptService, - cryptoFunctionService, ); innerService = mock(); @@ -215,8 +201,6 @@ describe("MainBiometricsService", function () { logService, process.platform, biometricStateService, - encryptService, - cryptoFunctionService, ); const osBiometricsService = mock(); (sut as any).osBiometricsService = osBiometricsService; @@ -235,8 +219,6 @@ describe("MainBiometricsService", function () { logService, process.platform, biometricStateService, - encryptService, - cryptoFunctionService, ); const osBiometricsService = mock(); (sut as any).osBiometricsService = osBiometricsService; @@ -258,8 +240,6 @@ describe("MainBiometricsService", function () { logService, process.platform, biometricStateService, - encryptService, - cryptoFunctionService, ); osBiometricsService = mock(); (sut as any).osBiometricsService = osBiometricsService; @@ -299,8 +279,6 @@ describe("MainBiometricsService", function () { logService, process.platform, biometricStateService, - encryptService, - cryptoFunctionService, ); osBiometricsService = mock(); (sut as any).osBiometricsService = osBiometricsService; @@ -323,8 +301,6 @@ describe("MainBiometricsService", function () { logService, process.platform, biometricStateService, - encryptService, - cryptoFunctionService, ); const osBiometricsService = mock(); (sut as any).osBiometricsService = osBiometricsService; @@ -347,8 +323,6 @@ describe("MainBiometricsService", function () { logService, process.platform, biometricStateService, - encryptService, - cryptoFunctionService, ); }); @@ -377,8 +351,6 @@ describe("MainBiometricsService", function () { logService, process.platform, biometricStateService, - encryptService, - cryptoFunctionService, ); const shouldAutoPrompt = await sut.getShouldAutopromptNow(); From fb2e9b20397867454e2f019c60a50b487ea297da Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Fri, 29 Aug 2025 14:01:26 +0200 Subject: [PATCH 2/3] Fix tests --- .../biometrics/main-biometrics.service.spec.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/desktop/src/key-management/biometrics/main-biometrics.service.spec.ts b/apps/desktop/src/key-management/biometrics/main-biometrics.service.spec.ts index a86367161e6..22c94703f28 100644 --- a/apps/desktop/src/key-management/biometrics/main-biometrics.service.spec.ts +++ b/apps/desktop/src/key-management/biometrics/main-biometrics.service.spec.ts @@ -21,7 +21,16 @@ import { OsBiometricService } from "./os-biometrics.service"; jest.mock("@bitwarden/desktop-napi", () => { return { - biometrics: jest.fn(), + biometrics: { + authenticate: jest.fn(), + authenticate_available: jest.fn(), + enroll_persistent: jest.fn(), + provide_key: jest.fn(), + unlock: jest.fn(), + unlock_available: jest.fn(), + has_persistent: jest.fn(), + initBiometricSystem: jest.fn(), + }, passwords: jest.fn(), }; }); From 10f86636826d31fc00a8c933c9717646099fb27a Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Fri, 29 Aug 2025 14:06:10 +0200 Subject: [PATCH 3/3] Fix tests --- apps/desktop/src/app/accounts/settings.component.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/desktop/src/app/accounts/settings.component.spec.ts b/apps/desktop/src/app/accounts/settings.component.spec.ts index 4219a9952c6..93dea25e3cc 100644 --- a/apps/desktop/src/app/accounts/settings.component.spec.ts +++ b/apps/desktop/src/app/accounts/settings.component.spec.ts @@ -149,6 +149,7 @@ describe("SettingsComponent", () => { component = fixture.componentInstance; fixture.detectChanges(); + desktopBiometricsService.hasPersistentKey.mockResolvedValue(false); vaultTimeoutSettingsService.getVaultTimeoutByUserId$.mockReturnValue( of(VaultTimeoutStringType.OnLocked), );