@akiojin/gwt 2.9.1 → 2.11.0

package/src/cli/ui/__tests__/components/App.shortcuts.test.tsx

@@ -1,92 +1,97 @@
 /**
  * @vitest-environment happy-dom
  */
-import {
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  afterAll,
-  vi,
-} from "vitest";
+import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
 import type { Mock } from "vitest";
-import { render, act, waitFor } from "@testing-library/react";
+import { render, act } from "@testing-library/react";
 import React from "react";
 import type { BranchItem, CleanupTarget } from "../../types.js";
+import type { BranchCreatorScreenProps } from "../../components/screens/BranchCreatorScreen.js";
+import type { BranchListScreenProps } from "../../components/screens/BranchListScreen.js";
 import { Window } from "happy-dom";
-import * as useGitDataModule from "../../hooks/useGitData.js";
-import * as useScreenStateModule from "../../hooks/useScreenState.js";
-import * as WorktreeManagerScreenModule from "../../components/screens/WorktreeManagerScreen.js";
-import * as BranchCreatorScreenModule from "../../components/screens/BranchCreatorScreen.js";
-import * as BranchListScreenModule from "../../components/screens/BranchListScreen.js";
-import * as worktreeModule from "../../../../worktree.ts";
-import * as gitModule from "../../../../git.ts";
-import { App } from "../../components/App.js";
+let App: typeof import("../../components/App.js").App;
 
 const navigateToMock = vi.fn();
 const goBackMock = vi.fn();
 const resetMock = vi.fn();
 
