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

packages/cli/src/ui/components/FolderTrustDialog.test.tsx

@@ -8,19 +8,29 @@ import { renderWithProviders } from '../../test-utils/render.js';
 import { waitFor } from '@testing-library/react';
 import { vi } from 'vitest';
 import { FolderTrustDialog, FolderTrustChoice } from './FolderTrustDialog.js';
-import * as process from 'node:process';
+import * as processUtils from '../../utils/processUtils.js';
 
-vi.mock('process', async () => {
-  const actual = await vi.importActual('process');
+vi.mock('../../utils/processUtils.js', () => ({
+  relaunchApp: vi.fn(),
+}));
+
+const mockedExit = vi.hoisted(() => vi.fn());
+const mockedCwd = vi.hoisted(() => vi.fn());
+
+vi.mock('node:process', async () => {
+  const actual =
+    await vi.importActual<typeof import('node:process')>('node:process');
   return {
     ...actual,
-    exit: vi.fn(),
+    exit: mockedExit,
+    cwd: mockedCwd,
   };
 });
 
 describe('FolderTrustDialog', () => {
   beforeEach(() => {
     vi.clearAllMocks();
+    mockedCwd.mockReturnValue('/home/user/project');
   });
 
   it('should render the dialog with title and description', () => {
@@ -65,21 +75,18 @@ describe('FolderTrustDialog', () => {
       <FolderTrustDialog onSelect={vi.fn()} isRestarting={true} />,
     );
 
-    expect(lastFrame()).toContain(
-      'To see changes, Qwen Code must be restarted',
-    );
+    expect(lastFrame()).toContain(' Qwen Code is restarting');
   });
 
-  it('should call process.exit when "r" is pressed and isRestarting is true', async () => {
-    const { stdin } = renderWithProviders(
+  it('should call relaunchApp when isRestarting is true', async () => {
+    vi.useFakeTimers();
+    const relaunchApp = vi.spyOn(processUtils, 'relaunchApp');
+    renderWithProviders(
       <FolderTrustDialog onSelect={vi.fn()} isRestarting={true} />,
     );
-
-    stdin.write('r');
-
-    await waitFor(() => {
-      expect(process.exit).toHaveBeenCalledWith(0);
-    });
+    await vi.advanceTimersByTimeAsync(1000);
+    expect(relaunchApp).toHaveBeenCalled();
+    vi.useRealTimers();
   });
 
   it('should not call process.exit when "r" is pressed and isRestarting is false', async () => {
@@ -90,7 +97,33 @@ describe('FolderTrustDialog', () => {
     stdin.write('r');
 
     await waitFor(() => {
-      expect(process.exit).not.toHaveBeenCalled();
+      expect(mockedExit).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('directory display', () => {
+    it('should correctly display the folder name for a nested directory', () => {
+      mockedCwd.mockReturnValue('/home/user/project');
+      const { lastFrame } = renderWithProviders(
+        <FolderTrustDialog onSelect={vi.fn()} />,
+      );
+      expect(lastFrame()).toContain('Trust folder (project)');
+    });
+
+    it('should correctly display the parent folder name for a nested directory', () => {
+      mockedCwd.mockReturnValue('/home/user/project');
+      const { lastFrame } = renderWithProviders(
+        <FolderTrustDialog onSelect={vi.fn()} />,
+      );
+      expect(lastFrame()).toContain('Trust parent folder (user)');
+    });
+
+    it('should correctly display an empty parent folder name for a directory directly under root', () => {
+      mockedCwd.mockReturnValue('/project');
+      const { lastFrame } = renderWithProviders(
+        <FolderTrustDialog onSelect={vi.fn()} />,
+      );
+      expect(lastFrame()).toContain('Trust parent folder ()');
     });
   });
 });