From 67d9b76e813a0ed77b504eec6665024c57e6778f Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <ntaylormullen@google.com>
Date: Mon, 9 Feb 2026 23:54:23 -0800
Subject: [PATCH] test(core): remove hardcoded model from TestRig (#18710)

---
 evals/shell-efficiency.eval.ts      |  6 +++---
 integration-tests/vitest.config.ts  |  3 +++
 packages/test-utils/src/test-rig.ts | 10 +++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/evals/shell-efficiency.eval.ts b/evals/shell-efficiency.eval.ts
index ee016d53c4..fbb8cc133e 100644
--- a/evals/shell-efficiency.eval.ts
+++ b/evals/shell-efficiency.eval.ts
@@ -20,7 +20,7 @@ describe('Shell Efficiency', () => {
     return typeof args === 'string' ? args : (args as any)['command'];
   };
 
-  evalTest('ALWAYS_PASSES', {
+  evalTest('USUALLY_PASSES', {
     name: 'should use --silent/--quiet flags when installing packages',
     prompt: 'Install the "lodash" package using npm.',
     assert: async (rig) => {
@@ -49,7 +49,7 @@ describe('Shell Efficiency', () => {
     },
   });
 
-  evalTest('ALWAYS_PASSES', {
+  evalTest('USUALLY_PASSES', {
     name: 'should use --no-pager with git commands',
     prompt: 'Show the git log.',
     assert: async (rig) => {
@@ -72,7 +72,7 @@ describe('Shell Efficiency', () => {
     },
   });
 
-  evalTest('ALWAYS_PASSES', {
+  evalTest('USUALLY_PASSES', {
     name: 'should NOT use efficiency flags when enableShellOutputEfficiency is disabled',
     params: {
       settings: {
diff --git a/integration-tests/vitest.config.ts b/integration-tests/vitest.config.ts
index 59a16c40d6..fb2ba4e1af 100644
--- a/integration-tests/vitest.config.ts
+++ b/integration-tests/vitest.config.ts
@@ -20,5 +20,8 @@ export default defineConfig({
         maxThreads: 16,
       },
     },
+    env: {
+      GEMINI_TEST_TYPE: 'integration',
+    },
   },
 });
diff --git a/packages/test-utils/src/test-rig.ts b/packages/test-utils/src/test-rig.ts
index 7a74dc9082..dbc7dadd16 100644
--- a/packages/test-utils/src/test-rig.ts
+++ b/packages/test-utils/src/test-rig.ts
@@ -408,9 +408,13 @@ export class TestRig {
         ui: {
           useAlternateBuffer: true,
         },
-        model: {
-          name: DEFAULT_GEMINI_MODEL,
-        },
+        ...(env['GEMINI_TEST_TYPE'] === 'integration'
+          ? {
+              model: {
+                name: DEFAULT_GEMINI_MODEL,
+              },
+            }
+          : {}),
         sandbox:
           env['GEMINI_SANDBOX'] !== 'false' ? env['GEMINI_SANDBOX'] : false,
         // Don't show the IDE connection dialog when running from VsCode