1
0
mirror of https://github.com/bitwarden/browser synced 2026-02-24 16:43:27 +00:00

[PM-27086] update method names in test files

This commit is contained in:
rr-bw
2025-12-17 16:19:06 -08:00
parent 2e4c582792
commit dfb01316f2
3 changed files with 58 additions and 55 deletions

View File

@@ -5,7 +5,7 @@ import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
import { DefaultSetInitialPasswordService } from "@bitwarden/angular/auth/password-management/set-initial-password/default-set-initial-password.service.implementation";
import {
SetInitialPasswordCredentials,
SetInitialPasswordCredentialsV2,
SetInitialPasswordCredentialsOld,
SetInitialPasswordService,
SetInitialPasswordUserType,
} from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.service.abstraction";
@@ -86,9 +86,9 @@ describe("DesktopSetInitialPasswordService", () => {
/**
* @deprecated To be removed in PM-28143
*/
describe("setInitialPassword(...)", () => {
describe("setInitialPasswordOld(...)", () => {
// Mock function parameters
let credentials: SetInitialPasswordCredentials;
let credentials: SetInitialPasswordCredentialsOld;
let userType: SetInitialPasswordUserType;
let userId: UserId;
@@ -160,7 +160,7 @@ describe("DesktopSetInitialPasswordService", () => {
setupMocks();
// Act
await sut.setInitialPassword(credentials, userType, userId);
await sut.setInitialPasswordOld(credentials, userType, userId);
// Assert
expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
@@ -172,11 +172,11 @@ describe("DesktopSetInitialPasswordService", () => {
describe("given the initial password was NOT successfully set (due to some error in setInitialPassword())", () => {
it("should NOT send a 'redrawMenu' message", async () => {
// Arrange
credentials.newMasterKey = null; // will trigger an error in setInitialPassword()
credentials.newMasterKey = null; // will trigger an error in setInitialPasswordOld()
setupMocks();
// Act
const promise = sut.setInitialPassword(credentials, userType, userId);
const promise = sut.setInitialPasswordOld(credentials, userType, userId);
// Assert
await expect(promise).rejects.toThrow();
@@ -186,8 +186,8 @@ describe("DesktopSetInitialPasswordService", () => {
});
});
describe("setInitialPasswordV2(...)", () => {
let credentials: SetInitialPasswordCredentialsV2;
describe("setInitialPassword()", () => {
let credentials: SetInitialPasswordCredentials;
let userType: SetInitialPasswordUserType;
let userId: UserId;
@@ -209,11 +209,11 @@ describe("DesktopSetInitialPasswordService", () => {
it("should send a 'redrawMenu' message", async () => {
// Arrange
jest
.spyOn(DefaultSetInitialPasswordService.prototype, "setInitialPasswordV2")
.spyOn(DefaultSetInitialPasswordService.prototype, "setInitialPassword")
.mockResolvedValue(undefined);
// Act
await sut.setInitialPasswordV2(credentials, userType, userId);
await sut.setInitialPassword(credentials, userType, userId);
// Assert
expect(messagingService.send).toHaveBeenCalledTimes(1);
@@ -224,13 +224,13 @@ describe("DesktopSetInitialPasswordService", () => {
describe("given the initial password was NOT successfully set (due to parent method failure)", () => {
it("should NOT send a 'redrawMenu' message", async () => {
// Arrange
const parentError = new Error("Parent setInitialPasswordV2 failed");
const parentError = new Error("Parent setInitialPassword failed");
jest
.spyOn(DefaultSetInitialPasswordService.prototype, "setInitialPasswordV2")
.spyOn(DefaultSetInitialPasswordService.prototype, "setInitialPassword")
.mockRejectedValue(parentError);
// Act
const promise = sut.setInitialPasswordV2(credentials, userType, userId);
const promise = sut.setInitialPassword(credentials, userType, userId);
// Assert
await expect(promise).rejects.toThrow(parentError);