From 5f825e10f9677ba5288291fb22b9aac6ca08bf21 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Tue, 9 May 2023 11:27:09 +0200 Subject: [PATCH] [PM-2132] Move all specs to the src directory (#5367) --- .github/whitelist-capital-letters.txt | 8 ----- apps/cli/spec/bw.spec.ts | 3 -- .../src/services/console-log.service.spec.ts | 2 +- apps/cli/tsconfig.json | 2 +- libs/common/spec/index.ts | 3 ++ ...terceptConsole.ts => intercept-console.ts} | 0 libs/common/spec/matchers/index.ts | 1 + ...Buffer.spec.ts => to-equal-buffer.spec.ts} | 0 .../{toEqualBuffer.ts => to-equal-buffer.ts} | 0 .../models/domain/collection.spec.ts | 6 ++-- .../organization/organization.service.spec.ts | 7 ++-- .../{spec => src}/misc/sequentialize.spec.ts | 2 +- .../{spec => src}/misc/throttle.spec.ts | 4 +-- libs/common/{spec => src}/misc/utils.spec.ts | 2 +- .../src/models/domain/account-keys.spec.ts | 2 +- .../models/domain/enc-array-buffer.spec.ts} | 6 ++-- .../models/domain/enc-string.spec.ts | 13 ++++---- .../domain/symmetric-crypto-key.spec.ts} | 6 ++-- .../services/console-log.service.spec.ts} | 4 +-- .../services/crypto.service.spec.ts | 12 +++---- .../services/encrypt.service.spec.ts | 18 +++++----- .../org-domain-api.service.spec.ts | 17 +++++----- .../org-domain.service.spec.ts | 9 ++--- .../services/policy.service.spec.ts | 33 ++++++++++--------- .../services/settings.service.spec.ts | 11 ++++--- .../services/state-migration.service.spec.ts} | 13 ++++---- .../web-crypto-function.service.spec.ts} | 9 ++--- .../send/models/domain/send-access.spec.ts | 2 +- .../send/models/domain/send-file.spec.ts | 2 +- .../send/models/domain/send-text.spec.ts | 2 +- .../src/tools/send/models/domain/send.spec.ts | 2 +- .../vault/models/domain/attachment.spec.ts | 2 +- .../src/vault/models/domain/card.spec.ts | 2 +- .../src/vault/models/domain/cipher.spec.ts | 2 +- .../src/vault/models/domain/field.spec.ts | 2 +- .../src/vault/models/domain/folder.spec.ts | 2 +- .../src/vault/models/domain/identity.spec.ts | 2 +- .../src/vault/models/domain/login-uri.spec.ts | 2 +- .../src/vault/models/domain/login.spec.ts | 2 +- .../src/vault/models/domain/password.spec.ts | 2 +- .../vault/models/view/attachment.view.spec.ts | 2 +- .../src/vault/models/view/cipher.view.spec.ts | 2 +- .../src/vault/models/view/login.view.spec.ts | 2 +- libs/common/test.setup.ts | 2 +- .../services/vault-export.service.spec.ts | 2 +- .../node-crypto-function.service.spec.ts | 3 +- 46 files changed, 117 insertions(+), 115 deletions(-) delete mode 100644 apps/cli/spec/bw.spec.ts create mode 100644 libs/common/spec/index.ts rename libs/common/spec/{shared/interceptConsole.ts => intercept-console.ts} (100%) create mode 100644 libs/common/spec/matchers/index.ts rename libs/common/spec/matchers/{toEqualBuffer.spec.ts => to-equal-buffer.spec.ts} (100%) rename libs/common/spec/matchers/{toEqualBuffer.ts => to-equal-buffer.ts} (100%) rename libs/common/{spec => src/admin-console}/models/domain/collection.spec.ts (86%) rename libs/common/{spec => src/admin-console}/services/organization/organization.service.spec.ts (94%) rename libs/common/{spec => src}/misc/sequentialize.spec.ts (98%) rename libs/common/{spec => src}/misc/throttle.spec.ts (95%) rename libs/common/{spec => src}/misc/utils.spec.ts (99%) rename libs/common/{spec/models/domain/encArrayBuffer.spec.ts => src/models/domain/enc-array-buffer.spec.ts} (93%) rename libs/common/{spec => src}/models/domain/enc-string.spec.ts (93%) rename libs/common/{spec/models/domain/symmetricCryptoKey.spec.ts => src/models/domain/symmetric-crypto-key.spec.ts} (92%) rename libs/common/{spec/services/consoleLog.service.spec.ts => src/services/console-log.service.spec.ts} (90%) rename libs/common/{spec => src}/services/crypto.service.spec.ts (62%) rename libs/common/{spec => src}/services/encrypt.service.spec.ts (90%) rename libs/common/{spec => src}/services/organization-domain/org-domain-api.service.spec.ts (88%) rename libs/common/{spec => src}/services/organization-domain/org-domain.service.spec.ts (93%) rename libs/common/{spec => src}/services/policy.service.spec.ts (88%) rename libs/common/{spec => src}/services/settings.service.spec.ts (86%) rename libs/common/{spec/services/stateMigration.service.spec.ts => src/services/state-migration.service.spec.ts} (93%) rename libs/common/{spec/web/services/webCryptoFunction.service.spec.ts => src/services/web-crypto-function.service.spec.ts} (98%) rename libs/node/{spec => src}/services/node-crypto-function.service.spec.ts (99%) diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt index 0a73f96cb1..9e585d170e 100644 --- a/.github/whitelist-capital-letters.txt +++ b/.github/whitelist-capital-letters.txt @@ -25,14 +25,6 @@ ./libs/angular/src/services/theming/themeBuilder.ts ./libs/angular/src/interfaces/selectOptions.ts ./libs/components/src/stories/Introduction.stories.mdx -./libs/common/spec/web/services/webCryptoFunction.service.spec.ts -./libs/common/spec/shared/interceptConsole.ts -./libs/common/spec/models/domain/symmetricCryptoKey.spec.ts -./libs/common/spec/models/domain/encArrayBuffer.spec.ts -./libs/common/spec/matchers/toEqualBuffer.spec.ts -./libs/common/spec/matchers/toEqualBuffer.ts -./libs/common/spec/services/stateMigration.service.spec.ts -./libs/common/spec/services/consoleLog.service.spec.ts ./libs/common/src/misc/nodeUtils.ts ./libs/common/src/misc/linkedFieldOption.decorator.ts ./libs/common/src/misc/serviceUtils.ts diff --git a/apps/cli/spec/bw.spec.ts b/apps/cli/spec/bw.spec.ts deleted file mode 100644 index 9ce5fc2cd1..0000000000 --- a/apps/cli/spec/bw.spec.ts +++ /dev/null @@ -1,3 +0,0 @@ -describe("bw", () => { - test.todo("is a placeholder test"); -}); diff --git a/apps/cli/src/services/console-log.service.spec.ts b/apps/cli/src/services/console-log.service.spec.ts index d629b7c1c0..10a0ad8cca 100644 --- a/apps/cli/src/services/console-log.service.spec.ts +++ b/apps/cli/src/services/console-log.service.spec.ts @@ -1,4 +1,4 @@ -import { interceptConsole, restoreConsole } from "@bitwarden/common/spec/shared/interceptConsole"; +import { interceptConsole, restoreConsole } from "@bitwarden/common/spec"; import { ConsoleLogService } from "./console-log.service"; diff --git a/apps/cli/tsconfig.json b/apps/cli/tsconfig.json index d516b5ee6c..420496ad93 100644 --- a/apps/cli/tsconfig.json +++ b/apps/cli/tsconfig.json @@ -12,7 +12,7 @@ "sourceMap": true, "baseUrl": ".", "paths": { - "@bitwarden/common/spec/*": ["../../libs/common/spec/*"], + "@bitwarden/common/spec": ["../../libs/common/spec"], "@bitwarden/common/*": ["../../libs/common/src/*"], "@bitwarden/importer": ["../../libs/importer/src"], "@bitwarden/exporter/*": ["../../libs/exporter/src/*"], diff --git a/libs/common/spec/index.ts b/libs/common/spec/index.ts new file mode 100644 index 0000000000..494b31b521 --- /dev/null +++ b/libs/common/spec/index.ts @@ -0,0 +1,3 @@ +export * from "./utils"; +export * from "./intercept-console"; +export * from "./matchers"; diff --git a/libs/common/spec/shared/interceptConsole.ts b/libs/common/spec/intercept-console.ts similarity index 100% rename from libs/common/spec/shared/interceptConsole.ts rename to libs/common/spec/intercept-console.ts diff --git a/libs/common/spec/matchers/index.ts b/libs/common/spec/matchers/index.ts new file mode 100644 index 0000000000..59f6409fef --- /dev/null +++ b/libs/common/spec/matchers/index.ts @@ -0,0 +1 @@ +export * from "./to-equal-buffer"; diff --git a/libs/common/spec/matchers/toEqualBuffer.spec.ts b/libs/common/spec/matchers/to-equal-buffer.spec.ts similarity index 100% rename from libs/common/spec/matchers/toEqualBuffer.spec.ts rename to libs/common/spec/matchers/to-equal-buffer.spec.ts diff --git a/libs/common/spec/matchers/toEqualBuffer.ts b/libs/common/spec/matchers/to-equal-buffer.ts similarity index 100% rename from libs/common/spec/matchers/toEqualBuffer.ts rename to libs/common/spec/matchers/to-equal-buffer.ts diff --git a/libs/common/spec/models/domain/collection.spec.ts b/libs/common/src/admin-console/models/domain/collection.spec.ts similarity index 86% rename from libs/common/spec/models/domain/collection.spec.ts rename to libs/common/src/admin-console/models/domain/collection.spec.ts index 6f3a5bcfec..977a5e53cf 100644 --- a/libs/common/spec/models/domain/collection.spec.ts +++ b/libs/common/src/admin-console/models/domain/collection.spec.ts @@ -1,7 +1,7 @@ -import { CollectionData } from "@bitwarden/common/admin-console/models/data/collection.data"; -import { Collection } from "@bitwarden/common/admin-console/models/domain/collection"; +import { mockEnc } from "../../../../spec"; +import { CollectionData } from "../data/collection.data"; -import { mockEnc } from "../../utils"; +import { Collection } from "./collection"; describe("Collection", () => { let data: CollectionData; diff --git a/libs/common/spec/services/organization/organization.service.spec.ts b/libs/common/src/admin-console/services/organization/organization.service.spec.ts similarity index 94% rename from libs/common/spec/services/organization/organization.service.spec.ts rename to libs/common/src/admin-console/services/organization/organization.service.spec.ts index df875d7748..3947df9707 100644 --- a/libs/common/spec/services/organization/organization.service.spec.ts +++ b/libs/common/src/admin-console/services/organization/organization.service.spec.ts @@ -1,9 +1,10 @@ import { MockProxy, mock, any, mockClear } from "jest-mock-extended"; import { BehaviorSubject, firstValueFrom } from "rxjs"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { OrganizationData } from "@bitwarden/common/admin-console/models/data/organization.data"; -import { OrganizationService } from "@bitwarden/common/admin-console/services/organization/organization.service"; +import { StateService } from "../../../abstractions/state.service"; +import { OrganizationData } from "../../models/data/organization.data"; + +import { OrganizationService } from "./organization.service"; describe("Organization Service", () => { let organizationService: OrganizationService; diff --git a/libs/common/spec/misc/sequentialize.spec.ts b/libs/common/src/misc/sequentialize.spec.ts similarity index 98% rename from libs/common/spec/misc/sequentialize.spec.ts rename to libs/common/src/misc/sequentialize.spec.ts index 77f10afb9a..1dc5f2b2c2 100644 --- a/libs/common/spec/misc/sequentialize.spec.ts +++ b/libs/common/src/misc/sequentialize.spec.ts @@ -1,4 +1,4 @@ -import { sequentialize } from "@bitwarden/common/misc/sequentialize"; +import { sequentialize } from "./sequentialize"; describe("sequentialize decorator", () => { it("should call the function once", async () => { diff --git a/libs/common/spec/misc/throttle.spec.ts b/libs/common/src/misc/throttle.spec.ts similarity index 95% rename from libs/common/spec/misc/throttle.spec.ts rename to libs/common/src/misc/throttle.spec.ts index 27572c6e04..0947d4af66 100644 --- a/libs/common/spec/misc/throttle.spec.ts +++ b/libs/common/src/misc/throttle.spec.ts @@ -1,5 +1,5 @@ -import { sequentialize } from "@bitwarden/common/misc/sequentialize"; -import { throttle } from "@bitwarden/common/misc/throttle"; +import { sequentialize } from "./sequentialize"; +import { throttle } from "./throttle"; describe("throttle decorator", () => { it("should call the function once at a time", async () => { diff --git a/libs/common/spec/misc/utils.spec.ts b/libs/common/src/misc/utils.spec.ts similarity index 99% rename from libs/common/spec/misc/utils.spec.ts rename to libs/common/src/misc/utils.spec.ts index 52dbf6ad94..5f7d63fee2 100644 --- a/libs/common/spec/misc/utils.spec.ts +++ b/libs/common/src/misc/utils.spec.ts @@ -1,6 +1,6 @@ import * as path from "path"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { Utils } from "./utils"; describe("Utils Service", () => { describe("getDomain", () => { diff --git a/libs/common/src/models/domain/account-keys.spec.ts b/libs/common/src/models/domain/account-keys.spec.ts index 8dac20d4eb..bacfac25a6 100644 --- a/libs/common/src/models/domain/account-keys.spec.ts +++ b/libs/common/src/models/domain/account-keys.spec.ts @@ -1,4 +1,4 @@ -import { makeStaticByteArray } from "../../../spec/utils"; +import { makeStaticByteArray } from "../../../spec"; import { Utils } from "../../misc/utils"; import { AccountKeys, EncryptionPair } from "./account"; diff --git a/libs/common/spec/models/domain/encArrayBuffer.spec.ts b/libs/common/src/models/domain/enc-array-buffer.spec.ts similarity index 93% rename from libs/common/spec/models/domain/encArrayBuffer.spec.ts rename to libs/common/src/models/domain/enc-array-buffer.spec.ts index 03b02b0ee4..2a2052484f 100644 --- a/libs/common/spec/models/domain/encArrayBuffer.spec.ts +++ b/libs/common/src/models/domain/enc-array-buffer.spec.ts @@ -1,7 +1,7 @@ -import { EncryptionType } from "@bitwarden/common/enums"; -import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; +import { makeStaticByteArray } from "../../../spec"; +import { EncryptionType } from "../../enums"; -import { makeStaticByteArray } from "../../utils"; +import { EncArrayBuffer } from "./enc-array-buffer"; describe("encArrayBuffer", () => { describe("parses the buffer", () => { diff --git a/libs/common/spec/models/domain/enc-string.spec.ts b/libs/common/src/models/domain/enc-string.spec.ts similarity index 93% rename from libs/common/spec/models/domain/enc-string.spec.ts rename to libs/common/src/models/domain/enc-string.spec.ts index 62e7434511..08ff9c145d 100644 --- a/libs/common/spec/models/domain/enc-string.spec.ts +++ b/libs/common/src/models/domain/enc-string.spec.ts @@ -2,12 +2,13 @@ import { Substitute, Arg } from "@fluffy-spoon/substitute"; import { mock, MockProxy } from "jest-mock-extended"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; -import { EncryptionType } from "@bitwarden/common/enums"; -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 { CryptoService } from "../../abstractions/crypto.service"; +import { EncryptService } from "../../abstractions/encrypt.service"; +import { EncryptionType } from "../../enums"; +import { ContainerService } from "../../services/container.service"; + +import { EncString } from "./enc-string"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; describe("EncString", () => { afterEach(() => { diff --git a/libs/common/spec/models/domain/symmetricCryptoKey.spec.ts b/libs/common/src/models/domain/symmetric-crypto-key.spec.ts similarity index 92% rename from libs/common/spec/models/domain/symmetricCryptoKey.spec.ts rename to libs/common/src/models/domain/symmetric-crypto-key.spec.ts index ddd1cb5b70..c371008bb3 100644 --- a/libs/common/spec/models/domain/symmetricCryptoKey.spec.ts +++ b/libs/common/src/models/domain/symmetric-crypto-key.spec.ts @@ -1,7 +1,7 @@ -import { EncryptionType } from "@bitwarden/common/enums"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; +import { makeStaticByteArray } from "../../../spec"; +import { EncryptionType } from "../../enums"; -import { makeStaticByteArray } from "../../utils"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; describe("SymmetricCryptoKey", () => { it("errors if no key", () => { diff --git a/libs/common/spec/services/consoleLog.service.spec.ts b/libs/common/src/services/console-log.service.spec.ts similarity index 90% rename from libs/common/spec/services/consoleLog.service.spec.ts rename to libs/common/src/services/console-log.service.spec.ts index 3c961487f3..0b14ac559b 100644 --- a/libs/common/spec/services/consoleLog.service.spec.ts +++ b/libs/common/src/services/console-log.service.spec.ts @@ -1,6 +1,6 @@ -import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; +import { interceptConsole, restoreConsole } from "../../spec"; -import { interceptConsole, restoreConsole } from "../shared/interceptConsole"; +import { ConsoleLogService } from "./consoleLog.service"; let caughtMessage: any; diff --git a/libs/common/spec/services/crypto.service.spec.ts b/libs/common/src/services/crypto.service.spec.ts similarity index 62% rename from libs/common/spec/services/crypto.service.spec.ts rename to libs/common/src/services/crypto.service.spec.ts index 6490500858..cc0d3ba212 100644 --- a/libs/common/spec/services/crypto.service.spec.ts +++ b/libs/common/src/services/crypto.service.spec.ts @@ -1,11 +1,11 @@ import { mock, mockReset } from "jest-mock-extended"; -import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { CryptoService } from "@bitwarden/common/services/crypto.service"; +import { CryptoFunctionService } from "../abstractions/cryptoFunction.service"; +import { EncryptService } from "../abstractions/encrypt.service"; +import { LogService } from "../abstractions/log.service"; +import { PlatformUtilsService } from "../abstractions/platformUtils.service"; +import { StateService } from "../abstractions/state.service"; +import { CryptoService } from "../services/crypto.service"; describe("cryptoService", () => { let cryptoService: CryptoService; diff --git a/libs/common/spec/services/encrypt.service.spec.ts b/libs/common/src/services/encrypt.service.spec.ts similarity index 90% rename from libs/common/spec/services/encrypt.service.spec.ts rename to libs/common/src/services/encrypt.service.spec.ts index 712ec04ebe..8df3c170bf 100644 --- a/libs/common/spec/services/encrypt.service.spec.ts +++ b/libs/common/src/services/encrypt.service.spec.ts @@ -1,15 +1,15 @@ import { mockReset, mock } from "jest-mock-extended"; -import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { EncryptionType } from "@bitwarden/common/enums"; -import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { EncryptServiceImplementation } from "@bitwarden/common/services/cryptography/encrypt.service.implementation"; +import { makeStaticByteArray } from "../../spec"; +import { CryptoFunctionService } from "../abstractions/cryptoFunction.service"; +import { LogService } from "../abstractions/log.service"; +import { EncryptionType } from "../enums"; +import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; +import { EncString } from "../models/domain/enc-string"; +import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; +import { CsprngArray } from "../types/csprng"; -import { CsprngArray } from "../../src/types/csprng"; -import { makeStaticByteArray } from "../utils"; +import { EncryptServiceImplementation } from "./cryptography/encrypt.service.implementation"; describe("EncryptService", () => { const cryptoFunctionService = mock(); diff --git a/libs/common/spec/services/organization-domain/org-domain-api.service.spec.ts b/libs/common/src/services/organization-domain/org-domain-api.service.spec.ts similarity index 88% rename from libs/common/spec/services/organization-domain/org-domain-api.service.spec.ts rename to libs/common/src/services/organization-domain/org-domain-api.service.spec.ts index e4dc94728f..7fa6ed7855 100644 --- a/libs/common/spec/services/organization-domain/org-domain-api.service.spec.ts +++ b/libs/common/src/services/organization-domain/org-domain-api.service.spec.ts @@ -1,14 +1,15 @@ import { mock } from "jest-mock-extended"; import { lastValueFrom } from "rxjs"; -import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationDomainSsoDetailsResponse } from "@bitwarden/common/abstractions/organization-domain/responses/organization-domain-sso-details.response"; -import { OrganizationDomainResponse } from "@bitwarden/common/abstractions/organization-domain/responses/organization-domain.response"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { OrgDomainApiService } from "@bitwarden/common/services/organization-domain/org-domain-api.service"; -import { OrgDomainService } from "@bitwarden/common/services/organization-domain/org-domain.service"; -import { OrganizationDomainSsoDetailsRequest } from "@bitwarden/common/services/organization-domain/requests/organization-domain-sso-details.request"; +import { ApiService } from "../../abstractions/api.service"; +import { I18nService } from "../../abstractions/i18n.service"; +import { OrganizationDomainSsoDetailsResponse } from "../../abstractions/organization-domain/responses/organization-domain-sso-details.response"; +import { OrganizationDomainResponse } from "../../abstractions/organization-domain/responses/organization-domain.response"; +import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; + +import { OrgDomainApiService } from "./org-domain-api.service"; +import { OrgDomainService } from "./org-domain.service"; +import { OrganizationDomainSsoDetailsRequest } from "./requests/organization-domain-sso-details.request"; const mockedGetAllByOrgIdResponse: any = { data: [ diff --git a/libs/common/spec/services/organization-domain/org-domain.service.spec.ts b/libs/common/src/services/organization-domain/org-domain.service.spec.ts similarity index 93% rename from libs/common/spec/services/organization-domain/org-domain.service.spec.ts rename to libs/common/src/services/organization-domain/org-domain.service.spec.ts index e4e61d4e22..3bc8ae770f 100644 --- a/libs/common/spec/services/organization-domain/org-domain.service.spec.ts +++ b/libs/common/src/services/organization-domain/org-domain.service.spec.ts @@ -1,10 +1,11 @@ import { mock, mockReset } from "jest-mock-extended"; import { lastValueFrom } from "rxjs"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationDomainResponse } from "@bitwarden/common/abstractions/organization-domain/responses/organization-domain.response"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { OrgDomainService } from "@bitwarden/common/services/organization-domain/org-domain.service"; +import { I18nService } from "../../abstractions/i18n.service"; +import { OrganizationDomainResponse } from "../../abstractions/organization-domain/responses/organization-domain.response"; +import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; + +import { OrgDomainService } from "./org-domain.service"; const mockedUnverifiedDomainServerResponse = { creationDate: "2022-12-13T23:16:43.7066667Z", diff --git a/libs/common/spec/services/policy.service.spec.ts b/libs/common/src/services/policy.service.spec.ts similarity index 88% rename from libs/common/spec/services/policy.service.spec.ts rename to libs/common/src/services/policy.service.spec.ts index 61ab3dcb07..b806a4502c 100644 --- a/libs/common/spec/services/policy.service.spec.ts +++ b/libs/common/src/services/policy.service.spec.ts @@ -2,22 +2,23 @@ import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; import { BehaviorSubject, firstValueFrom } from "rxjs"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; -import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; -import { OrganizationUserStatusType, PolicyType } from "@bitwarden/common/admin-console/enums"; -import { PermissionsApi } from "@bitwarden/common/admin-console/models/api/permissions.api"; -import { OrganizationData } from "@bitwarden/common/admin-console/models/data/organization.data"; -import { PolicyData } from "@bitwarden/common/admin-console/models/data/policy.data"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options"; -import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; -import { ResetPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/reset-password-policy-options"; -import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response"; -import { PolicyService } from "@bitwarden/common/admin-console/services/policy/policy.service"; -import { ListResponse } from "@bitwarden/common/models/response/list.response"; -import { ContainerService } from "@bitwarden/common/services/container.service"; -import { StateService } from "@bitwarden/common/services/state.service"; +import { CryptoService } from "../abstractions/crypto.service"; +import { EncryptService } from "../abstractions/encrypt.service"; +import { OrganizationService } from "../admin-console/abstractions/organization/organization.service.abstraction"; +import { OrganizationUserStatusType, PolicyType } from "../admin-console/enums"; +import { PermissionsApi } from "../admin-console/models/api/permissions.api"; +import { OrganizationData } from "../admin-console/models/data/organization.data"; +import { PolicyData } from "../admin-console/models/data/policy.data"; +import { MasterPasswordPolicyOptions } from "../admin-console/models/domain/master-password-policy-options"; +import { Organization } from "../admin-console/models/domain/organization"; +import { Policy } from "../admin-console/models/domain/policy"; +import { ResetPasswordPolicyOptions } from "../admin-console/models/domain/reset-password-policy-options"; +import { PolicyResponse } from "../admin-console/models/response/policy.response"; +import { PolicyService } from "../admin-console/services/policy/policy.service"; +import { ListResponse } from "../models/response/list.response"; + +import { ContainerService } from "./container.service"; +import { StateService } from "./state.service"; describe("PolicyService", () => { let policyService: PolicyService; diff --git a/libs/common/spec/services/settings.service.spec.ts b/libs/common/src/services/settings.service.spec.ts similarity index 86% rename from libs/common/spec/services/settings.service.spec.ts rename to libs/common/src/services/settings.service.spec.ts index 7ef088798e..1f23252e24 100644 --- a/libs/common/spec/services/settings.service.spec.ts +++ b/libs/common/src/services/settings.service.spec.ts @@ -2,11 +2,12 @@ import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; import { BehaviorSubject, firstValueFrom } from "rxjs"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; -import { ContainerService } from "@bitwarden/common/services/container.service"; -import { SettingsService } from "@bitwarden/common/services/settings.service"; -import { StateService } from "@bitwarden/common/services/state.service"; +import { CryptoService } from "../abstractions/crypto.service"; +import { EncryptService } from "../abstractions/encrypt.service"; + +import { ContainerService } from "./container.service"; +import { SettingsService } from "./settings.service"; +import { StateService } from "./state.service"; describe("SettingsService", () => { let settingsService: SettingsService; diff --git a/libs/common/spec/services/stateMigration.service.spec.ts b/libs/common/src/services/state-migration.service.spec.ts similarity index 93% rename from libs/common/spec/services/stateMigration.service.spec.ts rename to libs/common/src/services/state-migration.service.spec.ts index f94fa58c46..13727c96dd 100644 --- a/libs/common/spec/services/stateMigration.service.spec.ts +++ b/libs/common/src/services/state-migration.service.spec.ts @@ -2,12 +2,13 @@ import { Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; import { MockProxy, any, mock } from "jest-mock-extended"; -import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service"; -import { StateVersion } from "@bitwarden/common/enums"; -import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { Account } from "@bitwarden/common/models/domain/account"; -import { GlobalState } from "@bitwarden/common/models/domain/global-state"; -import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service"; +import { AbstractStorageService } from "../abstractions/storage.service"; +import { StateVersion } from "../enums"; +import { StateFactory } from "../factories/stateFactory"; +import { Account } from "../models/domain/account"; +import { GlobalState } from "../models/domain/global-state"; + +import { StateMigrationService } from "./stateMigration.service"; const userId = "USER_ID"; diff --git a/libs/common/spec/web/services/webCryptoFunction.service.spec.ts b/libs/common/src/services/web-crypto-function.service.spec.ts similarity index 98% rename from libs/common/spec/web/services/webCryptoFunction.service.spec.ts rename to libs/common/src/services/web-crypto-function.service.spec.ts index cc2dd95234..519ba2eddb 100644 --- a/libs/common/spec/web/services/webCryptoFunction.service.spec.ts +++ b/libs/common/src/services/web-crypto-function.service.spec.ts @@ -1,10 +1,11 @@ // eslint-disable-next-line no-restricted-imports import { Substitute } from "@fluffy-spoon/substitute"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service"; +import { PlatformUtilsService } from "../abstractions/platformUtils.service"; +import { Utils } from "../misc/utils"; +import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; + +import { WebCryptoFunctionService } from "./webCryptoFunction.service"; const RsaPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl0Vawl/toXzkEvB82FEtqHP" + diff --git a/libs/common/src/tools/send/models/domain/send-access.spec.ts b/libs/common/src/tools/send/models/domain/send-access.spec.ts index 3935cdf67a..8c59bc51ed 100644 --- a/libs/common/src/tools/send/models/domain/send-access.spec.ts +++ b/libs/common/src/tools/send/models/domain/send-access.spec.ts @@ -1,7 +1,7 @@ // eslint-disable-next-line no-restricted-imports import { Substitute, Arg } from "@fluffy-spoon/substitute"; -import { mockEnc } from "../../../../../spec/utils"; +import { mockEnc } from "../../../../../spec"; import { SendType } from "../../enums/send-type"; import { SendAccessResponse } from "../response/send-access.response"; diff --git a/libs/common/src/tools/send/models/domain/send-file.spec.ts b/libs/common/src/tools/send/models/domain/send-file.spec.ts index 8e0381434c..44a84cdc63 100644 --- a/libs/common/src/tools/send/models/domain/send-file.spec.ts +++ b/libs/common/src/tools/send/models/domain/send-file.spec.ts @@ -1,4 +1,4 @@ -import { mockEnc } from "../../../../../spec/utils"; +import { mockEnc } from "../../../../../spec"; import { SendFileData } from "../data/send-file.data"; import { SendFile } from "./send-file"; diff --git a/libs/common/src/tools/send/models/domain/send-text.spec.ts b/libs/common/src/tools/send/models/domain/send-text.spec.ts index 7285447d8a..6af143ec59 100644 --- a/libs/common/src/tools/send/models/domain/send-text.spec.ts +++ b/libs/common/src/tools/send/models/domain/send-text.spec.ts @@ -1,4 +1,4 @@ -import { mockEnc } from "../../../../../spec/utils"; +import { mockEnc } from "../../../../../spec"; import { SendTextData } from "../data/send-text.data"; import { SendText } from "./send-text"; diff --git a/libs/common/src/tools/send/models/domain/send.spec.ts b/libs/common/src/tools/send/models/domain/send.spec.ts index 4497551e04..8bd832a501 100644 --- a/libs/common/src/tools/send/models/domain/send.spec.ts +++ b/libs/common/src/tools/send/models/domain/send.spec.ts @@ -1,7 +1,7 @@ // eslint-disable-next-line no-restricted-imports import { Substitute, Arg, SubstituteOf } from "@fluffy-spoon/substitute"; -import { makeStaticByteArray, mockEnc } from "../../../../../spec/utils"; +import { makeStaticByteArray, mockEnc } from "../../../../../spec"; import { CryptoService } from "../../../../abstractions/crypto.service"; import { EncryptService } from "../../../../abstractions/encrypt.service"; import { EncString } from "../../../../models/domain/enc-string"; diff --git a/libs/common/src/vault/models/domain/attachment.spec.ts b/libs/common/src/vault/models/domain/attachment.spec.ts index e061569f02..c1397ad3ca 100644 --- a/libs/common/src/vault/models/domain/attachment.spec.ts +++ b/libs/common/src/vault/models/domain/attachment.spec.ts @@ -1,6 +1,6 @@ import { mock, MockProxy } from "jest-mock-extended"; -import { makeStaticByteArray, mockEnc, mockFromJson } from "../../../../spec/utils"; +import { makeStaticByteArray, mockEnc, mockFromJson } from "../../../../spec"; import { CryptoService } from "../../../abstractions/crypto.service"; import { EncryptService } from "../../../abstractions/encrypt.service"; import { EncString } from "../../../models/domain/enc-string"; diff --git a/libs/common/src/vault/models/domain/card.spec.ts b/libs/common/src/vault/models/domain/card.spec.ts index a1556fefc5..a80d57a587 100644 --- a/libs/common/src/vault/models/domain/card.spec.ts +++ b/libs/common/src/vault/models/domain/card.spec.ts @@ -1,4 +1,4 @@ -import { mockEnc, mockFromJson } from "../../../../spec/utils"; +import { mockEnc, mockFromJson } from "../../../../spec"; import { EncString } from "../../../models/domain/enc-string"; import { CardData } from "../../../vault/models/data/card.data"; import { Card } from "../../models/domain/card"; diff --git a/libs/common/src/vault/models/domain/cipher.spec.ts b/libs/common/src/vault/models/domain/cipher.spec.ts index c484af26d3..b23b15e3ef 100644 --- a/libs/common/src/vault/models/domain/cipher.spec.ts +++ b/libs/common/src/vault/models/domain/cipher.spec.ts @@ -2,7 +2,7 @@ import { Substitute, Arg } from "@fluffy-spoon/substitute"; import { Jsonify } from "type-fest"; -import { mockEnc, mockFromJson } from "../../../../spec/utils"; +import { mockEnc, mockFromJson } from "../../../../spec"; import { FieldType, SecureNoteType, UriMatchType } from "../../../enums"; import { EncString } from "../../../models/domain/enc-string"; import { InitializerKey } from "../../../services/cryptography/initializer-key"; diff --git a/libs/common/src/vault/models/domain/field.spec.ts b/libs/common/src/vault/models/domain/field.spec.ts index 3f07f6905c..0754c0b3b6 100644 --- a/libs/common/src/vault/models/domain/field.spec.ts +++ b/libs/common/src/vault/models/domain/field.spec.ts @@ -1,4 +1,4 @@ -import { mockEnc, mockFromJson } from "../../../../spec/utils"; +import { mockEnc, mockFromJson } from "../../../../spec"; import { FieldType } from "../../../enums"; import { EncString } from "../../../models/domain/enc-string"; import { FieldData } from "../../models/data/field.data"; diff --git a/libs/common/src/vault/models/domain/folder.spec.ts b/libs/common/src/vault/models/domain/folder.spec.ts index cc08518a90..dc8b490e72 100644 --- a/libs/common/src/vault/models/domain/folder.spec.ts +++ b/libs/common/src/vault/models/domain/folder.spec.ts @@ -1,4 +1,4 @@ -import { mockEnc, mockFromJson } from "../../../../spec/utils"; +import { mockEnc, mockFromJson } from "../../../../spec"; import { EncString } from "../../../models/domain/enc-string"; import { FolderData } from "../../models/data/folder.data"; import { Folder } from "../../models/domain/folder"; diff --git a/libs/common/src/vault/models/domain/identity.spec.ts b/libs/common/src/vault/models/domain/identity.spec.ts index 8b53ec016f..a3fdbd580b 100644 --- a/libs/common/src/vault/models/domain/identity.spec.ts +++ b/libs/common/src/vault/models/domain/identity.spec.ts @@ -1,4 +1,4 @@ -import { mockEnc, mockFromJson } from "../../../../spec/utils"; +import { mockEnc, mockFromJson } from "../../../../spec"; import { EncString } from "../../../models/domain/enc-string"; import { IdentityData } from "../../models/data/identity.data"; import { Identity } from "../../models/domain/identity"; diff --git a/libs/common/src/vault/models/domain/login-uri.spec.ts b/libs/common/src/vault/models/domain/login-uri.spec.ts index 70fb24360f..28378e73c4 100644 --- a/libs/common/src/vault/models/domain/login-uri.spec.ts +++ b/libs/common/src/vault/models/domain/login-uri.spec.ts @@ -1,6 +1,6 @@ import { Jsonify } from "type-fest"; -import { mockEnc, mockFromJson } from "../../../../spec/utils"; +import { mockEnc, mockFromJson } from "../../../../spec"; import { UriMatchType } from "../../../enums"; import { EncString } from "../../../models/domain/enc-string"; import { LoginUriData } from "../data/login-uri.data"; diff --git a/libs/common/src/vault/models/domain/login.spec.ts b/libs/common/src/vault/models/domain/login.spec.ts index 654c66f8cf..4cc774bdc3 100644 --- a/libs/common/src/vault/models/domain/login.spec.ts +++ b/libs/common/src/vault/models/domain/login.spec.ts @@ -1,7 +1,7 @@ // eslint-disable-next-line no-restricted-imports import { Substitute, Arg } from "@fluffy-spoon/substitute"; -import { mockEnc, mockFromJson } from "../../../../spec/utils"; +import { mockEnc, mockFromJson } from "../../../../spec"; import { UriMatchType } from "../../../enums"; import { EncString } from "../../../models/domain/enc-string"; import { LoginData } from "../../models/data/login.data"; diff --git a/libs/common/src/vault/models/domain/password.spec.ts b/libs/common/src/vault/models/domain/password.spec.ts index 6128e37f28..4e42904ad9 100644 --- a/libs/common/src/vault/models/domain/password.spec.ts +++ b/libs/common/src/vault/models/domain/password.spec.ts @@ -1,4 +1,4 @@ -import { mockEnc, mockFromJson } from "../../../../spec/utils"; +import { mockEnc, mockFromJson } from "../../../../spec"; import { EncString } from "../../../models/domain/enc-string"; import { PasswordHistoryData } from "../../models/data/password-history.data"; import { Password } from "../../models/domain/password"; diff --git a/libs/common/src/vault/models/view/attachment.view.spec.ts b/libs/common/src/vault/models/view/attachment.view.spec.ts index 7900465b03..dc81fe3f78 100644 --- a/libs/common/src/vault/models/view/attachment.view.spec.ts +++ b/libs/common/src/vault/models/view/attachment.view.spec.ts @@ -1,4 +1,4 @@ -import { mockFromJson } from "../../../../spec/utils"; +import { mockFromJson } from "../../../../spec"; import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; import { AttachmentView } from "./attachment.view"; diff --git a/libs/common/src/vault/models/view/cipher.view.spec.ts b/libs/common/src/vault/models/view/cipher.view.spec.ts index a2de5b4a3a..3ab2706d35 100644 --- a/libs/common/src/vault/models/view/cipher.view.spec.ts +++ b/libs/common/src/vault/models/view/cipher.view.spec.ts @@ -1,4 +1,4 @@ -import { mockFromJson } from "../../../../spec/utils"; +import { mockFromJson } from "../../../../spec"; import { CipherType } from "../../enums/cipher-type"; import { AttachmentView } from "./attachment.view"; diff --git a/libs/common/src/vault/models/view/login.view.spec.ts b/libs/common/src/vault/models/view/login.view.spec.ts index 92beb18bd6..728a62deb9 100644 --- a/libs/common/src/vault/models/view/login.view.spec.ts +++ b/libs/common/src/vault/models/view/login.view.spec.ts @@ -1,4 +1,4 @@ -import { mockFromJson } from "../../../../spec/utils"; +import { mockFromJson } from "../../../../spec"; import { LoginUriView } from "./login-uri.view"; import { LoginView } from "./login.view"; diff --git a/libs/common/test.setup.ts b/libs/common/test.setup.ts index 17254ea34c..dfcf7c8610 100644 --- a/libs/common/test.setup.ts +++ b/libs/common/test.setup.ts @@ -1,6 +1,6 @@ import { webcrypto } from "crypto"; -import { toEqualBuffer } from "./spec/matchers/toEqualBuffer"; +import { toEqualBuffer } from "./spec"; Object.defineProperty(window, "crypto", { value: webcrypto, diff --git a/libs/exporter/src/vault-export/services/vault-export.service.spec.ts b/libs/exporter/src/vault-export/services/vault-export.service.spec.ts index c5947b579d..0649107a44 100644 --- a/libs/exporter/src/vault-export/services/vault-export.service.spec.ts +++ b/libs/exporter/src/vault-export/services/vault-export.service.spec.ts @@ -20,7 +20,7 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; -import { BuildTestObject, GetUniqueString } from "../../../../common/spec/utils"; +import { BuildTestObject, GetUniqueString } from "../../../../common/spec"; import { VaultExportService } from "./vault-export.service"; diff --git a/libs/node/spec/services/node-crypto-function.service.spec.ts b/libs/node/src/services/node-crypto-function.service.spec.ts similarity index 99% rename from libs/node/spec/services/node-crypto-function.service.spec.ts rename to libs/node/src/services/node-crypto-function.service.spec.ts index 1dbdcfb93a..8e2aa768f9 100644 --- a/libs/node/spec/services/node-crypto-function.service.spec.ts +++ b/libs/node/src/services/node-crypto-function.service.spec.ts @@ -1,6 +1,7 @@ import { Utils } from "@bitwarden/common/misc/utils"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { NodeCryptoFunctionService } from "@bitwarden/node/services/node-crypto-function.service"; + +import { NodeCryptoFunctionService } from "./node-crypto-function.service"; const RsaPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl0Vawl/toXzkEvB82FEtqHP" +