From 475e92da5d6dc6896ca7f700b2cf94ef3686b1ee Mon Sep 17 00:00:00 2001 From: Tommaso Sciortino Date: Thu, 6 Nov 2025 20:01:30 -0800 Subject: [PATCH] Fix test in windows (#12681) --- packages/cli/src/config/config.test.ts | 8 +++++--- packages/core/src/config/config.test.ts | 10 +++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/cli/src/config/config.test.ts b/packages/cli/src/config/config.test.ts index 08a4eaab4a..e7d675ed15 100644 --- a/packages/cli/src/config/config.test.ts +++ b/packages/cli/src/config/config.test.ts @@ -36,7 +36,7 @@ vi.mock('./sandboxConfig.js', () => ({ vi.mock('fs', async (importOriginal) => { const actualFs = await importOriginal(); const pathMod = await import('node:path'); - const mockHome = '/mock/home/user'; + const mockHome = pathMod.resolve(pathMod.sep, 'mock', 'home', 'user'); const MOCK_CWD1 = process.cwd(); const MOCK_CWD2 = pathMod.resolve(pathMod.sep, 'home', 'user', 'project'); @@ -69,7 +69,7 @@ vi.mock('os', async (importOriginal) => { const actualOs = await importOriginal(); return { ...actualOs, - homedir: vi.fn(() => '/mock/home/user'), + homedir: vi.fn(() => path.resolve(path.sep, 'mock', 'home', 'user')), }; }); @@ -1480,7 +1480,9 @@ describe('loadCliConfig folderTrust', () => { describe('loadCliConfig with includeDirectories', () => { beforeEach(() => { vi.resetAllMocks(); - vi.mocked(os.homedir).mockReturnValue('/mock/home/user'); + vi.mocked(os.homedir).mockReturnValue( + path.resolve(path.sep, 'mock', 'home', 'user'), + ); vi.stubEnv('GEMINI_API_KEY', 'test-api-key'); vi.spyOn(process, 'cwd').mockReturnValue( path.resolve(path.sep, 'home', 'user', 'project'), diff --git a/packages/core/src/config/config.test.ts b/packages/core/src/config/config.test.ts index 9f4650be07..242639c8fb 100644 --- a/packages/core/src/config/config.test.ts +++ b/packages/core/src/config/config.test.ts @@ -391,7 +391,8 @@ describe('Server Config (config.ts)', () => { }); it('should initialize WorkspaceContext with includeDirectories', () => { - const includeDirectories = ['/path/to/dir1', '/path/to/dir2']; + const resolved = path.resolve(baseParams.targetDir); + const includeDirectories = ['dir1', 'dir2']; const paramsWithIncludeDirs: ConfigParameters = { ...baseParams, includeDirectories, @@ -399,12 +400,11 @@ describe('Server Config (config.ts)', () => { const config = new Config(paramsWithIncludeDirs); const workspaceContext = config.getWorkspaceContext(); const directories = workspaceContext.getDirectories(); - // Should include the target directory plus the included directories expect(directories).toHaveLength(3); - expect(directories).toContain(path.resolve(baseParams.targetDir)); - expect(directories).toContain('/path/to/dir1'); - expect(directories).toContain('/path/to/dir2'); + expect(directories).toContain(resolved); + expect(directories).toContain(path.join(resolved, 'dir1')); + expect(directories).toContain(path.join(resolved, 'dir2')); }); it('Config constructor should set telemetry to true when provided as true', () => {