move preloaded english i18n module to shared lib

apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.spec.ts

@@ -20,8 +20,7 @@ import {
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
 import { SelectItemView } from "@bitwarden/components/src/multi-select/models/select-item-view";
-
-import { PreloadedEnglishI18nModule } from "../../../../../core/tests";
+import { PreloadedEnglishI18nModule } from "@bitwarden/test-helpers";
 
 import { AccessSelectorComponent, PermissionMode } from "./access-selector.component";
 import { AccessItemType, CollectionPermission } from "./access-selector.models";

apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.stories.ts

@@ -13,8 +13,7 @@ import {
   TableModule,
   TabsModule,
 } from "@bitwarden/components";
-
-import { PreloadedEnglishI18nModule } from "../../../../../core/tests";
+import { PreloadedEnglishI18nModule } from "@bitwarden/test-helpers";
 
 import { AccessSelectorComponent, PermissionMode } from "./access-selector.component";
 import { AccessItemType, AccessItemValue, CollectionPermission } from "./access-selector.models";

apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.stories.ts

@@ -5,8 +5,7 @@ import { of } from "rxjs";
 import { SYSTEM_THEME_OBSERVABLE } from "@bitwarden/angular/services/injection-tokens";
 import { ThemeTypes } from "@bitwarden/common/platform/enums";
 import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
-
-import { PreloadedEnglishI18nModule } from "../../../../../../core/tests";
+import { PreloadedEnglishI18nModule } from "@bitwarden/test-helpers";
 
 import { IntegrationCardComponent } from "./integration-card.component";
 

apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.stories.ts

@@ -6,8 +6,8 @@ import { SYSTEM_THEME_OBSERVABLE } from "@bitwarden/angular/services/injection-t
 import { IntegrationType } from "@bitwarden/common/enums";
 import { ThemeTypes } from "@bitwarden/common/platform/enums";
 import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
+import { PreloadedEnglishI18nModule } from "@bitwarden/test-helpers";
 
-import { PreloadedEnglishI18nModule } from "../../../../../../core/tests";
 import { IntegrationCardComponent } from "../integration-card/integration-card.component";
 import { IntegrationGridComponent } from "../integration-grid/integration-grid.component";
 

apps/web/src/app/auth/settings/account/danger-zone.stories.ts

@@ -5,8 +5,7 @@ import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/an
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { ButtonModule } from "@bitwarden/components";
-
-import { PreloadedEnglishI18nModule } from "../../../core/tests";
+import { PreloadedEnglishI18nModule } from "@bitwarden/test-helpers";
 
 import { DangerZoneComponent } from "./danger-zone.component";
 

apps/web/src/app/shared/components/onboarding/onboarding.stories.ts

@@ -5,8 +5,7 @@ import { delay, of, startWith } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { LinkModule, IconModule, ProgressModule } from "@bitwarden/components";
-
-import { PreloadedEnglishI18nModule } from "../../../core/tests";
+import { PreloadedEnglishI18nModule } from "@bitwarden/test-helpers";
 
 import { OnboardingTaskComponent } from "./onboarding-task.component";
 import { OnboardingComponent } from "./onboarding.component";

apps/web/src/app/tools/reports/shared/report-card/report-card.stories.ts

@@ -4,8 +4,8 @@ import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/an
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { BadgeModule, IconModule } from "@bitwarden/components";
+import { PreloadedEnglishI18nModule } from "@bitwarden/test-helpers";
 
-import { PreloadedEnglishI18nModule } from "../../../../core/tests";
 import { PremiumBadgeComponent } from "../../../../vault/components/premium-badge.component";
 import { ReportVariant } from "../models/report-variant";
 

apps/web/src/app/tools/reports/shared/report-list/report-list.stories.ts

@@ -4,8 +4,8 @@ import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/an
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { BadgeModule, IconModule } from "@bitwarden/components";
+import { PreloadedEnglishI18nModule } from "@bitwarden/test-helpers";
 
-import { PreloadedEnglishI18nModule } from "../../../../core/tests";
 import { PremiumBadgeComponent } from "../../../../vault/components/premium-badge.component";
 import { reports } from "../../reports";
 import { ReportVariant } from "../models/report-variant";

apps/web/src/app/vault/components/vault-items/vault-items.stories.ts

@@ -25,9 +25,9 @@ import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.v
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
+import { PreloadedEnglishI18nModule } from "@bitwarden/test-helpers";
 
 import { GroupView } from "../../../admin-console/organizations/core";
-import { PreloadedEnglishI18nModule } from "../../../core/tests";
 
 import { VaultItemsComponent } from "./vault-items.component";
 import { VaultItemsModule } from "./vault-items.module";

apps/web/tsconfig.json

@@ -24,6 +24,7 @@
       "@bitwarden/key-management-ui": ["../../libs/key-management-ui/src"],
       "@bitwarden/platform": ["../../libs/platform/src"],
       "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
+      "@bitwarden/test-helpers": ["../../libs/test-helpers/src"],
       "@bitwarden/tools-card": ["../../libs/tools/card/src"],
       "@bitwarden/ui-common": ["../../libs/ui/common/src"],
       "@bitwarden/vault-export-core": [

libs/auth/src/angular/anon-layout/anon-layout-wrapper.stories.ts

@@ -16,11 +16,8 @@ import {
 } from "@bitwarden/common/platform/abstractions/environment.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ButtonModule } from "@bitwarden/components";
+import { PreloadedEnglishI18nModule } from "@bitwarden/test-helpers";
 
-// FIXME: remove `/apps` import from `/libs`
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line import/no-restricted-paths, no-restricted-imports
-import { PreloadedEnglishI18nModule } from "../../../../../apps/web/src/app/core/tests";
 import { LockIcon } from "../icons";
 import { RegistrationCheckEmailIcon } from "../icons/registration-check-email.icon";
 

libs/auth/src/angular/input-password/input-password.stories.ts

@@ -12,11 +12,7 @@ import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/mod
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
 import { DialogService, ToastService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
-
-// FIXME: remove `/apps` import from `/libs`
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line import/no-restricted-paths, no-restricted-imports
-import { PreloadedEnglishI18nModule } from "../../../../../apps/web/src/app/core/tests";
+import { PreloadedEnglishI18nModule } from "@bitwarden/test-helpers";
 
 import { InputPasswordComponent } from "./input-password.component";
 

libs/auth/src/angular/registration/registration-start/registration-start.stories.ts

@@ -26,11 +26,8 @@ import {
   ToastService,
   TypographyModule,
 } from "@bitwarden/components";
+import { PreloadedEnglishI18nModule } from "@bitwarden/test-helpers";
 
-// FIXME: remove `/apps` import from `/libs`
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line import/no-restricted-paths, no-restricted-imports
-import { PreloadedEnglishI18nModule } from "../../../../../../apps/web/src/app/core/tests";
 import { LoginEmailService } from "../../../common";
 import { AnonLayoutWrapperDataService } from "../../anon-layout/anon-layout-wrapper-data.service";
 import { AnonLayoutWrapperData } from "../../anon-layout/anon-layout-wrapper.component";

libs/auth/tsconfig.json

@@ -15,6 +15,7 @@
       "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
       "@bitwarden/key-management": ["../key-management/src"],
       "@bitwarden/platform": ["../platform/src"],
+      "@bitwarden/test-helpers": ["../test-helpers/src"],
       "@bitwarden/ui-common": ["../ui/common/src"]
     }
   },

libs/test-helpers/README.md

@@ -0,0 +1,3 @@
+# Test Helpers
+
+This lib represents the shared testing helpers to be accessible by all the client apps

libs/test-helpers/package.json

@@ -0,0 +1,21 @@
+{
+  "name": "@bitwarden/test-helpers",
+  "version": "0.0.0",
+  "description": "Common test helpers used across Bitwarden JavaScript projects.",
+  "keywords": [
+    "bitwarden"
+  ],
+  "author": "Bitwarden Inc.",
+  "homepage": "https://bitwarden.com",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/bitwarden/clients"
+  },
+  "license": "GPL-3.0",
+  "scripts": {
+    "clean": "rimraf dist",
+    "build": "npm run clean && tsc",
+    "build:watch": "npm run clean && tsc -watch",
+    "test": "jest"
+  }
+}

libs/test-helpers/src/index.ts

@@ -1 +1 @@
-export { PreloadedEnglishI18nModule } from "./preloaded-english-i18n.module";
+export { PreloadedEnglishI18nModule } from "./preloaded-english-i18n/preloaded-english-i18n.module";

libs/test-helpers/src/preloaded-english-i18n/preloaded-english-i18n.module.ts

@@ -4,7 +4,7 @@ import { Observable, of } from "rxjs";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { TranslationService } from "@bitwarden/common/platform/services/translation.service";
 
-import eng from "../../../locales/en/messages.json";
+import eng from "./en.json";
 
 class PreloadedEnglishI18nService extends TranslationService implements I18nService {
   translationLocale = "en";

libs/test-helpers/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../shared/tsconfig",
+  "include": ["src"],
+  "compilerOptions": {
+    "resolveJsonModule": true,
+    "paths": {
+      "@bitwarden/common/*": ["../common/src/*"]
+    }
+  }
+}