Update tests

lookit · Oct 17, 2024 · ded01b7 · ded01b7
1 parent a29f33f
commit ded01b7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/packages/templates/src/utils.spec.ts b/packages/templates/src/utils.spec.ts
@@ -1,4 +1,6 @@
-import { expFormat } from "./utils";
+import { PluginInfo, TrialType } from "jspsych";
+import { LocaleNotFoundError } from "./errors";
+import { expFormat, setLocale } from "./utils";
 
 test("expFormat convert written text to format well in HTML", () => {
   expect(expFormat("abcdefg")).toStrictEqual("abcdefg");
@@ -18,3 +20,8 @@ test("expFormat convert written text to format well in HTML", () => {
     "&nbsp;&nbsp;&nbsp;&nbsp;Tabbed text",
   );
 });
+
+test("setLocale throw error with non-existing locale", () => {
+  const trial = { locale: "non-existing" } as unknown as TrialType<PluginInfo>;
+  expect(() => setLocale(trial)).toThrow(LocaleNotFoundError);
+});
diff --git a/packages/templates/src/utils.ts b/packages/templates/src/utils.ts
@@ -69,17 +69,14 @@ const resources = () => {
  * @param trial - Trial data including user supplied parameters.
  */
 export const setLocale = (trial: TrialType<PluginInfo>) => {
-  try {
-    const lcl = new Intl.Locale(trial.locale);
-    if (i18next.language !== lcl.baseName) {
-      i18next.changeLanguage(lcl.baseName);
-    }
-  } catch (error) {
-    if (error instanceof RangeError) {
-      throw new LocaleNotFoundError(trial.locale);
-    } else {
-      throw error;
-    }
+  const lcl = new Intl.Locale(trial.locale);
+
+  if (!i18next.hasResourceBundle(lcl.baseName, "translation")) {
+    throw new LocaleNotFoundError(trial.locale);
+  }
+
+  if (i18next.language !== lcl.baseName) {
+    i18next.changeLanguage(lcl.baseName);
   }
 };