fix: Repair some tests related to i18n

miyanokomiya · Oct 30, 2024 · f710a23 · f710a23
1 parent abd2f6d
commit f710a23
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 17 deletions.
diff --git a/src/composables/states/appCanvas/contextMenuItems.spec.ts b/src/composables/states/appCanvas/contextMenuItems.spec.ts
@@ -9,6 +9,7 @@ import {
   getMenuItemsForSelectedShapes,
   groupShapes,
   handleContextItemEvent,
+  isSameContextItem,
   ungroupShapes,
 } from "./contextMenuItems";
 
@@ -48,16 +49,33 @@ describe("getMenuItemsForSelectedShapes", () => {
     expect(getMenuItemsForSelectedShapes(ctx)).toEqual([]);
 
     ctx.getSelectedShapeIdMap.mockReturnValue({ locked: true });
-    expect(getMenuItemsForSelectedShapes(ctx)).toContain(CONTEXT_MENU_ITEM_SRC.UNLOCK);
-    expect(getMenuItemsForSelectedShapes(ctx)).not.toContain(CONTEXT_MENU_ITEM_SRC.LOCK);
+    expect(getMenuItemsForSelectedShapes(ctx).some((a) => isSameContextItem(a, CONTEXT_MENU_ITEM_SRC.UNLOCK))).toBe(
+      true,
+    );
+    expect(getMenuItemsForSelectedShapes(ctx).some((a) => isSameContextItem(a, CONTEXT_MENU_ITEM_SRC.LOCK))).toBe(
+      false,
+    );
 
     ctx.getSelectedShapeIdMap.mockReturnValue({ unlocked: true });
-    expect(getMenuItemsForSelectedShapes(ctx)).not.toContain(CONTEXT_MENU_ITEM_SRC.UNLOCK);
-    expect(getMenuItemsForSelectedShapes(ctx)).toContain(CONTEXT_MENU_ITEM_SRC.LOCK);
+    expect(getMenuItemsForSelectedShapes(ctx).some((a) => isSameContextItem(a, CONTEXT_MENU_ITEM_SRC.UNLOCK))).toBe(
+      false,
+    );
+    expect(getMenuItemsForSelectedShapes(ctx).some((a) => isSameContextItem(a, CONTEXT_MENU_ITEM_SRC.LOCK))).toBe(true);
 
     ctx.getSelectedShapeIdMap.mockReturnValue({ locked: true, unlocked: true });
-    expect(getMenuItemsForSelectedShapes(ctx)).toContain(CONTEXT_MENU_ITEM_SRC.UNLOCK);
-    expect(getMenuItemsForSelectedShapes(ctx)).toContain(CONTEXT_MENU_ITEM_SRC.LOCK);
+    expect(getMenuItemsForSelectedShapes(ctx).some((a) => isSameContextItem(a, CONTEXT_MENU_ITEM_SRC.UNLOCK))).toBe(
+      true,
+    );
+    expect(getMenuItemsForSelectedShapes(ctx).some((a) => isSameContextItem(a, CONTEXT_MENU_ITEM_SRC.LOCK))).toBe(true);
+  });
+});
+
+describe("isSameContextItem", () => {
+  test("should return true when two items are same ones", () => {
+    expect(isSameContextItem(CONTEXT_MENU_ITEM_SRC.LOCK, CONTEXT_MENU_ITEM_SRC.LOCK)).toBe(true);
+    expect(isSameContextItem(CONTEXT_MENU_ITEM_SRC.LOCK, CONTEXT_MENU_ITEM_SRC.UNLOCK)).toBe(false);
+    expect(isSameContextItem(CONTEXT_MENU_ITEM_SRC.LOCK, { separator: true })).toBe(false);
+    expect(isSameContextItem({ separator: true }, { separator: true })).toBe(true);
   });
 });
 

diff --git a/src/composables/states/appCanvas/contextMenuItems.ts b/src/composables/states/appCanvas/contextMenuItems.ts
@@ -15,7 +15,7 @@ import { getPatchByLayouts } from "../../shapeLayoutHandler";
 import { newShapeRenderer } from "../../shapeRenderer";
 import { newShapeSVGRenderer } from "../../shapeSVGRenderer";
 import { TransitionValue } from "../core";
-import { ContextMenuItem } from "../types";
+import { ContextMenuItem, ContextMenuSeparatorItem } from "../types";
 import { AppCanvasStateContext, ContextMenuItemEvent } from "./core";
 import { IRectangle } from "okageo";
 import { getIntRectFromFloatRect } from "../../../utils/geometry";
@@ -137,6 +137,18 @@ export const CONTEXT_MENU_ITEM_SRC = {
   SEPARATOR: { separator: true },
 } satisfies { [key: string]: ContextMenuItem };
 
+export function isContextSeparatorItem(item: ContextMenuItem): item is ContextMenuSeparatorItem {
+  return "separator" in item;
+}
+
+export function isSameContextItem(a: ContextMenuItem, b: ContextMenuItem): boolean {
+  const isSeparatorA = isContextSeparatorItem(a);
+  const isSeparatorB = isContextSeparatorItem(b);
+  if (isSeparatorA && isSeparatorB) return true;
+  if (!isSeparatorA && !isSeparatorB) return a.key === b.key;
+  return false;
+}
+
 export function getMenuItemsForSelectedShapes(
   ctx: Pick<AppCanvasStateContext, "getSelectedShapeIdMap" | "getShapeComposite">,
 ): ContextMenuItem[] {

diff --git a/src/composables/states/types.ts b/src/composables/states/types.ts
@@ -18,14 +18,16 @@ export type MouseOptions = {
   button: number;
 } & ModifierOptions;
 
-export type ContextMenuItem =
-  | {
-      label: string;
-      key: string;
-      meta?: any;
-      children?: ContextMenuItem[];
-    }
-  | { separator: true };
+export type ContextMenuItem = ContextMenuActionItem | ContextMenuSeparatorItem;
+
+export type ContextMenuActionItem = {
+  label: string;
+  key: string;
+  meta?: any;
+  children?: ContextMenuItem[];
+};
+
+export type ContextMenuSeparatorItem = { separator: true };
 
 export type CommandExam = { command?: string; title: string };
 

diff --git a/src/utils/terminology.spec.ts b/src/utils/terminology.spec.ts
@@ -1,14 +1,14 @@
 import { describe, test, expect } from "vitest";
 import { parseTerminologies } from "./terminology";
+import { i18n } from "../i18n";
 
 describe("parseTerminologies", () => {
   test("should parse terminology information", () => {
     expect(parseTerminologies("This is [[FOLLY_SVG]] and [[unknown_key]].")).toEqual([
       { text: "This is " },
       {
         text: "Folly SVG",
-        description:
-          "Folly SVG contains meta data of shapes. You can restore the shapes by dropping Folly SVG to the canvas.",
+        description: i18n.t("term.follysvg"),
       },
       { text: " and " },
       { text: "unknown_key" },