From 00705b14bdb75de5f70b13e10821dd3c655c4014 Mon Sep 17 00:00:00 2001
From: Tommaso Sciortino <sciortino@gmail.com>
Date: Wed, 3 Dec 2025 11:07:23 -0800
Subject: [PATCH] Fix tests (#14458)

---
 .../cli/src/ui/components/GeminiRespondingSpinner.test.tsx  | 4 ++++
 packages/cli/src/utils/sandboxUtils.test.ts                 | 3 +++
 packages/cli/src/utils/version.test.ts                      | 6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/ui/components/GeminiRespondingSpinner.test.tsx b/packages/cli/src/ui/components/GeminiRespondingSpinner.test.tsx
index 88f6c3fd13..891ccaf39d 100644
--- a/packages/cli/src/ui/components/GeminiRespondingSpinner.test.tsx
+++ b/packages/cli/src/ui/components/GeminiRespondingSpinner.test.tsx
@@ -24,6 +24,10 @@ vi.mock('ink', async () => {
   };
 });
 
+vi.mock('./CliSpinner.js', () => ({
+  CliSpinner: () => 'Spinner',
+}));
+
 describe('GeminiRespondingSpinner', () => {
   const mockUseStreamingContext = vi.mocked(useStreamingContext);
   const mockUseIsScreenReaderEnabled = vi.mocked(useIsScreenReaderEnabled);
diff --git a/packages/cli/src/utils/sandboxUtils.test.ts b/packages/cli/src/utils/sandboxUtils.test.ts
index 4f28425b65..b999f415e4 100644
--- a/packages/cli/src/utils/sandboxUtils.test.ts
+++ b/packages/cli/src/utils/sandboxUtils.test.ts
@@ -33,6 +33,9 @@ describe('sandboxUtils', () => {
   beforeEach(() => {
     vi.clearAllMocks();
     process.env = { ...originalEnv };
+    // Clean up these env vars that might affect tests
+    delete process.env['NODE_ENV'];
+    delete process.env['DEBUG'];
   });
 
   afterEach(() => {
diff --git a/packages/cli/src/utils/version.test.ts b/packages/cli/src/utils/version.test.ts
index c3a1cad30d..8e811efa39 100644
--- a/packages/cli/src/utils/version.test.ts
+++ b/packages/cli/src/utils/version.test.ts
@@ -6,7 +6,7 @@
 
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { getCliVersion } from './version.js';
-import * as core from '@google/gemini-cli-core';
+import { getPackageJson } from '@google/gemini-cli-core';
 
 vi.mock('@google/gemini-cli-core', () => ({
   getPackageJson: vi.fn(),
@@ -18,7 +18,7 @@ describe('version', () => {
   beforeEach(() => {
     vi.resetModules();
     process.env = { ...originalEnv };
-    vi.mocked(core.getPackageJson).mockResolvedValue({ version: '1.0.0' });
+    vi.mocked(getPackageJson).mockResolvedValue({ version: '1.0.0' });
   });
 
   afterEach(() => {
@@ -39,7 +39,7 @@ describe('version', () => {
 
   it('should return "unknown" if package.json is not found and CLI_VERSION is not set', async () => {
     delete process.env['CLI_VERSION'];
-    vi.mocked(core.getPackageJson).mockResolvedValue(undefined);
+    vi.mocked(getPackageJson).mockResolvedValue(undefined);
     const version = await getCliVersion();
     expect(version).toBe('unknown');
   });