MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-05-13 05:12:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

refactor(test): complete rig.setup/configure refactor and path normalization

Browse Source 
- Refactor all remaining rig.setup calls to use the new setup/configure pattern.
- Consistently normalize all script paths to forward slashes for Windows compatibility.
- Ensure proper ordering of rig.setup and rig.configure in all tests.
This commit is contained in:
Abhi
2026-02-06 12:57:33 -05:00
parent fb3dfea925
commit e1d8cc78d7
2 changed files with 115 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/hooks-agent-flow.test.ts
+6 -4
View File
@@ -24,7 +24,8 @@ describe('Hooks Agent Flow', () => {
describe('BeforeAgent Hooks', () => { describe('BeforeAgent Hooks', () => {
it('should inject additional context via BeforeAgent hook', async () => { it('should inject additional context via BeforeAgent hook', async () => {
await rig.setup('should inject additional context via BeforeAgent hook', { await rig.setup('should inject additional context via BeforeAgent hook');
await rig.configure({
fakeResponsesPath: join( fakeResponsesPath: join(
import.meta.dirname, import.meta.dirname,
'hooks-agent-flow.responses', 'hooks-agent-flow.responses',
@@ -54,7 +55,7 @@ describe('Hooks Agent Flow', () => {
); );
writeFileSync(scriptPath, hookScript); writeFileSync(scriptPath, hookScript);
await rig.setup('should inject additional context via BeforeAgent hook', { await rig.configure({
settings: { settings: {
hooksConfig: { hooksConfig: {
enabled: true, enabled: true,
@@ -97,7 +98,8 @@ describe('Hooks Agent Flow', () => {
describe('AfterAgent Hooks', () => { describe('AfterAgent Hooks', () => {
it('should receive prompt and response in AfterAgent hook', async () => { it('should receive prompt and response in AfterAgent hook', async () => {
await rig.setup('should receive prompt and response in AfterAgent hook', { await rig.setup('should receive prompt and response in AfterAgent hook');
await rig.configure({
fakeResponsesPath: join( fakeResponsesPath: join(
import.meta.dirname, import.meta.dirname,
'hooks-agent-flow.responses', 'hooks-agent-flow.responses',
@@ -122,7 +124,7 @@ describe('Hooks Agent Flow', () => {
); );
writeFileSync(scriptPath, hookScript); writeFileSync(scriptPath, hookScript);
await rig.setup('should receive prompt and response in AfterAgent hook', { await rig.configure({
settings: { settings: {
hooksConfig: { hooksConfig: {
enabled: true, enabled: true,
integration-tests/hooks-system.test.ts
+109 -98
View File
@@ -48,7 +48,7 @@ describe('Hooks System Integration', () => {
hooks: [ hooks: [
{ {
type: 'command', type: 'command',
command: `node "${scriptPath}"`, command: `node "${scriptPath.replace(/\\/g, '/')}"`,
timeout: 5000, timeout: 5000,
}, },
], ],
@@ -107,7 +107,7 @@ describe('Hooks System Integration', () => {
{ {
type: 'command', type: 'command',
// Exit with code 2 and write reason to stderr // Exit with code 2 and write reason to stderr
command: `node "${scriptPath}"`, command: `node "${scriptPath.replace(/\\/g, '/')}"`,
timeout: 5000, timeout: 5000,
}, },
], ],
@@ -168,7 +168,7 @@ describe('Hooks System Integration', () => {
hooks: [ hooks: [
{ {
type: 'command', type: 'command',
command: `node "${scriptPath}"`, command: `node "${scriptPath.replace(/\\/g, '/')}"`,
timeout: 5000, timeout: 5000,
}, },
], ],
@@ -204,7 +204,7 @@ describe('Hooks System Integration', () => {
scriptPath, scriptPath,
"console.log(JSON.stringify({hookSpecificOutput: {hookEventName: 'AfterTool', additionalContext: 'Security scan: File content appears safe'}}))", "console.log(JSON.stringify({hookSpecificOutput: {hookEventName: 'AfterTool', additionalContext: 'Security scan: File content appears safe'}}))",
); );
const command = `node "${scriptPath}"`; const command = `node "${scriptPath.replace(/\\/g, '/')}"`;
rig.configure({ rig.configure({
fakeResponsesPath: join( fakeResponsesPath: join(
import.meta.dirname, import.meta.dirname,
@@ -259,7 +259,8 @@ describe('Hooks System Integration', () => {
it('should modify LLM requests with BeforeModel hooks', async () => { it('should modify LLM requests with BeforeModel hooks', async () => {
// Create a hook script that replaces the LLM request with a modified version // Create a hook script that replaces the LLM request with a modified version
// Note: Providing messages in the hook output REPLACES the entire conversation // Note: Providing messages in the hook output REPLACES the entire conversation
rig.setup('should modify LLM requests with BeforeModel hooks', { rig.setup('should modify LLM requests with BeforeModel hooks');
rig.configure({
fakeResponsesPath: join( fakeResponsesPath: join(
import.meta.dirname, import.meta.dirname,
'hooks-system.before-model.responses', 'hooks-system.before-model.responses',
@@ -284,7 +285,7 @@ console.log(JSON.stringify({
const scriptPath = join(rig.testDir!, 'before_model_hook.cjs'); const scriptPath = join(rig.testDir!, 'before_model_hook.cjs');
writeFileSync(scriptPath, hookScript); writeFileSync(scriptPath, hookScript);
rig.setup('should modify LLM requests with BeforeModel hooks', { rig.configure({
settings: { settings: {
hooksConfig: { hooksConfig: {
enabled: true, enabled: true,
@@ -343,29 +344,26 @@ console.log(JSON.stringify({
const scriptPath = join(rig.testDir!, 'before_model_deny_hook.cjs'); const scriptPath = join(rig.testDir!, 'before_model_deny_hook.cjs');
writeFileSync(scriptPath, hookScript); writeFileSync(scriptPath, hookScript);
rig.setup( rig.configure({
'should block model execution when BeforeModel hook returns deny decision', settings: {
{ hooksConfig: {
settings: { enabled: true,
hooksConfig: { },
enabled: true, hooks: {
}, BeforeModel: [
hooks: { {
BeforeModel: [ hooks: [
{ {
hooks: [ type: 'command',
{ command: `node "${scriptPath.replace(/\\/g, '/')}"`,
type: 'command', timeout: 5000,
command: `node "${scriptPath}"`, },
timeout: 5000, ],
}, },
], ],
},
],
},
}, },
}, },
); });
const result = await rig.run({ args: 'Hello' }); const result = await rig.run({ args: 'Hello' });
@@ -388,29 +386,26 @@ console.log(JSON.stringify({
const scriptPath = join(rig.testDir!, 'before_model_block_hook.cjs'); const scriptPath = join(rig.testDir!, 'before_model_block_hook.cjs');
writeFileSync(scriptPath, hookScript); writeFileSync(scriptPath, hookScript);
rig.setup( rig.configure({
'should block model execution when BeforeModel hook returns block decision', settings: {
{ hooksConfig: {
settings: { enabled: true,
hooksConfig: { },
enabled: true, hooks: {
}, BeforeModel: [
hooks: { {
BeforeModel: [ hooks: [
{ {
hooks: [ type: 'command',
{ command: `node "${scriptPath.replace(/\\/g, '/')}"`,
type: 'command', timeout: 5000,
command: `node "${scriptPath}"`, },
timeout: 5000, ],
}, },
], ],
},
],
},
}, },
}, },
); });
const result = await rig.run({ args: 'Hello' }); const result = await rig.run({ args: 'Hello' });
@@ -427,7 +422,8 @@ console.log(JSON.stringify({
it.skipIf(process.platform === 'win32')( it.skipIf(process.platform === 'win32')(
'should modify LLM responses with AfterModel hooks', 'should modify LLM responses with AfterModel hooks',
async () => { async () => {
rig.setup('should modify LLM responses with AfterModel hooks', { rig.setup('should modify LLM responses with AfterModel hooks');
rig.configure({
fakeResponsesPath: join( fakeResponsesPath: join(
import.meta.dirname, import.meta.dirname,
'hooks-system.after-model.responses', 'hooks-system.after-model.responses',
@@ -457,7 +453,7 @@ console.log(JSON.stringify({
const scriptPath = join(rig.testDir!, 'after_model_hook.cjs'); const scriptPath = join(rig.testDir!, 'after_model_hook.cjs');
writeFileSync(scriptPath, hookScript); writeFileSync(scriptPath, hookScript);
rig.setup('should modify LLM responses with AfterModel hooks', { rig.configure({
settings: { settings: {
hooksConfig: { hooksConfig: {
enabled: true, enabled: true,
@@ -468,7 +464,7 @@ console.log(JSON.stringify({
hooks: [ hooks: [
{ {
type: 'command', type: 'command',
command: `node "${scriptPath}"`, command: `node "${scriptPath.replace(/\\/g, '/')}"`,
timeout: 5000, timeout: 5000,
}, },
], ],
@@ -494,7 +490,8 @@ console.log(JSON.stringify({
describe('BeforeToolSelection Hooks - Tool Configuration', () => { describe('BeforeToolSelection Hooks - Tool Configuration', () => {
it('should modify tool selection with BeforeToolSelection hooks', async () => { it('should modify tool selection with BeforeToolSelection hooks', async () => {
rig.setup('should modify tool selection with BeforeToolSelection hooks', { rig.setup('should modify tool selection with BeforeToolSelection hooks');
rig.configure({
fakeResponsesPath: join( fakeResponsesPath: join(
import.meta.dirname, import.meta.dirname,
'hooks-system.before-tool-selection.responses', 'hooks-system.before-tool-selection.responses',
@@ -514,7 +511,7 @@ console.log(JSON.stringify({
const scriptPath = join(rig.testDir!, 'before_tool_selection_hook.cjs'); const scriptPath = join(rig.testDir!, 'before_tool_selection_hook.cjs');
writeFileSync(scriptPath, hookScript); writeFileSync(scriptPath, hookScript);
rig.setup('should modify tool selection with BeforeToolSelection hooks', { rig.configure({
settings: { settings: {
debugMode: true, debugMode: true,
hooksConfig: { hooksConfig: {
@@ -563,7 +560,8 @@ console.log(JSON.stringify({
describe('BeforeAgent Hooks - Prompt Augmentation', () => { describe('BeforeAgent Hooks - Prompt Augmentation', () => {
it('should augment prompts with BeforeAgent hooks', async () => { it('should augment prompts with BeforeAgent hooks', async () => {
rig.setup('should augment prompts with BeforeAgent hooks', { rig.setup('should augment prompts with BeforeAgent hooks');
rig.configure({
fakeResponsesPath: join( fakeResponsesPath: join(
import.meta.dirname, import.meta.dirname,
'hooks-system.before-agent.responses', 'hooks-system.before-agent.responses',
@@ -582,7 +580,7 @@ console.log(JSON.stringify({
const scriptPath = join(rig.testDir!, 'before_agent_hook.cjs'); const scriptPath = join(rig.testDir!, 'before_agent_hook.cjs');
writeFileSync(scriptPath, hookScript); writeFileSync(scriptPath, hookScript);
rig.setup('should augment prompts with BeforeAgent hooks', { rig.configure({
settings: { settings: {
hooksConfig: { hooksConfig: {
enabled: true, enabled: true,
@@ -795,7 +793,8 @@ console.log(JSON.stringify({
describe('Hook Input/Output Validation', () => { describe('Hook Input/Output Validation', () => {
it('should provide correct input format to hooks', async () => { it('should provide correct input format to hooks', async () => {
rig.setup('should provide correct input format to hooks', { rig.setup('should provide correct input format to hooks');
rig.configure({
fakeResponsesPath: join( fakeResponsesPath: join(
import.meta.dirname, import.meta.dirname,
'hooks-system.input-validation.responses', 'hooks-system.input-validation.responses',
@@ -819,7 +818,7 @@ try {
const scriptPath = join(rig.testDir!, 'input_validation_hook.cjs'); const scriptPath = join(rig.testDir!, 'input_validation_hook.cjs');
writeFileSync(scriptPath, hookScript); writeFileSync(scriptPath, hookScript);
rig.setup('should provide correct input format to hooks', { rig.configure({
settings: { settings: {
hooksConfig: { hooksConfig: {
enabled: true, enabled: true,
@@ -885,7 +884,7 @@ try {
type: 'command', type: 'command',
// Output plain text then JSON. // Output plain text then JSON.
// This breaks JSON parsing, so it falls back to 'allow' with the whole stdout as systemMessage. // This breaks JSON parsing, so it falls back to 'allow' with the whole stdout as systemMessage.
command: `node "${scriptPath}"`, command: `node "${scriptPath.replace(/\\/g, '/')}"`,
timeout: 5000, timeout: 5000,
}, },
], ],
@@ -1222,7 +1221,8 @@ console.log(JSON.stringify({
} }
}));`; }));`;
rig.setup('should fire SessionStart hook and inject context', { rig.setup('should fire SessionStart hook and inject context');
rig.configure({
fakeResponsesPath: join( fakeResponsesPath: join(
import.meta.dirname, import.meta.dirname,
'hooks-system.session-startup.responses', 'hooks-system.session-startup.responses',
@@ -1232,7 +1232,7 @@ console.log(JSON.stringify({
const scriptPath = join(rig.testDir!, 'session_start_context_hook.cjs'); const scriptPath = join(rig.testDir!, 'session_start_context_hook.cjs');
writeFileSync(scriptPath, hookScript); writeFileSync(scriptPath, hookScript);
rig.setup('should fire SessionStart hook and inject context', { rig.configure({
settings: { settings: {
hooksConfig: { hooksConfig: {
enabled: true, enabled: true,
@@ -1301,13 +1301,13 @@ console.log(JSON.stringify({
rig.setup( rig.setup(
'should fire SessionStart hook and display systemMessage in interactive mode', 'should fire SessionStart hook and display systemMessage in interactive mode',
{
fakeResponsesPath: join(
import.meta.dirname,
'hooks-system.session-startup.responses',
),
},
); );
rig.configure({
fakeResponsesPath: join(
import.meta.dirname,
'hooks-system.session-startup.responses',
),
});
const scriptPath = join( const scriptPath = join(
rig.testDir!, rig.testDir!,
@@ -1315,30 +1315,27 @@ console.log(JSON.stringify({
); );
writeFileSync(scriptPath, hookScript); writeFileSync(scriptPath, hookScript);
rig.setup( rig.configure({
'should fire SessionStart hook and display systemMessage in interactive mode', settings: {
{ hooksConfig: {
settings: { enabled: true,
hooksConfig: { },
enabled: true, hooks: {
}, SessionStart: [
hooks: { {
SessionStart: [ matcher: 'startup',
{ hooks: [
matcher: 'startup', {
hooks: [ type: 'command',
{ command: `node "${scriptPath.replace(/\\/g, '/')}"`,
type: 'command', timeout: 5000,
command: `node "${scriptPath}"`, },
timeout: 5000, ],
}, },
], ],
},
],
},
}, },
}, },
); });
const run = await rig.runInteractive(); const run = await rig.runInteractive();
@@ -1728,7 +1725,8 @@ console.log(JSON.stringify({
describe('Hook Disabling', () => { describe('Hook Disabling', () => {
it('should not execute hooks disabled in settings file', async () => { it('should not execute hooks disabled in settings file', async () => {
rig.setup('should not execute hooks disabled in settings file', { rig.setup('should not execute hooks disabled in settings file');
rig.configure({
fakeResponsesPath: join( fakeResponsesPath: join(
import.meta.dirname, import.meta.dirname,
'hooks-system.disabled-via-settings.responses', 'hooks-system.disabled-via-settings.responses',
@@ -1742,13 +1740,19 @@ console.log(JSON.stringify({decision: "allow", systemMessage: "Enabled hook exec
const disabledHookScript = `const fs = require('fs'); const disabledHookScript = `const fs = require('fs');
console.log(JSON.stringify({decision: "block", systemMessage: "Disabled hook should not execute", reason: "This hook should be disabled"}));`; console.log(JSON.stringify({decision: "block", systemMessage: "Disabled hook should not execute", reason: "This hook should be disabled"}));`;
const enabledPath = join(rig.testDir!, 'enabled_hook.cjs'); const enabledPath = join(rig.testDir!, 'enabled_hook.cjs').replace(
const disabledPath = join(rig.testDir!, 'disabled_hook.cjs'); /\\/g,
'/',
);
const disabledPath = join(rig.testDir!, 'disabled_hook.cjs').replace(
/\\/g,
'/',
);
writeFileSync(enabledPath, enabledHookScript); writeFileSync(enabledPath, enabledHookScript);
writeFileSync(disabledPath, disabledHookScript); writeFileSync(disabledPath, disabledHookScript);
rig.setup('should not execute hooks disabled in settings file', { rig.configure({
settings: { settings: {
hooksConfig: { hooksConfig: {
enabled: true, enabled: true,
@@ -1805,7 +1809,8 @@ console.log(JSON.stringify({decision: "block", systemMessage: "Disabled hook sho
}); });
it('should respect disabled hooks across multiple operations', async () => { it('should respect disabled hooks across multiple operations', async () => {
rig.setup('should respect disabled hooks across multiple operations', { rig.setup('should respect disabled hooks across multiple operations');
rig.configure({
fakeResponsesPath: join( fakeResponsesPath: join(
import.meta.dirname, import.meta.dirname,
'hooks-system.disabled-via-command.responses', 'hooks-system.disabled-via-command.responses',
@@ -1819,13 +1824,19 @@ console.log(JSON.stringify({decision: "allow", systemMessage: "Active hook execu
const disabledHookScript = `const fs = require('fs'); const disabledHookScript = `const fs = require('fs');
console.log(JSON.stringify({decision: "block", systemMessage: "Disabled hook should not execute", reason: "This hook is disabled"}));`; console.log(JSON.stringify({decision: "block", systemMessage: "Disabled hook should not execute", reason: "This hook is disabled"}));`;
const activePath = join(rig.testDir!, 'active_hook.cjs'); const activePath = join(rig.testDir!, 'active_hook.cjs').replace(
const disabledPath = join(rig.testDir!, 'disabled_hook.cjs'); /\\/g,
'/',
);
const disabledPath = join(rig.testDir!, 'disabled_hook.cjs').replace(
/\\/g,
'/',
);
writeFileSync(activePath, activeHookScript); writeFileSync(activePath, activeHookScript);
writeFileSync(disabledPath, disabledHookScript); writeFileSync(disabledPath, disabledHookScript);
rig.setup('should respect disabled hooks across multiple operations', { rig.configure({
settings: { settings: {
hooksConfig: { hooksConfig: {
enabled: true, enabled: true,
@@ -1928,7 +1939,7 @@ console.log(JSON.stringify({decision: "block", systemMessage: "Disabled hook sho
const commandPath = scriptPath.replace(/\\/g, '/'); const commandPath = scriptPath.replace(/\\/g, '/');
// 2. Full setup with settings and fake responses // 2. Full setup with settings and fake responses
rig.setup('should override tool input parameters via BeforeTool hook', { rig.configure({
fakeResponsesPath: join( fakeResponsesPath: join(
import.meta.dirname, import.meta.dirname,
'hooks-system.input-modification.responses', 'hooks-system.input-modification.responses',
@@ -2014,7 +2025,7 @@ console.log(JSON.stringify({decision: "block", systemMessage: "Disabled hook sho
writeFileSync(scriptPath, hookScript); writeFileSync(scriptPath, hookScript);
const commandPath = scriptPath.replace(/\\/g, '/'); const commandPath = scriptPath.replace(/\\/g, '/');
rig.setup('should stop agent execution via BeforeTool hook', { rig.configure({
fakeResponsesPath: join( fakeResponsesPath: join(
import.meta.dirname, import.meta.dirname,
'hooks-system.before-tool-stop.responses', 'hooks-system.before-tool-stop.responses',