mirror of
https://github.com/bitwarden/browser
synced 2025-12-15 07:43:35 +00:00
[SM-288] Rename models to follow naming convention (#3795)
This commit is contained in:
@@ -2,10 +2,10 @@ import { mock, MockProxy } from "jest-mock-extended";
|
||||
|
||||
import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractEncrypt.service";
|
||||
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
|
||||
import { AttachmentData } from "@bitwarden/common/models/data/attachmentData";
|
||||
import { AttachmentData } from "@bitwarden/common/models/data/attachment.data";
|
||||
import { Attachment } from "@bitwarden/common/models/domain/attachment";
|
||||
import { EncString } from "@bitwarden/common/models/domain/encString";
|
||||
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
|
||||
import { EncString } from "@bitwarden/common/models/domain/enc-string";
|
||||
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
|
||||
import { ContainerService } from "@bitwarden/common/services/container.service";
|
||||
|
||||
import { makeStaticByteArray, mockEnc, mockFromJson } from "../../utils";
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { CardData } from "@bitwarden/common/models/data/cardData";
|
||||
import { CardData } from "@bitwarden/common/models/data/card.data";
|
||||
import { Card } from "@bitwarden/common/models/domain/card";
|
||||
import { EncString } from "@bitwarden/common/models/domain/encString";
|
||||
import { EncString } from "@bitwarden/common/models/domain/enc-string";
|
||||
|
||||
import { mockEnc, mockFromJson } from "../../utils";
|
||||
|
||||
|
||||
@@ -7,19 +7,19 @@ import { CipherType } from "@bitwarden/common/enums/cipherType";
|
||||
import { FieldType } from "@bitwarden/common/enums/fieldType";
|
||||
import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType";
|
||||
import { UriMatchType } from "@bitwarden/common/enums/uriMatchType";
|
||||
import { CipherData } from "@bitwarden/common/models/data/cipherData";
|
||||
import { CipherData } from "@bitwarden/common/models/data/cipher.data";
|
||||
import { Attachment } from "@bitwarden/common/models/domain/attachment";
|
||||
import { Card } from "@bitwarden/common/models/domain/card";
|
||||
import { Cipher } from "@bitwarden/common/models/domain/cipher";
|
||||
import { EncString } from "@bitwarden/common/models/domain/encString";
|
||||
import { EncString } from "@bitwarden/common/models/domain/enc-string";
|
||||
import { Field } from "@bitwarden/common/models/domain/field";
|
||||
import { Identity } from "@bitwarden/common/models/domain/identity";
|
||||
import { Login } from "@bitwarden/common/models/domain/login";
|
||||
import { Password } from "@bitwarden/common/models/domain/password";
|
||||
import { SecureNote } from "@bitwarden/common/models/domain/secureNote";
|
||||
import { CardView } from "@bitwarden/common/models/view/cardView";
|
||||
import { IdentityView } from "@bitwarden/common/models/view/identityView";
|
||||
import { LoginView } from "@bitwarden/common/models/view/loginView";
|
||||
import { SecureNote } from "@bitwarden/common/models/domain/secure-note";
|
||||
import { CardView } from "@bitwarden/common/models/view/card.view";
|
||||
import { IdentityView } from "@bitwarden/common/models/view/identity.view";
|
||||
import { LoginView } from "@bitwarden/common/models/view/login.view";
|
||||
|
||||
import { mockEnc, mockFromJson } from "../../utils";
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { CollectionData } from "@bitwarden/common/models/data/collectionData";
|
||||
import { CollectionData } from "@bitwarden/common/models/data/collection.data";
|
||||
import { Collection } from "@bitwarden/common/models/domain/collection";
|
||||
|
||||
import { mockEnc } from "../../utils";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { EncryptionType } from "@bitwarden/common/enums/encryptionType";
|
||||
import { EncArrayBuffer } from "@bitwarden/common/models/domain/encArrayBuffer";
|
||||
import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer";
|
||||
|
||||
import { makeStaticByteArray } from "../../utils";
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@ import { mock, MockProxy } from "jest-mock-extended";
|
||||
import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractEncrypt.service";
|
||||
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
|
||||
import { EncryptionType } from "@bitwarden/common/enums/encryptionType";
|
||||
import { EncString } from "@bitwarden/common/models/domain/encString";
|
||||
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
|
||||
import { EncString } from "@bitwarden/common/models/domain/enc-string";
|
||||
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
|
||||
import { ContainerService } from "@bitwarden/common/services/container.service";
|
||||
|
||||
describe("EncString", () => {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { FieldType } from "@bitwarden/common/enums/fieldType";
|
||||
import { FieldData } from "@bitwarden/common/models/data/fieldData";
|
||||
import { EncString } from "@bitwarden/common/models/domain/encString";
|
||||
import { FieldData } from "@bitwarden/common/models/data/field.data";
|
||||
import { EncString } from "@bitwarden/common/models/domain/enc-string";
|
||||
import { Field } from "@bitwarden/common/models/domain/field";
|
||||
|
||||
import { mockEnc, mockFromJson } from "../../utils";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { FolderData } from "@bitwarden/common/models/data/folderData";
|
||||
import { EncString } from "@bitwarden/common/models/domain/encString";
|
||||
import { FolderData } from "@bitwarden/common/models/data/folder.data";
|
||||
import { EncString } from "@bitwarden/common/models/domain/enc-string";
|
||||
import { Folder } from "@bitwarden/common/models/domain/folder";
|
||||
|
||||
import { mockEnc, mockFromJson } from "../../utils";
|
||||
@@ -41,7 +41,7 @@ describe("Folder", () => {
|
||||
});
|
||||
|
||||
describe("fromJSON", () => {
|
||||
jest.mock("@bitwarden/common/models/domain/encString");
|
||||
jest.mock("@bitwarden/common/models/domain/enc-string");
|
||||
jest.spyOn(EncString, "fromJSON").mockImplementation(mockFromJson);
|
||||
|
||||
it("initializes nested objects", () => {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { IdentityData } from "@bitwarden/common/models/data/identityData";
|
||||
import { EncString } from "@bitwarden/common/models/domain/encString";
|
||||
import { IdentityData } from "@bitwarden/common/models/data/identity.data";
|
||||
import { EncString } from "@bitwarden/common/models/domain/enc-string";
|
||||
import { Identity } from "@bitwarden/common/models/domain/identity";
|
||||
|
||||
import { mockEnc, mockFromJson } from "../../utils";
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
import { Substitute, Arg } from "@fluffy-spoon/substitute";
|
||||
|
||||
import { UriMatchType } from "@bitwarden/common/enums/uriMatchType";
|
||||
import { LoginData } from "@bitwarden/common/models/data/loginData";
|
||||
import { EncString } from "@bitwarden/common/models/domain/encString";
|
||||
import { LoginData } from "@bitwarden/common/models/data/login.data";
|
||||
import { EncString } from "@bitwarden/common/models/domain/enc-string";
|
||||
import { Login } from "@bitwarden/common/models/domain/login";
|
||||
import { LoginUri } from "@bitwarden/common/models/domain/loginUri";
|
||||
import { LoginUriView } from "@bitwarden/common/models/view/loginUriView";
|
||||
import { LoginUri } from "@bitwarden/common/models/domain/login-uri";
|
||||
import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view";
|
||||
|
||||
import { mockEnc, mockFromJson } from "../../utils";
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { Jsonify } from "type-fest";
|
||||
|
||||
import { UriMatchType } from "@bitwarden/common/enums/uriMatchType";
|
||||
import { LoginUriData } from "@bitwarden/common/models/data/loginUriData";
|
||||
import { EncString } from "@bitwarden/common/models/domain/encString";
|
||||
import { LoginUri } from "@bitwarden/common/models/domain/loginUri";
|
||||
import { LoginUriData } from "@bitwarden/common/models/data/login-uri.data";
|
||||
import { EncString } from "@bitwarden/common/models/domain/enc-string";
|
||||
import { LoginUri } from "@bitwarden/common/models/domain/login-uri";
|
||||
|
||||
import { mockEnc, mockFromJson } from "../../utils";
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { PasswordHistoryData } from "@bitwarden/common/models/data/passwordHistoryData";
|
||||
import { EncString } from "@bitwarden/common/models/domain/encString";
|
||||
import { PasswordHistoryData } from "@bitwarden/common/models/data/password-history.data";
|
||||
import { EncString } from "@bitwarden/common/models/domain/enc-string";
|
||||
import { Password } from "@bitwarden/common/models/domain/password";
|
||||
|
||||
import { mockEnc, mockFromJson } from "../../utils";
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType";
|
||||
import { SecureNoteData } from "@bitwarden/common/models/data/secureNoteData";
|
||||
import { SecureNote } from "@bitwarden/common/models/domain/secureNote";
|
||||
import { SecureNoteData } from "@bitwarden/common/models/data/secure-note.data";
|
||||
import { SecureNote } from "@bitwarden/common/models/domain/secure-note";
|
||||
|
||||
describe("SecureNote", () => {
|
||||
let data: SecureNoteData;
|
||||
|
||||
@@ -4,10 +4,10 @@ import { Substitute, Arg, SubstituteOf } from "@fluffy-spoon/substitute";
|
||||
import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractEncrypt.service";
|
||||
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
|
||||
import { SendType } from "@bitwarden/common/enums/sendType";
|
||||
import { SendData } from "@bitwarden/common/models/data/sendData";
|
||||
import { EncString } from "@bitwarden/common/models/domain/encString";
|
||||
import { SendData } from "@bitwarden/common/models/data/send.data";
|
||||
import { EncString } from "@bitwarden/common/models/domain/enc-string";
|
||||
import { Send } from "@bitwarden/common/models/domain/send";
|
||||
import { SendText } from "@bitwarden/common/models/domain/sendText";
|
||||
import { SendText } from "@bitwarden/common/models/domain/send-text";
|
||||
import { ContainerService } from "@bitwarden/common/services/container.service";
|
||||
|
||||
import { makeStaticByteArray, mockEnc } from "../../utils";
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
import { Substitute, Arg } from "@fluffy-spoon/substitute";
|
||||
|
||||
import { SendType } from "@bitwarden/common/enums/sendType";
|
||||
import { SendAccess } from "@bitwarden/common/models/domain/sendAccess";
|
||||
import { SendText } from "@bitwarden/common/models/domain/sendText";
|
||||
import { SendAccess } from "@bitwarden/common/models/domain/send-access";
|
||||
import { SendText } from "@bitwarden/common/models/domain/send-text";
|
||||
import { SendAccessResponse } from "@bitwarden/common/models/response/sendAccessResponse";
|
||||
|
||||
import { mockEnc } from "../../utils";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { SendFileData } from "@bitwarden/common/models/data/sendFileData";
|
||||
import { SendFile } from "@bitwarden/common/models/domain/sendFile";
|
||||
import { SendFileData } from "@bitwarden/common/models/data/send-file.data";
|
||||
import { SendFile } from "@bitwarden/common/models/domain/send-file";
|
||||
|
||||
import { mockEnc } from "../../utils";
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { SendTextData } from "@bitwarden/common/models/data/sendTextData";
|
||||
import { SendText } from "@bitwarden/common/models/domain/sendText";
|
||||
import { SendTextData } from "@bitwarden/common/models/data/send-text.data";
|
||||
import { SendText } from "@bitwarden/common/models/domain/send-text";
|
||||
|
||||
import { mockEnc } from "../../utils";
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { EncryptionType } from "@bitwarden/common/enums/encryptionType";
|
||||
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
|
||||
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
|
||||
|
||||
import { makeStaticByteArray } from "../../utils";
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
|
||||
import { AttachmentView } from "@bitwarden/common/models/view/attachmentView";
|
||||
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
|
||||
import { AttachmentView } from "@bitwarden/common/models/view/attachment.view";
|
||||
|
||||
import { mockFromJson } from "../../utils";
|
||||
|
||||
jest.mock("@bitwarden/common/models/domain/symmetricCryptoKey");
|
||||
jest.mock("@bitwarden/common/models/domain/symmetric-crypto-key");
|
||||
|
||||
describe("AttachmentView", () => {
|
||||
it("fromJSON initializes nested objects", () => {
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
import { CipherType } from "@bitwarden/common/enums/cipherType";
|
||||
import { AttachmentView } from "@bitwarden/common/models/view/attachmentView";
|
||||
import { CardView } from "@bitwarden/common/models/view/cardView";
|
||||
import { CipherView } from "@bitwarden/common/models/view/cipherView";
|
||||
import { FieldView } from "@bitwarden/common/models/view/fieldView";
|
||||
import { IdentityView } from "@bitwarden/common/models/view/identityView";
|
||||
import { LoginView } from "@bitwarden/common/models/view/loginView";
|
||||
import { PasswordHistoryView } from "@bitwarden/common/models/view/passwordHistoryView";
|
||||
import { SecureNoteView } from "@bitwarden/common/models/view/secureNoteView";
|
||||
import { AttachmentView } from "@bitwarden/common/models/view/attachment.view";
|
||||
import { CardView } from "@bitwarden/common/models/view/card.view";
|
||||
import { CipherView } from "@bitwarden/common/models/view/cipher.view";
|
||||
import { FieldView } from "@bitwarden/common/models/view/field.view";
|
||||
import { IdentityView } from "@bitwarden/common/models/view/identity.view";
|
||||
import { LoginView } from "@bitwarden/common/models/view/login.view";
|
||||
import { PasswordHistoryView } from "@bitwarden/common/models/view/password-history.view";
|
||||
import { SecureNoteView } from "@bitwarden/common/models/view/secure-note.view";
|
||||
|
||||
import { mockFromJson } from "../../utils";
|
||||
|
||||
jest.mock("@bitwarden/common/models/view/loginView");
|
||||
jest.mock("@bitwarden/common/models/view/attachmentView");
|
||||
jest.mock("@bitwarden/common/models/view/fieldView");
|
||||
jest.mock("@bitwarden/common/models/view/passwordHistoryView");
|
||||
jest.mock("@bitwarden/common/models/view/login.view");
|
||||
jest.mock("@bitwarden/common/models/view/attachment.view");
|
||||
jest.mock("@bitwarden/common/models/view/field.view");
|
||||
jest.mock("@bitwarden/common/models/view/password-history.view");
|
||||
|
||||
describe("CipherView", () => {
|
||||
beforeEach(() => {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { FolderView } from "@bitwarden/common/models/view/folderView";
|
||||
import { FolderView } from "@bitwarden/common/models/view/folder.view";
|
||||
|
||||
describe("FolderView", () => {
|
||||
describe("fromJSON", () => {
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { LoginUriView } from "@bitwarden/common/models/view/loginUriView";
|
||||
import { LoginView } from "@bitwarden/common/models/view/loginView";
|
||||
import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view";
|
||||
import { LoginView } from "@bitwarden/common/models/view/login.view";
|
||||
|
||||
import { mockFromJson } from "../../utils";
|
||||
|
||||
jest.mock("@bitwarden/common/models/view/loginUriView");
|
||||
jest.mock("@bitwarden/common/models/view/login-uri.view");
|
||||
|
||||
describe("LoginView", () => {
|
||||
beforeEach(() => {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { PasswordHistoryView } from "@bitwarden/common/models/view/passwordHistoryView";
|
||||
import { PasswordHistoryView } from "@bitwarden/common/models/view/password-history.view";
|
||||
|
||||
describe("PasswordHistoryView", () => {
|
||||
it("fromJSON initializes nested objects", () => {
|
||||
|
||||
Reference in New Issue
Block a user