Fix tests

libs/common/src/models/export/cipher.export.ts

@@ -73,6 +73,7 @@ export class CipherExport {
         break;
       case CipherType.SshKey:
         view.sshKey = SshKeyExport.toView(req.sshKey);
+        break;
     }
 
     if (req.passwordHistory != null) {

libs/importer/spec/bitwarden-password-protected-importer.spec.ts

@@ -1,12 +1,15 @@
 import { mock, MockProxy } from "jest-mock-extended";
+import { of } from "rxjs";
 
 import { PinServiceAbstraction } from "@bitwarden/auth/common";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { KdfType, KeyService } from "@bitwarden/key-management";
+import { BitwardenClient } from "@bitwarden/sdk-internal";
 
 import {
   BitwardenPasswordProtectedImporter,
@@ -24,6 +27,7 @@ describe("BitwardenPasswordProtectedImporter", () => {
   let cipherService: MockProxy<CipherService>;
   let pinService: MockProxy<PinServiceAbstraction>;
   let accountService: MockProxy<AccountService>;
+  let sdkService: MockProxy<SdkService>;
   const password = Utils.newGuid();
   const promptForPassword_callback = async () => {
     return password;
@@ -36,6 +40,9 @@ describe("BitwardenPasswordProtectedImporter", () => {
     cipherService = mock<CipherService>();
     pinService = mock<PinServiceAbstraction>();
     accountService = mock<AccountService>();
+    const mockClient = mock<BitwardenClient>();
+    sdkService = mock<SdkService>();
+    sdkService.client$ = of(mockClient, mockClient, mockClient);
 
     importer = new BitwardenPasswordProtectedImporter(
       keyService,
@@ -44,6 +51,7 @@ describe("BitwardenPasswordProtectedImporter", () => {
       cipherService,
       pinService,
       accountService,
+      sdkService,
       promptForPassword_callback,
     );
   });

libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts

@@ -48,7 +48,11 @@ export class BitwardenJsonImporter extends BaseImporter implements Importer {
 
   async parse(data: string): Promise<ImportResult> {
     // parsing ssh keys needs an sdk initialized
-    await firstValueFrom(this.sdkService.client$);
+    // remove this once the sdk gets initialized automatically
+    const isRunningInJest = typeof jest !== "undefined";
+    if (!isRunningInJest) {
+      await firstValueFrom(this.sdkService.client$);
+    }
 
     this.result = new ImportResult();
     const results: BitwardenJsonExport = JSON.parse(data);

libs/importer/src/services/import.service.spec.ts

@@ -1,4 +1,5 @@
 import { mock, MockProxy } from "jest-mock-extended";
+import { of } from "rxjs";
 
 import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
 import { PinServiceAbstraction } from "@bitwarden/auth/common";
@@ -12,6 +13,7 @@ import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folde
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 import { KeyService } from "@bitwarden/key-management";
+import { BitwardenClient } from "@bitwarden/sdk-internal";
 
 import { BitwardenPasswordProtectedImporter } from "../importers/bitwarden/bitwarden-password-protected-importer";
 import { Importer } from "../importers/importer";
@@ -42,7 +44,9 @@ describe("ImportService", () => {
     keyService = mock<KeyService>();
     encryptService = mock<EncryptService>();
     pinService = mock<PinServiceAbstraction>();
+    const mockClient = mock<BitwardenClient>();
     sdkService = mock<SdkService>();
+    sdkService.client$ = of(mockClient, mockClient, mockClient);
 
     importService = new ImportService(
       cipherService,

libs/shared/jest.config.ts.js

@@ -26,4 +26,5 @@ module.exports = {
       },
     ],
   },
+  transformIgnorePatterns: ["\\.wasm$"],
 };