From 3dd6e431df057af47b96990d0c9c6477ccfbe452 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 24 Jul 2025 10:13:00 -0700 Subject: feat: add GEMINI_CLI environment variable to spawned shell commands (#4791) --- .../cli/src/ui/hooks/shellCommandProcessor.test.ts | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'packages/cli/src/ui/hooks/shellCommandProcessor.test.ts') diff --git a/packages/cli/src/ui/hooks/shellCommandProcessor.test.ts b/packages/cli/src/ui/hooks/shellCommandProcessor.test.ts index 5ebf2b1d..1b268502 100644 --- a/packages/cli/src/ui/hooks/shellCommandProcessor.test.ts +++ b/packages/cli/src/ui/hooks/shellCommandProcessor.test.ts @@ -6,6 +6,8 @@ import { act, renderHook } from '@testing-library/react'; import { vi } from 'vitest'; +import { spawn } from 'child_process'; +import type { ChildProcessWithoutNullStreams } from 'child_process'; import { useShellCommandProcessor } from './shellCommandProcessor'; import { Config, GeminiClient } from '@google/gemini-cli-core'; import * as fs from 'fs'; @@ -39,12 +41,13 @@ describe('useShellCommandProcessor', () => { let configMock: Config; let geminiClientMock: GeminiClient; - beforeEach(async () => { - const { spawn } = await import('child_process'); + beforeEach(() => { spawnEmitter = new EventEmitter(); spawnEmitter.stdout = new EventEmitter(); spawnEmitter.stderr = new EventEmitter(); - (spawn as vi.Mock).mockReturnValue(spawnEmitter); + vi.mocked(spawn).mockReturnValue( + spawnEmitter as ChildProcessWithoutNullStreams, + ); vi.spyOn(fs, 'existsSync').mockReturnValue(false); vi.spyOn(fs, 'readFileSync').mockReturnValue(''); @@ -88,6 +91,16 @@ describe('useShellCommandProcessor', () => { result.current.handleShellCommand('ls -l', abortController.signal); }); + expect(spawn).toHaveBeenCalledWith( + 'bash', + ['-c', expect.any(String)], + expect.objectContaining({ + env: expect.objectContaining({ + GEMINI_CLI: '1', + }), + }), + ); + expect(onExecMock).toHaveBeenCalledTimes(1); const execPromise = onExecMock.mock.calls[0][0]; -- cgit v1.2.3