Merge tag 'v0.1.21' of github.com:google-gemini/gemini-cli into chore/sync-gemini-cli-v0.1.21

integration-tests/web_search.test.ts

@@ -4,78 +4,80 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { test } from 'node:test';
-import { strict as assert } from 'assert';
+import { describe, it, expect } from 'vitest';
 import { TestRig, printDebugInfo, validateModelOutput } from './test-helper.js';
 
-test('should be able to search the web', async () => {
-  // Skip if Tavily key is not configured
-  if (!process.env.TAVILY_API_KEY) {
-    console.warn('Skipping web search test: TAVILY_API_KEY not set');
-    return;
-  }
-  const rig = new TestRig();
-  await rig.setup('should be able to search the web');
-
-  let result;
-  try {
-    result = await rig.run(`what is the weather in London`);
-  } catch (error) {
-    // Network errors can occur in CI environments
-    if (
-      error instanceof Error &&
-      (error.message.includes('network') || error.message.includes('timeout'))
-    ) {
-      console.warn(
-        'Skipping test due to network error:',
-        (error as Error).message,
-      );
-      return; // Skip the test
+describe('web_search', () => {
+  it('should be able to search the web', async () => {
+    // Skip if Tavily key is not configured
+    if (!process.env.TAVILY_API_KEY) {
+      console.warn('Skipping web search test: TAVILY_API_KEY not set');
+      return;
     }
-    throw error; // Re-throw if not a network error
-  }
 
-  const foundToolCall = await rig.waitForToolCall('web_search');
+    const rig = new TestRig();
+    await rig.setup('should be able to search the web');
 
-  // Add debugging information
-  if (!foundToolCall) {
-    const allTools = printDebugInfo(rig, result);
+    let result;
+    try {
+      result = await rig.run(`what is the weather in London`);
+    } catch (error) {
+      // Network errors can occur in CI environments
+      if (
+        error instanceof Error &&
+        (error.message.includes('network') || error.message.includes('timeout'))
+      ) {
+        console.warn(
+          'Skipping test due to network error:',
+          (error as Error).message,
+        );
+        return; // Skip the test
+      }
+      throw error; // Re-throw if not a network error
+    }
 
-    // Check if the tool call failed due to network issues
-    const failedSearchCalls = allTools.filter(
-      (t) => t.toolRequest.name === 'web_search' && !t.toolRequest.success,
+    const foundToolCall = await rig.waitForToolCall('web_search');
+
+    // Add debugging information
+    if (!foundToolCall) {
+      const allTools = printDebugInfo(rig, result);
+
+      // Check if the tool call failed due to network issues
+      const failedSearchCalls = allTools.filter(
+        (t) => t.toolRequest.name === 'web_search' && !t.toolRequest.success,
+      );
+      if (failedSearchCalls.length > 0) {
+        console.warn(
+          'web_search tool was called but failed, possibly due to network issues',
+        );
+        console.warn(
+          'Failed calls:',
+          failedSearchCalls.map((t) => t.toolRequest.args),
+        );
+        return; // Skip the test if network issues
+      }
+    }
+
+    expect(foundToolCall, 'Expected to find a call to web_search').toBeTruthy();
+
+    // Validate model output - will throw if no output, warn if missing expected content
+    const hasExpectedContent = validateModelOutput(
+      result,
+      ['weather', 'london'],
+      'Web search test',
     );
-    if (failedSearchCalls.length > 0) {
-      console.warn(
-        'web_search tool was called but failed, possibly due to network issues',
-      );
-      console.warn(
-        'Failed calls:',
-        failedSearchCalls.map((t) => t.toolRequest.args),
-      );
-      return; // Skip the test if network issues
+
+    // If content was missing, log the search queries used
+    if (!hasExpectedContent) {
+      const searchCalls = rig
+        .readToolLogs()
+        .filter((t) => t.toolRequest.name === 'web_search');
+      if (searchCalls.length > 0) {
+        console.warn(
+          'Search queries used:',
+          searchCalls.map((t) => t.toolRequest.args),
+        );
+      }
     }
-  }
-
-  assert.ok(foundToolCall, 'Expected to find a call to web_search');
-
-  // Validate model output - will throw if no output, warn if missing expected content
-  const hasExpectedContent = validateModelOutput(
-    result,
-    ['weather', 'london'],
-    'Web search test',
-  );
-
-  // If content was missing, log the search queries used
-  if (!hasExpectedContent) {
-    const searchCalls = rig
-      .readToolLogs()
-      .filter((t) => t.toolRequest.name === 'web_search');
-    if (searchCalls.length > 0) {
-      console.warn(
-        'Search queries used:',
-        searchCalls.map((t) => t.toolRequest.args),
-      );
-    }
-  }
+  });
 });