Sync upstream Gemini-CLI v0.8.2 (#838)

packages/core/src/ide/ide-installer.test.ts

@@ -4,17 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { vi } from 'vitest';
+
+vi.mock('node:child_process', async (importOriginal) => {
+  const actual =
+    (await importOriginal()) as typeof import('node:child_process');
+  return {
+    ...actual,
+    execSync: vi.fn(),
+    spawnSync: vi.fn(() => ({ status: 0 })),
+  };
+});
+vi.mock('fs');
+vi.mock('os');
+
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { getIdeInstaller } from './ide-installer.js';
 import * as child_process from 'node:child_process';
 import * as fs from 'node:fs';
 import * as os from 'node:os';
 import * as path from 'node:path';
-import { DetectedIde } from './detect-ide.js';
-
-vi.mock('child_process');
-vi.mock('fs');
-vi.mock('os');
+import { IDE_DEFINITIONS, type IdeInfo } from './detect-ide.js';
 
 describe('ide-installer', () => {
   const HOME_DIR = '/home/user';
@@ -28,23 +38,28 @@ describe('ide-installer', () => {
   });
 
   describe('getIdeInstaller', () => {
-    it.each([{ ide: DetectedIde.VSCode }, { ide: DetectedIde.FirebaseStudio }])(
-      'returns a VsCodeInstaller for "$ide"',
-      ({ ide }) => {
-        const installer = getIdeInstaller(ide);
+    it.each([
+      { ide: IDE_DEFINITIONS.vscode },
+      { ide: IDE_DEFINITIONS.firebasestudio },
+    ])('returns a VsCodeInstaller for "$ide.name"', ({ ide }) => {
+      const installer = getIdeInstaller(ide);
 
-        expect(installer).not.toBeNull();
-        expect(installer?.install).toEqual(expect.any(Function));
-      },
-    );
+      expect(installer).not.toBeNull();
+      expect(installer?.install).toEqual(expect.any(Function));
+    });
   });
 
   describe('VsCodeInstaller', () => {
     function setup({
-      ide = DetectedIde.VSCode,
+      ide = IDE_DEFINITIONS.vscode,
       existsResult = false,
       execSync = () => '',
       platform = 'linux' as NodeJS.Platform,
+    }: {
+      ide?: IdeInfo;
+      existsResult?: boolean;
+      execSync?: () => string;
+      platform?: NodeJS.Platform;
     } = {}) {
       vi.spyOn(child_process, 'execSync').mockImplementation(execSync);
       vi.spyOn(fs, 'existsSync').mockReturnValue(existsResult);
@@ -97,20 +112,25 @@ describe('ide-installer', () => {
           platform: 'linux',
         });
         await installer.install();
-        expect(child_process.execSync).toHaveBeenCalledWith(
-          '"code" --install-extension qwenlm.qwen-code-vscode-ide-companion --force',
+        expect(child_process.spawnSync).toHaveBeenCalledWith(
+          'code',
+          [
+            '--install-extension',
+            'qwenlm.qwen-code-vscode-ide-companion',
+            '--force',
+          ],
           { stdio: 'pipe' },
         );
       });
 
       it.each([
         {
-          ide: DetectedIde.VSCode,
+          ide: IDE_DEFINITIONS.vscode,
           expectedMessage:
             'VS Code companion extension was installed successfully',
         },
         {
-          ide: DetectedIde.FirebaseStudio,
+          ide: IDE_DEFINITIONS.firebasestudio,
           expectedMessage:
             'Firebase Studio companion extension was installed successfully',
         },
@@ -125,9 +145,12 @@ describe('ide-installer', () => {
       );
 
       it.each([
-        { ide: DetectedIde.VSCode, expectedErr: 'VS Code CLI not found' },
         {
-          ide: DetectedIde.FirebaseStudio,
+          ide: IDE_DEFINITIONS.vscode,
+          expectedErr: 'VS Code CLI not found',
+        },
+        {
+          ide: IDE_DEFINITIONS.firebasestudio,
           expectedErr: 'Firebase Studio CLI not found',
         },
       ])(