🤖 tests: share browser global test helpers

Extract shared browser test helpers for window and navigator mocking, then use them in GitStatusStore and keybind tests to remove duplicate descriptor cleanup logic.

---

_Generated with `mux` • Model: `openai:gpt-5.5` • Thinking: `xhigh` • Cost: `$223.75`_

<!-- mux-attribution: model=openai:gpt-5.5 thinking=xhigh costs=223.75 -->

Author: ibetitsmike

src/browser/stores/GitStatusStore.test.ts

@@ -11,6 +11,7 @@ import {
 import type { RuntimeStatus, RuntimeStatusStore } from "./RuntimeStatusStore";
 import type { FrontendWorkspaceMetadata, GitStatus } from "@/common/types/workspace";
 import { DEFAULT_RUNTIME_CONFIG } from "@/common/constants/workspace";
+import { installTestWindow } from "@/browser/testUtils";
 
 /**
  * Unit tests for GitStatusStore.
@@ -183,91 +184,11 @@ function createStore(
   return store;
 }
 
-type MockableWindow = Window & typeof globalThis & { api?: unknown };
-type WindowEventMethod = "addEventListener" | "removeEventListener" | "dispatchEvent";
-
-let mockedWindow: MockableWindow | undefined;
-let createdMockWindow = false;
-let previousApiDescriptor: PropertyDescriptor | undefined;
-let previousEventMethodDescriptors: Partial<
-  Record<WindowEventMethod, PropertyDescriptor | undefined>
-> = {};
-
-function installMockWindowAPI() {
-  const existingWindow = globalThis.window as MockableWindow | undefined;
-  const targetWindow = existingWindow ?? (Object.create(null) as MockableWindow);
-
-  mockedWindow = targetWindow;
-  createdMockWindow = existingWindow == null;
-  previousApiDescriptor = Object.getOwnPropertyDescriptor(targetWindow, "api");
-  previousEventMethodDescriptors = {};
-
-  if (createdMockWindow) {
-    globalThis.window = targetWindow;
-  }
-
-  Object.defineProperty(targetWindow, "api", {
-    configurable: true,
-    value: {
-      workspace: {
-        executeBash: mockExecuteBash,
-        getProjectGitStatuses: mockGetProjectGitStatuses,
-      },
-    },
-  });
-
-  ensureWindowEventMethod(targetWindow, "addEventListener", () => undefined);
-  ensureWindowEventMethod(targetWindow, "removeEventListener", () => undefined);
-  ensureWindowEventMethod(targetWindow, "dispatchEvent", () => true);
-}
-
-function ensureWindowEventMethod(
-  targetWindow: MockableWindow,
-  method: WindowEventMethod,
-  replacement: EventTarget[WindowEventMethod]
-) {
-  if (typeof targetWindow[method] === "function") {
-    return;
-  }
-
-  previousEventMethodDescriptors[method] = Object.getOwnPropertyDescriptor(targetWindow, method);
-  Object.defineProperty(targetWindow, method, { configurable: true, value: replacement });
-}
-
-function restoreMockWindowAPI() {
-  const targetWindow = mockedWindow;
-  if (!targetWindow) {
-    return;
-  }
-
-  if (previousApiDescriptor) {
-    Object.defineProperty(targetWindow, "api", previousApiDescriptor);
-  } else {
-    delete targetWindow.api;
-  }
-
-  for (const method of Object.keys(previousEventMethodDescriptors) as WindowEventMethod[]) {
-    const descriptor = previousEventMethodDescriptors[method];
-    if (descriptor) {
-      Object.defineProperty(targetWindow, method, descriptor);
-    } else {
-      delete (targetWindow as Partial<Record<WindowEventMethod, unknown>>)[method];
-    }
-  }
-
-  if (createdMockWindow && globalThis.window === targetWindow) {
-    delete (globalThis as { window?: unknown }).window;
-  }
-
-  mockedWindow = undefined;
-  createdMockWindow = false;
-  previousApiDescriptor = undefined;
-  previousEventMethodDescriptors = {};
-}
-
 describe("GitStatusStore", () => {
   let store: GitStatusStore;
 
+  let restoreTestWindow: (() => void) | undefined;
+
   beforeEach(() => {
     mockExecuteBash.mockReset();
     mockGetProjectGitStatuses.mockReset();
@@ -282,14 +203,23 @@ describe("GitStatusStore", () => {
     } as Result<BashToolResult, string>);
     mockGetProjectGitStatuses.mockResolvedValue([]);
 
-    installMockWindowAPI();
+    restoreTestWindow = installTestWindow({
+      api: {
+        workspace: {
+          executeBash: mockExecuteBash,
+          getProjectGitStatuses: mockGetProjectGitStatuses,
+        },
+      },
+      ensureEventTargetMethods: true,
+    }).restore;
 
     store = createStore();
   });
 
   afterEach(() => {
     store.dispose();
-    restoreMockWindowAPI();
+    restoreTestWindow?.();
+    restoreTestWindow = undefined;
   });
 
   test("subscribe and unsubscribe", () => {

src/browser/testUtils.ts

@@ -14,6 +14,111 @@ export function requireTestModule<T>(modulePath: string): T {
   return requireForTest(modulePath) as T;
 }
 
+type TestWindowEventMethod = "addEventListener" | "removeEventListener" | "dispatchEvent";
+
+export type TestWindowWithApi = Window & typeof globalThis & { api?: unknown };
+
+interface InstallTestWindowOptions {
+  api?: unknown;
+  ensureEventTargetMethods?: boolean;
+}
+
+interface InstalledTestWindow {
+  window: TestWindowWithApi;
+  restore: () => void;
+}
+
+const TEST_WINDOW_EVENT_METHODS: Record<TestWindowEventMethod, EventTarget[TestWindowEventMethod]> =
+  {
+    addEventListener: () => undefined,
+    removeEventListener: () => undefined,
+    dispatchEvent: () => true,
+  };
+
+export function installTestWindow(options: InstallTestWindowOptions = {}): InstalledTestWindow {
+  const existingWindow = globalThis.window as TestWindowWithApi | undefined;
+  const targetWindow = existingWindow ?? (Object.create(null) as TestWindowWithApi);
+  const createdWindow = existingWindow == null;
+  const previousApiDescriptor = Object.getOwnPropertyDescriptor(targetWindow, "api");
+  const previousEventMethodDescriptors = new Map<
+    TestWindowEventMethod,
+    PropertyDescriptor | undefined
+  >();
+
+  if (createdWindow) {
+    globalThis.window = targetWindow;
+  }
+
+  if ("api" in options) {
+    Object.defineProperty(targetWindow, "api", {
+      configurable: true,
+      value: options.api,
+    });
+  }
+
+  if (options.ensureEventTargetMethods) {
+    for (const [method, replacement] of Object.entries(TEST_WINDOW_EVENT_METHODS) as Array<
+      [TestWindowEventMethod, EventTarget[TestWindowEventMethod]]
+    >) {
+      if (typeof targetWindow[method] === "function") {
+        continue;
+      }
+
+      previousEventMethodDescriptors.set(
+        method,
+        Object.getOwnPropertyDescriptor(targetWindow, method)
+      );
+      Object.defineProperty(targetWindow, method, { configurable: true, value: replacement });
+    }
+  }
+
+  let restored = false;
+  return {
+    window: targetWindow,
+    restore() {
+      if (restored) {
+        return;
+      }
+      restored = true;
+
+      if (previousApiDescriptor) {
+        Object.defineProperty(targetWindow, "api", previousApiDescriptor);
+      } else {
+        delete targetWindow.api;
+      }
+
+      for (const [method, descriptor] of previousEventMethodDescriptors) {
+        if (descriptor) {
+          Object.defineProperty(targetWindow, method, descriptor);
+        } else {
+          delete (targetWindow as Partial<Record<TestWindowEventMethod, unknown>>)[method];
+        }
+      }
+
+      if (createdWindow && globalThis.window === targetWindow) {
+        delete (globalThis as { window?: unknown }).window;
+      }
+    },
+  };
+}
+
+export function installTestNavigator(navigator: Navigator): () => void {
+  const previousNavigator = globalThis.navigator;
+  globalThis.navigator = navigator;
+
+  return () => {
+    if (globalThis.navigator !== navigator) {
+      return;
+    }
+
+    if (previousNavigator) {
+      globalThis.navigator = previousNavigator;
+    } else {
+      delete (globalThis as { navigator?: unknown }).navigator;
+    }
+  };
+}
+
 /**
  * Helper type for recursive partial mocks.
  * Allows partial mocking of nested objects and async functions.

src/browser/utils/ui/keybinds.test.ts

@@ -1,77 +1,50 @@
 import { afterEach, describe, it, expect, test } from "bun:test";
+import {
+  installTestNavigator,
+  installTestWindow,
+  type TestWindowWithApi,
+} from "@/browser/testUtils";
 import { isMac, matchesKeybind, KEYBINDS } from "./keybinds";
 import type { Keybind } from "@/common/types/keybind";
 
-type PlatformWindow = Window & typeof globalThis & { api?: unknown };
-
-let mockedWindow: PlatformWindow | undefined;
-let createdMockWindow = false;
-let previousApiDescriptor: PropertyDescriptor | undefined;
-let previousNavigator: Navigator | undefined;
-let mockedNavigator: Navigator | undefined;
+let testWindow: TestWindowWithApi | undefined;
+let restoreTestWindow: (() => void) | undefined;
+let restoreTestNavigator: (() => void) | undefined;
 
 function setPlatform(platform: "darwin" | "linux") {
-  const targetWindow = ensureWindow();
-  Object.defineProperty(targetWindow, "api", {
+  Object.defineProperty(ensureWindow(), "api", {
     configurable: true,
     value: { platform },
   });
 }
 
 function clearWindowAPI() {
-  const targetWindow = ensureWindow();
-  delete targetWindow.api;
+  delete ensureWindow().api;
 }
 
-function ensureWindow(): PlatformWindow {
-  if (mockedWindow) {
-    return mockedWindow;
-  }
-
-  const existingWindow = globalThis.window as PlatformWindow | undefined;
-  mockedWindow = existingWindow ?? (Object.create(null) as PlatformWindow);
-  createdMockWindow = existingWindow == null;
-  previousApiDescriptor = Object.getOwnPropertyDescriptor(mockedWindow, "api");
-
-  if (createdMockWindow) {
-    globalThis.window = mockedWindow;
+function ensureWindow(): TestWindowWithApi {
+  if (!testWindow) {
+    const installedWindow = installTestWindow();
+    testWindow = installedWindow.window;
+    restoreTestWindow = installedWindow.restore;
   }
 
-  return mockedWindow;
+  return testWindow;
 }
 
 function setNavigatorPlatform(platform: string) {
-  previousNavigator = globalThis.navigator;
-  mockedNavigator = { platform, userAgent: "Mozilla/5.0" } as unknown as Navigator;
-  globalThis.navigator = mockedNavigator;
+  restoreTestNavigator = installTestNavigator({
+    platform,
+    userAgent: "Mozilla/5.0",
+  } as unknown as Navigator);
 }
 
 afterEach(() => {
-  if (mockedWindow) {
-    if (previousApiDescriptor) {
-      Object.defineProperty(mockedWindow, "api", previousApiDescriptor);
-    } else {
-      delete mockedWindow.api;
-    }
-
-    if (createdMockWindow && globalThis.window === mockedWindow) {
-      delete (globalThis as { window?: unknown }).window;
-    }
-  }
-
-  if (mockedNavigator && globalThis.navigator === mockedNavigator) {
-    if (previousNavigator) {
-      globalThis.navigator = previousNavigator;
-    } else {
-      delete (globalThis as { navigator?: unknown }).navigator;
-    }
-  }
-
-  mockedWindow = undefined;
-  createdMockWindow = false;
-  previousApiDescriptor = undefined;
-  previousNavigator = undefined;
-  mockedNavigator = undefined;
+  restoreTestNavigator?.();
+  restoreTestWindow?.();
+  testWindow = undefined;
+  restoreTestWindow = undefined;
+  restoreTestNavigator = undefined;
 });
 
 // Helper to create a minimal keyboard event