@akiojin/gwt 2.9.1 → 2.11.0

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

@@ -1,36 +1,63 @@
 /**
  * @vitest-environment happy-dom
  */
-import {
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  afterAll,
-  vi,
-} from "vitest";
-import { act, render } from "@testing-library/react";
+import { describe, it, expect, beforeEach, vi } from "vitest";
+import { render } from "@testing-library/react";
 import React from "react";
-import { App } from "../../components/App.js";
 import { Window } from "happy-dom";
-import type { BranchInfo } from "../../types.js";
-import * as useGitDataModule from "../../hooks/useGitData.js";
+import type { BranchInfo, BranchItem } from "../../types.js";
+import type { BranchListScreenProps } from "../../components/screens/BranchListScreen.js";
 
 const mockRefresh = vi.fn();
-const originalUseGitData = useGitDataModule.useGitData;
-const useGitDataSpy = vi.spyOn(useGitDataModule, "useGitData");
+let App: typeof import("../../components/App.js").App;
+const branchListProps: BranchListScreenProps[] = [];
+const useGitDataMock = vi.fn();
+
+vi.mock("../../hooks/useGitData.js", () => ({
+  useGitData: (...args: unknown[]) => useGitDataMock(...args),
+}));
+
+vi.mock("../../components/screens/BranchListScreen.js", () => {
+  return {
+    BranchListScreen: (props: BranchListScreenProps) => {
+      branchListProps.push(props);
+      return (
+        <div>
+          <div>gwt - Branch Selection</div>
+          <div>Local: {props.stats?.localCount ?? 0}</div>
+          <div>Remote: {props.stats?.remoteCount ?? 0}</div>
+          <div>Worktrees: {props.stats?.worktreeCount ?? 0}</div>
+          <div>Changes: {props.stats?.changesCount ?? 0}</div>
+          {props.loading && <div>Loading Git information</div>}
+          {props.error && <div>Error: {props.error.message}</div>}
+          {!props.loading && !props.error && props.branches.length === 0 && (
+            <div>No branches found</div>
+          )}
+          <ul>
+            {props.branches.map((branch) => (
+              <li
+                key={branch.name}
+              >{`${branch.icons?.join("") ?? ""} ${branch.name}`}</li>
+            ))}
+          </ul>
+        </div>
+      );
+    },
+  };
+});
 
 describe("App", () => {
-  beforeEach(() => {
+  beforeEach(async () => {
     // Setup happy-dom
     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;
 
     vi.clearAllMocks();
-    useGitDataSpy.mockReset();
-    useGitDataSpy.mockImplementation(originalUseGitData);
+    useGitDataMock.mockReset();
+    branchListProps.length = 0;
+    App = (await import("../../components/App.js")).App;
   });
 
   const mockBranches: BranchInfo[] = [
@@ -49,61 +76,61 @@ describe("App", () => {
   ];
 
   it("should render BranchListScreen when data is loaded", () => {
-    useGitDataSpy.mockReturnValue({
+    useGitDataMock.mockImplementation(() => ({
       branches: mockBranches,
       loading: false,
       error: null,
       worktrees: [],
       refresh: mockRefresh,
-    });
+    }));
 
     const onExit = vi.fn();
-    const { getByText } = render(<App onExit={onExit} />);
-
-    // Check for BranchListScreen elements
-    expect(getByText(/gwt - Branch Selection/i)).toBeDefined();
-    expect(getByText(/main/)).toBeDefined();
-    expect(getByText(/feature\/test/)).toBeDefined();
+    render(<App onExit={onExit} />);
+
+    expect(branchListProps).not.toHaveLength(0);
+    const props = branchListProps.at(-1);
+    expect(props?.loading).toBe(false);
+    expect(props?.error).toBeNull();
+    const branchNames = props?.branches.map((b) => b.name);
+    expect(branchNames).toContain("main");
+    expect(branchNames).toContain("feature/test");
   });
 
   it("should show loading state initially", async () => {
-    useGitDataSpy.mockReturnValue({
+    useGitDataMock.mockImplementation(() => ({
       branches: [],
       loading: true,
       error: null,
       worktrees: [],
       refresh: mockRefresh,
-    });
+    }));
 
     const onExit = vi.fn();
-    const { queryByText, getByText } = render(
-      <App onExit={onExit} loadingIndicatorDelay={10} />,
-    );
+    render(<App onExit={onExit} loadingIndicatorDelay={10} />);
 
-    expect(queryByText(/Loading Git information/i)).toBeNull();
-
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 15));
-    });
-
-    expect(getByText(/Loading Git information/i)).toBeDefined();
+    expect(branchListProps).not.toHaveLength(0);
+    const props = branchListProps.at(-1);
+    expect(props?.loading).toBe(true);
+    expect(props?.loadingIndicatorDelay).toBe(10);
   });
 
   it("should show error state when Git data fails to load", () => {
     const error = new Error("Failed to fetch branches");
-    useGitDataSpy.mockReturnValue({
+    useGitDataMock.mockImplementation(() => ({
       branches: [],
       loading: false,
       error,
       worktrees: [],
       refresh: mockRefresh,
-    });
+    }));
 
     const onExit = vi.fn();
-    const { getByText } = render(<App onExit={onExit} />);
+    render(<App onExit={onExit} />);
 
-    expect(getByText(/Error:/i)).toBeDefined();
-    expect(getByText(/Failed to fetch branches/i)).toBeDefined();
+    expect(branchListProps).not.toHaveLength(0);
+    const props = branchListProps.at(-1);
+    expect(props?.error?.message).toBe("Failed to fetch branches");
+    expect(props?.loading).toBe(false);
   });
 
   it("should calculate statistics from branches", () => {
@@ -133,67 +160,71 @@ describe("App", () => {
       },
     ];
 
-    useGitDataSpy.mockReturnValue({
+    useGitDataMock.mockImplementation(() => ({
       branches: branchesWithWorktree,
       loading: false,
       error: null,
       worktrees: [],
       refresh: mockRefresh,
-    });
+    }));
 
     const onExit = vi.fn();
-    const { getByText, getAllByText } = render(<App onExit={onExit} />);
-
-    // Check for statistics
-    expect(getByText(/Local:/)).toBeDefined();
-    expect(getAllByText(/2/).length).toBeGreaterThan(0); // 2 local branches
-    expect(getByText(/Remote:/)).toBeDefined();
-    expect(getAllByText(/1/).length).toBeGreaterThan(0); // 1 remote branch + 1 worktree
-    expect(getByText(/Worktrees:/)).toBeDefined();
+    render(<App onExit={onExit} />);
+
+    expect(branchListProps).not.toHaveLength(0);
+    const props = branchListProps.at(-1);
+    expect(props?.stats.localCount).toBe(2);
+    expect(props?.stats.remoteCount).toBe(1);
+    expect(props?.stats.worktreeCount).toBe(1);
   });
 
-  it("should call onExit when branch is selected", () => {
-    useGitDataSpy.mockReturnValue({
+  it("should render branch selection without triggering exit", () => {
+    useGitDataMock.mockImplementation(() => ({
       branches: mockBranches,
       loading: false,
       error: null,
       worktrees: [],
       refresh: mockRefresh,
-    });
+    }));
 
     const onExit = vi.fn();
     const { container } = render(<App onExit={onExit} />);
 
     expect(container).toBeDefined();
+    expect(onExit).not.toHaveBeenCalled();
     // Note: Testing actual selection requires simulating user input,
     // which is covered in integration tests
   });
 
   it("should handle empty branch list", () => {
-    useGitDataSpy.mockReturnValue({
+    useGitDataMock.mockImplementation(() => ({
       branches: [],
       loading: false,
       error: null,
       worktrees: [],
       refresh: mockRefresh,
-    });
+    }));
 
     const onExit = vi.fn();
-    const { getByText } = render(<App onExit={onExit} />);
+    render(<App onExit={onExit} />);
 
-    expect(getByText(/No branches found/i)).toBeDefined();
+    expect(branchListProps).not.toHaveLength(0);
+    const props = branchListProps.at(-1);
+    expect(props?.branches).toHaveLength(0);
+    expect(props?.loading).toBe(false);
+    expect(props?.error).toBeNull();
   });
 
   it("should wrap with ErrorBoundary", () => {
     // This test verifies ErrorBoundary is present
     // Actual error catching is tested separately
-    useGitDataSpy.mockReturnValue({
+    useGitDataMock.mockImplementation(() => ({
       branches: mockBranches,
       loading: false,
       error: null,
       worktrees: [],
       refresh: mockRefresh,
-    });
+    }));
 
     const onExit = vi.fn();
     const { container } = render(<App onExit={onExit} />);
@@ -202,30 +233,32 @@ describe("App", () => {
   });
 
   it("should format branch items with icons", () => {
-    useGitDataSpy.mockReturnValue({
+    useGitDataMock.mockImplementation(() => ({
       branches: mockBranches,
       loading: false,
       error: null,
       worktrees: [],
       refresh: mockRefresh,
-    });
+    }));
 
     const onExit = vi.fn();
-    const { getByText } = render(<App onExit={onExit} />);
+    render(<App onExit={onExit} />);
 
-    // Check for branch type icon (main = ⚡)
-    expect(getByText(/⚡/)).toBeDefined();
+    expect(branchListProps).not.toHaveLength(0);
+    const props = branchListProps.at(-1);
+    const main = props?.branches.find((b: BranchItem) => b.name === "main");
+    expect(main?.icons).toContain("⚡");
   });
 
   describe("BranchActionSelectorScreen integration", () => {
     it("should show BranchActionSelectorScreen after branch selection", () => {
-      useGitDataSpy.mockReturnValue({
+      useGitDataMock.mockImplementation(() => ({
         branches: mockBranches,
         loading: false,
         error: null,
         worktrees: [],
         refresh: mockRefresh,
-      });
+      }));
 
       const onExit = vi.fn();
       const { container } = render(<App onExit={onExit} />);
@@ -235,13 +268,13 @@ describe("App", () => {
     });
 
     it('should navigate to AI tool selector when "use existing" is selected', () => {
-      useGitDataSpy.mockReturnValue({
+      useGitDataMock.mockImplementation(() => ({
         branches: mockBranches,
         loading: false,
         error: null,
         worktrees: [],
         refresh: mockRefresh,
-      });
+      }));
 
       const onExit = vi.fn();
       const { container } = render(<App onExit={onExit} />);
@@ -251,13 +284,13 @@ describe("App", () => {
     });
 
     it('should navigate to branch creator when "create new" is selected', () => {
-      useGitDataSpy.mockReturnValue({
+      useGitDataMock.mockImplementation(() => ({
         branches: mockBranches,
         loading: false,
         error: null,
         worktrees: [],
         refresh: mockRefresh,
-      });
+      }));
 
       const onExit = vi.fn();
       const { container } = render(<App onExit={onExit} />);
@@ -266,13 +299,4 @@ describe("App", () => {
       expect(container).toBeDefined();
     });
   });
-
-  afterEach(() => {
-    useGitDataSpy.mockReset();
-    useGitDataSpy.mockImplementation(originalUseGitData);
-  });
-});
-
-afterAll(() => {
-  useGitDataSpy.mockRestore();
 });

package/src/cli/ui/__tests__/components/ModelSelectorScreen.initial.test.tsx

@@ -7,16 +7,22 @@ import { render, waitFor } from "@testing-library/react";
 import { ModelSelectorScreen } from "../../components/screens/ModelSelectorScreen.js";
 import type { ModelSelectionResult } from "../../components/screens/ModelSelectorScreen.js";
 import { Window } from "happy-dom";
+import type {
+  SelectProps,
+  SelectItem,
+} from "../../components/common/Select.js";
 
-const selectMocks: any[] = [];
+const selectMocks: SelectProps<SelectItem>[] = [];
 
 vi.mock("../../components/common/Select.js", () => {
   return {
-    Select: (props: any) => {
+    Select: (props: SelectProps<SelectItem>) => {
       selectMocks.push(props);
       return React.createElement("div", {
         "data-testid": "select-mock",
-        onClick: () => props.onSelect && props.onSelect(props.items[props.initialIndex ?? 0]),
+        onClick: () =>
+          props.onSelect &&
+          props.onSelect(props.items[props.initialIndex ?? 0]),
       });
     },
   };
@@ -26,8 +32,9 @@ describe("ModelSelectorScreen initial selection", () => {
   beforeEach(() => {
     selectMocks.length = 0;
     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;
   });
 
   it("sets model list initialIndex based on previous selection", async () => {

package/src/cli/ui/__tests__/components/common/Confirm.test.tsx

@@ -11,8 +11,9 @@ describe("Confirm", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
   });
 
   it("should render the message", () => {

package/src/cli/ui/__tests__/components/common/ErrorBoundary.test.tsx

@@ -20,8 +20,9 @@ describe("ErrorBoundary", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
 
     // Suppress console.error for expected errors in tests
     vi.spyOn(console, "error").mockImplementation(() => {});

package/src/cli/ui/__tests__/components/common/Input.test.tsx

@@ -11,8 +11,9 @@ describe("Input", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
   });
 
   it("should render with value", () => {

package/src/cli/ui/__tests__/components/common/LoadingIndicator.test.tsx

@@ -24,8 +24,9 @@ beforeEach(() => {
     vi.useFakeTimers();
   }
   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;
 });
 
 afterEach(() => {
@@ -78,18 +79,18 @@ describe("LoadingIndicator", () => {
 
     expect(getMessageText(container)).toContain("Loading data");
 
-      await act(async () => {
-        rerender(
-          <LoadingIndicator
-            isLoading={false}
-            message="Loading data"
-            delay={10}
-          />,
-        );
-        if (typeof vi.advanceTimersByTimeAsync === "function") {
-          await vi.advanceTimersByTimeAsync(0);
-        }
-      });
+    await act(async () => {
+      rerender(
+        <LoadingIndicator
+          isLoading={false}
+          message="Loading data"
+          delay={10}
+        />,
+      );
+      if (typeof vi.advanceTimersByTimeAsync === "function") {
+        await vi.advanceTimersByTimeAsync(0);
+      }
+    });
 
     expect(container.textContent).toBe("");
   });

package/src/cli/ui/__tests__/components/common/Select.memo.test.tsx

@@ -19,14 +19,14 @@ import { Select, type SelectItem } from "../../../components/common/Select.js";
 describe.skip("Select Component React.memo (T082-2)", () => {
   beforeEach(() => {
     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;
     vi.clearAllMocks();
   });
 
   it("should not re-render when items array reference changes but content is the same", () => {
     const onSelect = vi.fn();
-    const renderCount = 0;
 
     // Wrapper component to track renders
     function TestWrapper() {

package/src/cli/ui/__tests__/components/common/Select.test.tsx

@@ -1,15 +1,12 @@
 /**
  * @vitest-environment happy-dom
  */
- 
+
 import { describe, it, expect, vi } from "vitest";
 import { render } from "ink-testing-library";
 import React from "react";
 import { Select } from "../../../components/common/Select.js";
 
-// Helper to wait for async updates
-const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
-
 interface TestItem {
   label: string;
   value: string;

package/src/cli/ui/__tests__/components/parts/Footer.test.tsx

@@ -11,8 +11,9 @@ describe("Footer", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
   });
 
   const mockActions = [

package/src/cli/ui/__tests__/components/parts/Header.test.tsx

@@ -11,8 +11,9 @@ describe("Header", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
   });
 
   it("should render title", () => {

package/src/cli/ui/__tests__/components/parts/ScrollableList.test.tsx

@@ -12,8 +12,9 @@ describe("ScrollableList", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
   });
 
   it("should render children", () => {

package/src/cli/ui/__tests__/components/parts/Stats.test.tsx

@@ -12,8 +12,9 @@ describe("Stats", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
   });
 
   const mockStats: Statistics = {

package/src/cli/ui/__tests__/components/screens/AIToolSelectorScreen.test.tsx

@@ -27,8 +27,9 @@ describe("AIToolSelectorScreen", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
   });
 
   it("should render header with title", () => {

package/src/cli/ui/__tests__/components/screens/BranchCreatorScreen.test.tsx

@@ -13,8 +13,9 @@ describe("BranchCreatorScreen", () => {
     vi.useFakeTimers();
     // Setup happy-dom
     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;
   });
 
   afterEach(() => {