tidy tests

Author: joshualitt

packages/core/src/config/config.test.ts

@@ -45,6 +45,7 @@ import {
   PREVIEW_GEMINI_MODEL,
   PREVIEW_GEMINI_MODEL_AUTO,
 } from './models.js';
+import { initMockProjectRegistry } from '../test-utils/mockProjectRegistry.js';
 
 vi.mock('fs', async (importOriginal) => {
   const actual = await importOriginal<typeof import('fs')>();
@@ -207,19 +208,6 @@ vi.mock('../core/tokenLimits.js', () => ({
 vi.mock('../code_assist/codeAssist.js');
 vi.mock('../code_assist/experiments/experiments.js');
 
-const mockProjectRegistryInitialize = vi.hoisted(() =>
-  vi.fn().mockReturnValue(undefined),
-);
-
-vi.mock('./projectRegistry.js', () => {
-  const ProjectRegistryMock = vi.fn();
-  ProjectRegistryMock.prototype.initialize = mockProjectRegistryInitialize;
-  ProjectRegistryMock.prototype.getShortId = vi
-    .fn()
-    .mockReturnValue('project-slug');
-  return { ProjectRegistry: ProjectRegistryMock };
-});
-
 describe('Server Config (config.ts)', () => {
   const MODEL = DEFAULT_GEMINI_MODEL;
   const SANDBOX: SandboxConfig = {
@@ -250,6 +238,7 @@ describe('Server Config (config.ts)', () => {
   beforeEach(() => {
     // Reset mocks if necessary
     vi.clearAllMocks();
+    initMockProjectRegistry();
     vi.mocked(getExperiments).mockResolvedValue({
       experimentIds: [],
       flags: {},

packages/core/src/config/storage.test.ts

@@ -20,27 +20,22 @@ import { Storage } from './storage.js';
 import { GEMINI_DIR } from '../utils/paths.js';
 import { ProjectRegistry } from './projectRegistry.js';
 import { StorageMigration } from './storageMigration.js';
+import {
+  initMockProjectRegistry,
+  PROJECT_SLUG,
+} from 'src/test-utils/mockProjectRegistry.js';
 
 vi.mock('./projectRegistry.js');
 vi.mock('./storageMigration.js');
 
-const PROJECT_SLUG = 'project-slug';
-
 describe('Storage – initialize', () => {
   const projectRoot = '/tmp/project';
   let storage: Storage;
 
   beforeEach(() => {
     storage = new Storage(projectRoot);
     vi.clearAllMocks();
-
-    // Mock ProjectRegistry to return a predictable shortId
-    vi.mocked(ProjectRegistry).prototype.initialize = vi
-      .fn()
-      .mockReturnValue(undefined);
-    vi.mocked(ProjectRegistry).prototype.getShortId = vi
-      .fn()
-      .mockReturnValue(PROJECT_SLUG);
+    initMockProjectRegistry();
 
     // Mock StorageMigration.migrateDirectory
     vi.mocked(StorageMigration.migrateDirectory).mockReturnValue(undefined);

packages/core/src/core/logger.test.ts

@@ -28,12 +28,15 @@ import type { Content } from '@google/genai';
 import os from 'node:os';
 import { GEMINI_DIR } from '../utils/paths.js';
 import { debugLogger } from '../utils/debugLogger.js';
+import {
+  initMockProjectRegistry,
+  PROJECT_SLUG,
+} from 'src/test-utils/mockProjectRegistry.js';
 
 const TMP_DIR_NAME = 'tmp';
 const LOG_FILE_NAME = 'logs.json';
 const CHECKPOINT_FILE_NAME = 'checkpoint.json';
 
-const PROJECT_SLUG = 'project-slug';
 const TEST_GEMINI_DIR = path.join(
   os.homedir(),
   GEMINI_DIR,
@@ -71,25 +74,13 @@ vi.mock('../utils/session.js', () => ({
   sessionId: 'test-session-id',
 }));
 
-const hoistedMockProjectRegistry = vi.hoisted(() => vi.fn());
-vi.mock('../config/projectRegistry.js', () => {
-  hoistedMockProjectRegistry.mockImplementation(() => ({
-    initialize: vi.fn(),
-    getShortId: vi.fn().mockReturnValue(PROJECT_SLUG),
-  }));
-  return { ProjectRegistry: hoistedMockProjectRegistry };
-});
-
 describe('Logger', () => {
   let logger: Logger;
   const testSessionId = 'test-session-id';
 
   beforeEach(async () => {
     vi.resetAllMocks();
-    hoistedMockProjectRegistry.mockImplementation(() => ({
-      initialize: vi.fn(),
-      getShortId: vi.fn().mockReturnValue(PROJECT_SLUG),
-    }));
+    initMockProjectRegistry();
     vi.useFakeTimers();
     vi.setSystemTime(new Date('2025-01-01T12:00:00.000Z'));
     // Clean up before the test

packages/core/src/scheduler/tool-executor.test.ts

@@ -17,6 +17,7 @@ import * as fileUtils from '../utils/fileUtils.js';
 import * as coreToolHookTriggers from '../core/coreToolHookTriggers.js';
 import { ShellToolInvocation } from '../tools/shell.js';
 import { createMockMessageBus } from '../test-utils/mock-message-bus.js';
+import { initMockProjectRegistry } from 'src/test-utils/mockProjectRegistry.js';
 
 // Mock file utils
 vi.mock('../utils/fileUtils.js', () => ({
@@ -29,20 +30,11 @@ vi.mock('../core/coreToolHookTriggers.js', () => ({
   executeToolWithHooks: vi.fn(),
 }));
 
-const hoistedMockProjectRegistry = vi.hoisted(() => vi.fn());
-vi.mock('../config/projectRegistry.js', () => {
-  hoistedMockProjectRegistry.mockImplementation(() => ({
-    initialize: vi.fn(),
-    getShortId: vi.fn().mockReturnValue('project-slug'),
-  }));
-  return { ProjectRegistry: hoistedMockProjectRegistry };
-});
-
 describe('ToolExecutor', () => {
   let config: Config;
   let executor: ToolExecutor;
 
-  beforeEach(async () => {
+  beforeEach(() => {
     // Use the standard fake config factory
     config = makeFakeConfig();
     executor = new ToolExecutor(config);
@@ -58,10 +50,7 @@ describe('ToolExecutor', () => {
     vi.mocked(fileUtils.formatTruncatedToolOutput).mockReturnValue(
       'TruncatedContent...',
     );
-    hoistedMockProjectRegistry.mockImplementation(() => ({
-      initialize: vi.fn(),
-      getShortId: vi.fn().mockReturnValue('project-slug'),
-    }));
+    initMockProjectRegistry();
   });
 
   afterEach(() => {

packages/core/src/services/gitService.test.ts

@@ -20,6 +20,10 @@ import * as fs from 'node:fs/promises';
 import * as os from 'node:os';
 import { GEMINI_DIR, homedir as pathsHomedir } from '../utils/paths.js';
 import { spawnAsync } from '../utils/shell-utils.js';
+import {
+  initMockProjectRegistry,
+  PROJECT_SLUG,
+} from '../test-utils/mockProjectRegistry.js';
 
 vi.mock('../utils/shell-utils.js', () => ({
   spawnAsync: vi.fn(),
@@ -77,16 +81,6 @@ vi.mock('../utils/debugLogger.js', () => ({
   debugLogger: hoistedMockDebugLogger,
 }));
 
-const PROJECT_SLUG = 'project-slug';
-const hoistedMockProjectRegistry = vi.hoisted(() => vi.fn());
-vi.mock('../config/projectRegistry.js', () => {
-  hoistedMockProjectRegistry.mockImplementation(() => ({
-    initialize: vi.fn(),
-    getShortId: vi.fn().mockReturnValue(PROJECT_SLUG),
-  }));
-  return { ProjectRegistry: hoistedMockProjectRegistry };
-});
-
 describe('GitService', () => {
   let testRootDir: string;
   let projectRoot: string;
@@ -134,10 +128,7 @@ describe('GitService', () => {
     hoistedMockCommit.mockResolvedValue({
       commit: 'initial',
     });
-    hoistedMockProjectRegistry.mockImplementation(() => ({
-      initialize: vi.fn(),
-      getShortId: vi.fn().mockReturnValue(PROJECT_SLUG),
-    }));
+    initMockProjectRegistry();
     storage = new Storage(projectRoot);
   });
 

packages/core/src/test-utils/mockProjectRegistry.ts

@@ -0,0 +1,29 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { vi } from 'vitest';
+
+import { ProjectRegistry } from '../config/projectRegistry.js';
+
+export const PROJECT_SLUG = 'project-slug';
+
+export function initMockProjectRegistry() {
+  vi.mocked(ProjectRegistry).prototype.initialize = vi
+    .fn()
+    .mockReturnValue(undefined);
+  vi.mocked(ProjectRegistry).prototype.getShortId = vi
+    .fn()
+    .mockReturnValue(PROJECT_SLUG);
+}
+
+initMockProjectRegistry();
+
+// export function createMockProjectRegistry() {
+//   return {
+//     initialize: vi.fn(),
+//     getShortId: vi.fn().mockReturnValue(PROJECT_SLUG),
+//   }
+// }