From 4e7103faf17a1c749d73664d0090412d6def5d82 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <trittson@bitwarden.com>
Date: Thu, 11 Apr 2024 08:47:51 +1000
Subject: [PATCH] Resolve additional merge conflicts from main

(cherry picked from commit 45f2b1cd5bb75fadd8cf54ce4f90ab9b30161b37)
---
 .../popup/components/vault/current-tab.component.ts    |  4 ++--
 apps/web/jest.config.js                                | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts
index 4f070239bea..4db61b5e29a 100644
--- a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts
+++ b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts
@@ -10,7 +10,7 @@ import { AutofillOverlayVisibility } from "@bitwarden/common/autofill/constants"
 import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/autofill-settings.service";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
@@ -77,7 +77,7 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
     private organizationService: OrganizationService,
     private vaultFilterService: VaultFilterService,
     private vaultSettingsService: VaultSettingsService,
-    private configService: ConfigService,
+    private configService: ConfigServiceAbstraction,
     protected unassignedItemsBannerService: UnassignedItemsBannerService,
   ) {}
 
diff --git a/apps/web/jest.config.js b/apps/web/jest.config.js
index cde02cd9959..f121823adee 100644
--- a/apps/web/jest.config.js
+++ b/apps/web/jest.config.js
@@ -9,7 +9,11 @@ module.exports = {
   ...sharedConfig,
   preset: "jest-preset-angular",
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
-  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/",
-  }),
+  moduleNameMapper: pathsToModuleNameMapper(
+    // lets us use @bitwarden/common/spec in web tests
+    { "@bitwarden/common/spec": ["../../libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
+    {
+      prefix: "<rootDir>/",
+    },
+  ),
 };