-const worktreeScreenProps: any[] = [];
-const branchCreatorProps: any[] = [];
-const branchListProps: any[] = [];
-
-const originalUseGitData = useGitDataModule.useGitData;
-const originalUseScreenState = useScreenStateModule.useScreenState;
-const originalWorktreeManagerScreen =
-  WorktreeManagerScreenModule.WorktreeManagerScreen;
-const originalBranchCreatorScreen =
-  BranchCreatorScreenModule.BranchCreatorScreen;
-const originalBranchListScreen = BranchListScreenModule.BranchListScreen;
-const originalGetMergedPRWorktrees = worktreeModule.getMergedPRWorktrees;
-const originalGenerateWorktreePath = worktreeModule.generateWorktreePath;
-const originalCreateWorktree = worktreeModule.createWorktree;
-const originalRemoveWorktree = worktreeModule.removeWorktree;
-const originalGetRepositoryRoot = gitModule.getRepositoryRoot;
-const originalDeleteBranch = gitModule.deleteBranch;
-
-const useGitDataSpy = vi.spyOn(useGitDataModule, "useGitData");
-const useScreenStateSpy = vi.spyOn(useScreenStateModule, "useScreenState");
-const worktreeManagerScreenSpy = vi.spyOn(
-  WorktreeManagerScreenModule,
-  "WorktreeManagerScreen",
-);
-const branchCreatorScreenSpy = vi.spyOn(
-  BranchCreatorScreenModule,
-  "BranchCreatorScreen",
-);
-const branchListScreenSpy = vi.spyOn(
-  BranchListScreenModule,
-  "BranchListScreen",
-);
-const getMergedPRWorktreesSpy = vi.spyOn(
-  worktreeModule,
-  "getMergedPRWorktrees",
-);
-const generateWorktreePathSpy = vi.spyOn(
-  worktreeModule,
-  "generateWorktreePath",
-);
-const createWorktreeSpy = vi.spyOn(worktreeModule, "createWorktree");
-const removeWorktreeSpy = vi.spyOn(worktreeModule, "removeWorktree");
-const getRepositoryRootSpy = vi.spyOn(gitModule, "getRepositoryRoot");
-const deleteBranchSpy = vi.spyOn(gitModule, "deleteBranch");
+const branchCreatorProps: BranchCreatorScreenProps[] = [];
+const branchListProps: BranchListScreenProps[] = [];
+
+const useGitDataMock = vi.fn();
+const useScreenStateMock = vi.fn();
+const getMergedPRWorktreesMock = vi.fn();
+const generateWorktreePathMock = vi.fn();
+const createWorktreeMock = vi.fn();
+const removeWorktreeMock = vi.fn();
+const getRepositoryRootMock = vi.fn();
+const deleteBranchMock = vi.fn();
+
+vi.mock("../../hooks/useGitData.js", () => ({
+  useGitData: (...args: unknown[]) => useGitDataMock(...args),
+}));
+
+vi.mock("../../hooks/useScreenState.js", () => ({
+  useScreenState: (...args: unknown[]) => useScreenStateMock(...args),
+}));
+
+vi.mock("../../../../worktree.js", async () => {
+  const actual = await vi.importActual<
+    typeof import("../../../../worktree.js")
+  >("../../../../worktree.js");
+  return {
+    ...actual,
+    getMergedPRWorktrees: getMergedPRWorktreesMock,
+    generateWorktreePath: generateWorktreePathMock,
+    createWorktree: createWorktreeMock,
+    removeWorktree: removeWorktreeMock,
+  };
+});
+
+vi.mock("../../../../git.js", async () => {
+  const actual =
+    await vi.importActual<typeof import("../../../../git.js")>(
+      "../../../../git.js",
+    );
+  return {
+    ...actual,
+    getRepositoryRoot: getRepositoryRootMock,
+    deleteBranch: deleteBranchMock,
+  };
+});
+
+vi.mock("../../components/screens/BranchCreatorScreen.js", () => {
+  return {
+    BranchCreatorScreen: (props: BranchCreatorScreenProps) => {
+      branchCreatorProps.push(props);
+      return React.createElement("div", null, "BranchCreatorScreenMock");
+    },
+  };
+});
+
+vi.mock("../../components/screens/BranchListScreen.js", () => {
+  return {
+    BranchListScreen: (props: BranchListScreenProps) => {
+      branchListProps.push(props);
+      return React.createElement("div", null, "BranchListScreenMock");
+    },
+  };
+});
 
 describe("App shortcuts integration", () => {
-  beforeEach(() => {
+  beforeEach(async () => {
     if (typeof globalThis.document === "undefined") {
       const window = new Window();
-      globalThis.window = window as any;
-      globalThis.document = window.document as any;
+      globalThis.window = window as unknown as typeof globalThis.window;
+      globalThis.document =
+        window.document as unknown as typeof globalThis.document;
     }
-    worktreeScreenProps.length = 0;
     branchCreatorProps.length = 0;
     branchListProps.length = 0;
     navigateToMock.mockClear();
     goBackMock.mockClear();
     resetMock.mockClear();
-    useGitDataSpy.mockImplementation(() => ({
+    useGitDataMock.mockReturnValue({
       branches: [],
       worktrees: [
         {
@@ -99,26 +104,14 @@ describe("App shortcuts integration", () => {
       error: null,
       refresh: vi.fn(),
       lastUpdated: null,
-    }));
-    useScreenStateSpy.mockImplementation(() => ({
-      currentScreen: "worktree-manager",
-      navigateTo: navigateToMock as _Mock,
-      goBack: goBackMock as _Mock,
-      reset: resetMock as _Mock,
-    }));
-    worktreeManagerScreenSpy.mockImplementation((props: any) => {
-      worktreeScreenProps.push(props);
-      return React.createElement(originalWorktreeManagerScreen, props);
     });
-    branchCreatorScreenSpy.mockImplementation((props: any) => {
-      branchCreatorProps.push(props);
-      return React.createElement(originalBranchCreatorScreen, props);
+    useScreenStateMock.mockReturnValue({
+      currentScreen: "branch-list",
+      navigateTo: navigateToMock as Mock,
+      goBack: goBackMock as Mock,
+      reset: resetMock as Mock,
     });
-    branchListScreenSpy.mockImplementation((props: any) => {
-      branchListProps.push(props);
-      return React.createElement(originalBranchListScreen, props);
-    });
-    getMergedPRWorktreesSpy.mockResolvedValue([
+    getMergedPRWorktreesMock.mockResolvedValue([
       {
         branch: "feature/add-new-feature",
         cleanupType: "worktree-and-branch",
@@ -152,68 +145,36 @@ describe("App shortcuts integration", () => {
         isAccessible: true,
       },
     ] as CleanupTarget[]);
-    generateWorktreePathSpy.mockResolvedValue("/worktrees/new-branch");
-    createWorktreeSpy.mockResolvedValue(undefined);
-    removeWorktreeSpy.mockResolvedValue(undefined);
-    getRepositoryRootSpy.mockResolvedValue("/repo");
-    deleteBranchSpy.mockResolvedValue(undefined);
+    generateWorktreePathMock.mockResolvedValue("/worktrees/new-branch");
+    createWorktreeMock.mockResolvedValue(undefined);
+    removeWorktreeMock.mockResolvedValue(undefined);
+    getRepositoryRootMock.mockResolvedValue("/repo");
+    deleteBranchMock.mockResolvedValue(undefined);
+    App = (await import("../../components/App.js")).App;
   });
 
   afterEach(() => {
-    useGitDataSpy.mockReset();
-    useScreenStateSpy.mockReset();
-    worktreeManagerScreenSpy.mockReset();
-    branchCreatorScreenSpy.mockReset();
-    branchListScreenSpy.mockReset();
-    getMergedPRWorktreesSpy.mockReset();
-    generateWorktreePathSpy.mockReset();
-    createWorktreeSpy.mockReset();
-    removeWorktreeSpy.mockReset();
-    getRepositoryRootSpy.mockReset();
-    deleteBranchSpy.mockReset();
-    useGitDataSpy.mockImplementation(originalUseGitData);
-    useScreenStateSpy.mockImplementation(originalUseScreenState);
-    worktreeManagerScreenSpy.mockImplementation(
-      originalWorktreeManagerScreen as any,
-    );
-    branchCreatorScreenSpy.mockImplementation(
-      originalBranchCreatorScreen as any,
-    );
-    branchListScreenSpy.mockImplementation(originalBranchListScreen as any);
-    getMergedPRWorktreesSpy.mockImplementation(
-      originalGetMergedPRWorktrees as any,
-    );
-    generateWorktreePathSpy.mockImplementation(
-      originalGenerateWorktreePath as any,
-    );
-    createWorktreeSpy.mockImplementation(originalCreateWorktree as any);
-    removeWorktreeSpy.mockImplementation(originalRemoveWorktree as any);
-    getRepositoryRootSpy.mockImplementation(originalGetRepositoryRoot as any);
-    deleteBranchSpy.mockImplementation(originalDeleteBranch as any);
-  });
-
-  it("navigates to AI tool selector when worktree is selected", () => {
-    const onExit = vi.fn();
-    render(<App onExit={onExit} />);
-
-    expect(worktreeScreenProps).not.toHaveLength(0);
-    const { onSelect, worktrees } = worktreeScreenProps[0];
-    expect(worktrees).toHaveLength(1);
-
-    onSelect(worktrees[0]);
-
-    expect(navigateToMock).toHaveBeenCalledWith("ai-tool-selector");
+    useGitDataMock.mockReset();
+    useScreenStateMock.mockReset();
+    getMergedPRWorktreesMock.mockReset();
+    generateWorktreePathMock.mockReset();
+    createWorktreeMock.mockReset();
+    removeWorktreeMock.mockReset();
+    getRepositoryRootMock.mockReset();
+    deleteBranchMock.mockReset();
+    branchCreatorProps.length = 0;
+    branchListProps.length = 0;
   });
 
   it("creates new worktree when branch creator submits", async () => {
     const onExit = vi.fn();
 
     // Update screen state mock to branch-creator for this test
-    useScreenStateSpy.mockReturnValue({
+    useScreenStateMock.mockReturnValue({
       currentScreen: "branch-creator",
-      navigateTo: navigateToMock as _Mock,
-      goBack: goBackMock as _Mock,
-      reset: resetMock as _Mock,
+      navigateTo: navigateToMock as Mock,
+      goBack: goBackMock as Mock,
+      reset: resetMock as Mock,
     });
 
     render(<App onExit={onExit} />);
@@ -225,7 +186,7 @@ describe("App shortcuts integration", () => {
       await onCreate("feature/new-branch");
     });
 
-    expect(createWorktreeSpy).toHaveBeenCalledWith(
+    expect(createWorktreeMock).toHaveBeenCalledWith(
       expect.objectContaining({
         branchName: "feature/new-branch",
         isNewBranch: true,
@@ -243,25 +204,25 @@ describe("App shortcuts integration", () => {
       let resolveRemoveWorktree: (() => void) | undefined;
       let resolveDeleteBranch: (() => void) | undefined;
 
-      removeWorktreeSpy.mockImplementationOnce(
+      removeWorktreeMock.mockImplementationOnce(
         () =>
           new Promise<void>((resolve) => {
             resolveRemoveWorktree = resolve;
           }),
       );
 
-      deleteBranchSpy.mockImplementationOnce(
+      deleteBranchMock.mockImplementationOnce(
         () =>
           new Promise<void>((resolve) => {
             resolveDeleteBranch = resolve;
           }),
       );
 
-      useScreenStateSpy.mockReturnValue({
+      useScreenStateMock.mockReturnValue({
         currentScreen: "branch-list",
-        navigateTo: navigateToMock as _Mock,
-        goBack: goBackMock as _Mock,
-        reset: resetMock as _Mock,
+        navigateTo: navigateToMock as Mock,
+        goBack: goBackMock as Mock,
+        reset: resetMock as Mock,
       });
 
       render(<App onExit={onExit} />);
@@ -299,11 +260,11 @@ describe("App shortcuts integration", () => {
 
       resolveDeleteBranch?.();
 
-      expect(removeWorktreeSpy).toHaveBeenCalledWith(
+      expect(removeWorktreeMock).toHaveBeenCalledWith(
         "/worktrees/feature-add-new-feature",
         true,
       );
-      expect(deleteBranchSpy).toHaveBeenCalledWith(
+      expect(deleteBranchMock).toHaveBeenCalledWith(
         "feature/add-new-feature",
         true,
       );
@@ -339,17 +300,3 @@ describe("App shortcuts integration", () => {
     }
   });
 });
-
-afterAll(() => {
-  useGitDataSpy.mockRestore();
-  useScreenStateSpy.mockRestore();
-  worktreeManagerScreenSpy.mockRestore();
-  branchCreatorScreenSpy.mockRestore();
-  branchListScreenSpy.mockRestore();
-  getMergedPRWorktreesSpy.mockRestore();
-  generateWorktreePathSpy.mockRestore();
-  createWorktreeSpy.mockRestore();
-  removeWorktreeSpy.mockRestore();
-  getRepositoryRootSpy.mockRestore();
-  deleteBranchSpy.mockRestore();
-});