bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-01-30 00:03:30 +00:00
Code Issues Releases Wiki Activity

Update unit tests

Browse Source
This commit is contained in:
Thomas Avery
2026-01-27 16:10:22 -06:00
parent 83cc7d33f2
commit fdd1775f5a
2 changed files with 30 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
apps/browser/src/auth/popup/settings/account-security.component.spec.ts
View File

@@ -1,4 +1,4 @@
import { Component } from "@angular/core";
import { ChangeDetectionStrategy, Component, input } from "@angular/core";
import { ComponentFixture, fakeAsync, TestBed, tick } from "@angular/core/testing";
import { By } from "@angular/platform-browser";
import { ActivatedRoute } from "@angular/router";
@@ -19,11 +19,7 @@ import { UserVerificationService } from "@bitwarden/common/auth/abstractions/use
import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
import { PhishingDetectionSettingsServiceAbstraction } from "@bitwarden/common/dirt/services/abstractions/phishing-detection-settings.service.abstraction";
import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
import {
VaultTimeoutSettingsService,
VaultTimeoutStringType,
VaultTimeoutAction,
} from "@bitwarden/common/key-management/vault-timeout";
import { VaultTimeoutSettingsService } from "@bitwarden/common/key-management/vault-timeout";
import { ProfileResponse } from "@bitwarden/common/models/response/profile.response";
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
@@ -44,6 +40,7 @@ import {
BiometricsStatus,
KeyService,
} from "@bitwarden/key-management";
import { SessionTimeoutSettingsComponent } from "@bitwarden/key-management-ui";
import { BrowserApi } from "../../../platform/browser/browser-api";
import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
@@ -60,6 +57,16 @@ import { AccountSecurityComponent } from "./account-security.component";
})
class MockPopOutComponent {}
@Component({
selector: "bit-session-timeout-settings",
standalone: true,
template: "",
changeDetection: ChangeDetectionStrategy.OnPush,
})
class MockSessionTimeoutSettingsComponent {
readonly refreshTimeoutActionSettings = input<any>();
}
describe("AccountSecurityComponent", () => {
let component: AccountSecurityComponent;
let fixture: ComponentFixture<AccountSecurityComponent>;
@@ -136,11 +143,11 @@ describe("AccountSecurityComponent", () => {
})
.overrideComponent(AccountSecurityComponent, {
remove: {
imports: [PopOutComponent],
imports: [PopOutComponent, SessionTimeoutSettingsComponent],
providers: [DialogService],
},
add: {
imports: [MockPopOutComponent],
imports: [MockPopOutComponent, MockSessionTimeoutSettingsComponent],
providers: [{ provide: DialogService, useValue: dialogService }],
},
})
@@ -153,16 +160,6 @@ describe("AccountSecurityComponent", () => {
}),
);
vaultNudgesService.showNudgeSpotlight$.mockReturnValue(of(false));
vaultTimeoutSettingsService.getVaultTimeoutByUserId$.mockReturnValue(
of(VaultTimeoutStringType.OnLocked),
);
vaultTimeoutSettingsService.getVaultTimeoutActionByUserId$.mockReturnValue(
of(VaultTimeoutAction.Lock),
);
vaultTimeoutSettingsService.getVaultTimeoutActionByUserId$.mockReturnValue(
of(VaultTimeoutAction.Lock),
);
vaultTimeoutSettingsService.availableVaultTimeoutActions$.mockReturnValue(of([]));
biometricStateService.promptAutomatically$ = of(false);
pinServiceAbstraction.isPinSet.mockResolvedValue(false);
configService.getFeatureFlag$.mockReturnValue(of(false));

116
apps/desktop/src/app/accounts/settings.component.spec.ts
View File

@@ -1,4 +1,4 @@
import { NO_ERRORS_SCHEMA } from "@angular/core";
import { ChangeDetectionStrategy, Component, input, NO_ERRORS_SCHEMA } from "@angular/core";
import { ComponentFixture, TestBed } from "@angular/core/testing";
import { By } from "@angular/platform-browser";
import { mock } from "jest-mock-extended";
@@ -14,12 +14,7 @@ import { DomainSettingsService } from "@bitwarden/common/autofill/services/domai
import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
import { DeviceType } from "@bitwarden/common/enums";
import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
import {
VaultTimeoutSettingsService,
VaultTimeoutStringType,
VaultTimeoutAction,
VaultTimeout,
} from "@bitwarden/common/key-management/vault-timeout";
import { VaultTimeoutSettingsService } from "@bitwarden/common/key-management/vault-timeout";
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -36,6 +31,7 @@ import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/sp
import { UserId } from "@bitwarden/common/types/guid";
import { DialogRef, DialogService, ToastService } from "@bitwarden/components";
import { BiometricStateService, BiometricsStatus, KeyService } from "@bitwarden/key-management";
import { SessionTimeoutSettingsComponent } from "@bitwarden/key-management-ui";
import { SetPinComponent } from "../../auth/components/set-pin.component";
import { SshAgentPromptType } from "../../autofill/models/ssh-agent-setting";
@@ -47,6 +43,16 @@ import { NativeMessagingManifestService } from "../services/native-messaging-man
import { SettingsComponent } from "./settings.component";
@Component({
selector: "bit-session-timeout-settings",
standalone: true,
template: "",
changeDetection: ChangeDetectionStrategy.OnPush,
})
class MockSessionTimeoutSettingsComponent {
readonly refreshTimeoutActionSettings = input<any>();
}
describe("SettingsComponent", () => {
let component: SettingsComponent;
let fixture: ComponentFixture<SettingsComponent>;
@@ -142,6 +148,7 @@ describe("SettingsComponent", () => {
TestBed.overrideComponent(SettingsComponent, {
add: {
imports: [MockSessionTimeoutSettingsComponent],
providers: [
{
provide: DialogService,
@@ -150,6 +157,7 @@ describe("SettingsComponent", () => {
],
},
remove: {
imports: [SessionTimeoutSettingsComponent],
providers: [DialogService],
},
});
@@ -159,12 +167,6 @@ describe("SettingsComponent", () => {
fixture.detectChanges();
desktopBiometricsService.hasPersistentKey.mockResolvedValue(false);
vaultTimeoutSettingsService.getVaultTimeoutByUserId$.mockReturnValue(
of(VaultTimeoutStringType.OnLocked),
);
vaultTimeoutSettingsService.getVaultTimeoutActionByUserId$.mockReturnValue(
of(VaultTimeoutAction.Lock),
);
vaultTimeoutSettingsService.isBiometricLockSet.mockResolvedValue(false);
biometricStateService.promptAutomatically$ = of(false);
autofillSettingsServiceAbstraction.clearClipboardDelay$ = of(null);
@@ -851,94 +853,6 @@ describe("SettingsComponent", () => {
});
});
describe("saveVaultTimeout", () => {
const DEFAULT_VAULT_TIMEOUT: VaultTimeout = 123;
const DEFAULT_VAULT_TIMEOUT_ACTION = VaultTimeoutAction.Lock;
beforeEach(() => {
component["form"].controls.vaultTimeout.setValue(DEFAULT_VAULT_TIMEOUT, { emitEvent: false });
component["form"].controls.vaultTimeoutAction.setValue(DEFAULT_VAULT_TIMEOUT_ACTION, {
emitEvent: false,
});
});
it.each([
null,
[VaultTimeoutStringType.Never],
[VaultTimeoutStringType.OnRestart],
[VaultTimeoutStringType.OnLocked],
[VaultTimeoutStringType.OnSleep],
[VaultTimeoutStringType.OnIdle],
[42],
])("should save vault timeout", async (vaultTimeout: VaultTimeout) => {
dialogService.openSimpleDialog.mockResolvedValue(true);
await component.saveVaultTimeout(DEFAULT_VAULT_TIMEOUT, vaultTimeout);
expect(vaultTimeoutSettingsService.setVaultTimeoutOptions).toHaveBeenCalledWith(
mockUserId,
vaultTimeout,
DEFAULT_VAULT_TIMEOUT_ACTION,
);
});
it("should save vault timeout when vault timeout action is disabled", async () => {
component["form"].controls.vaultTimeoutAction.setValue(VaultTimeoutAction.LogOut, {
emitEvent: false,
});
component["form"].controls.vaultTimeoutAction.disable({ emitEvent: false });
await component.saveVaultTimeout(DEFAULT_VAULT_TIMEOUT, DEFAULT_VAULT_TIMEOUT);
expect(vaultTimeoutSettingsService.setVaultTimeoutOptions).toHaveBeenCalledWith(
mockUserId,
DEFAULT_VAULT_TIMEOUT,
VaultTimeoutAction.LogOut,
);
});
it("should not save vault timeout when vault timeout is 'never' and dialog is cancelled", async () => {
dialogService.openSimpleDialog.mockResolvedValue(false);
await component.saveVaultTimeout(DEFAULT_VAULT_TIMEOUT, VaultTimeoutStringType.Never);
expect(vaultTimeoutSettingsService.setVaultTimeoutOptions).not.toHaveBeenCalledWith(
mockUserId,
VaultTimeoutStringType.Never,
DEFAULT_VAULT_TIMEOUT_ACTION,
);
expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
title: { key: "warning" },
content: { key: "neverLockWarning" },
type: "warning",
});
});
it("should not save vault timeout when vault timeout is 0", async () => {
component["form"].controls.vaultTimeout.setValue(0, { emitEvent: false });
await component.saveVaultTimeout(DEFAULT_VAULT_TIMEOUT, 0);
expect(vaultTimeoutSettingsService.setVaultTimeoutOptions).not.toHaveBeenCalledWith(
mockUserId,
0,
DEFAULT_VAULT_TIMEOUT_ACTION,
);
expect(component["form"].getRawValue().vaultTimeout).toEqual(0);
});
it("should not save vault timeout when vault timeout is invalid", async () => {
component["form"].controls.vaultTimeout.setErrors({}, { emitEvent: false });
await component.saveVaultTimeout(DEFAULT_VAULT_TIMEOUT, 999_999_999);
expect(vaultTimeoutSettingsService.setVaultTimeoutOptions).not.toHaveBeenCalledWith(
mockUserId,
999_999_999,
DEFAULT_VAULT_TIMEOUT_ACTION,
);
expect(component["form"].getRawValue().vaultTimeout).toEqual(DEFAULT_VAULT_TIMEOUT);
});
});
describe("desktop autotype", () => {
it("autotype should be hidden on mac os", async () => {
// Set OS