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

fix some isWorkspaceTrusted mocks (#10836)

Browse Source
This commit is contained in:
Jacob MacDonald
2025-10-09 15:05:54 -07:00
committed by GitHub
parent 0b6c02000f
commit ed37b7c5e7
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/cli/src/config/config.test.ts
+21 -6
View File
@@ -1465,7 +1465,10 @@ describe('Approval mode tool exclusion logic', () => {
beforeEach(() => { beforeEach(() => {
process.stdin.isTTY = false; // Ensure non-interactive mode process.stdin.isTTY = false; // Ensure non-interactive mode
vi.mocked(isWorkspaceTrusted).mockReturnValue(true); vi.mocked(isWorkspaceTrusted).mockReturnValue({
isTrusted: true,
source: undefined,
});
}); });
afterEach(() => { afterEach(() => {
@@ -2686,7 +2689,10 @@ describe('loadCliConfig tool exclusions', () => {
vi.mocked(os.homedir).mockReturnValue('/mock/home/user'); vi.mocked(os.homedir).mockReturnValue('/mock/home/user');
vi.stubEnv('GEMINI_API_KEY', 'test-api-key'); vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
process.stdin.isTTY = true; process.stdin.isTTY = true;
vi.mocked(isWorkspaceTrusted).mockReturnValue(true); vi.mocked(isWorkspaceTrusted).mockReturnValue({
isTrusted: true,
source: undefined,
});
}); });
afterEach(() => { afterEach(() => {
@@ -3116,7 +3122,10 @@ describe('loadCliConfig approval mode', () => {
vi.mocked(os.homedir).mockReturnValue('/mock/home/user'); vi.mocked(os.homedir).mockReturnValue('/mock/home/user');
vi.stubEnv('GEMINI_API_KEY', 'test-api-key'); vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
process.argv = ['node', 'script.js']; // Reset argv for each test process.argv = ['node', 'script.js']; // Reset argv for each test
vi.mocked(isWorkspaceTrusted).mockReturnValue(true); vi.mocked(isWorkspaceTrusted).mockReturnValue({
isTrusted: true,
source: undefined,
});
}); });
afterEach(() => { afterEach(() => {
@@ -3575,7 +3584,9 @@ describe('Telemetry configuration via environment variables', () => {
vi.stubEnv('GEMINI_TELEMETRY_TARGET', 'gcp'); vi.stubEnv('GEMINI_TELEMETRY_TARGET', 'gcp');
process.argv = ['node', 'script.js']; process.argv = ['node', 'script.js'];
const argv = await parseArguments({} as Settings); const argv = await parseArguments({} as Settings);
const settings: Settings = { telemetry: { target: 'local' } }; const settings: Settings = {
telemetry: { target: ServerConfig.TelemetryTarget.LOCAL },
};
const config = await loadCliConfig( const config = await loadCliConfig(
settings, settings,
[], [],
@@ -3593,7 +3604,9 @@ describe('Telemetry configuration via environment variables', () => {
vi.stubEnv('GEMINI_TELEMETRY_TARGET', 'bogus'); vi.stubEnv('GEMINI_TELEMETRY_TARGET', 'bogus');
process.argv = ['node', 'script.js']; process.argv = ['node', 'script.js'];
const argv = await parseArguments({} as Settings); const argv = await parseArguments({} as Settings);
const settings: Settings = { telemetry: { target: 'gcp' } }; const settings: Settings = {
telemetry: { target: ServerConfig.TelemetryTarget.GCP },
};
await expect( await expect(
loadCliConfig( loadCliConfig(
settings, settings,
@@ -3728,7 +3741,9 @@ describe('Telemetry configuration via environment variables', () => {
vi.stubEnv('GEMINI_TELEMETRY_TARGET', undefined); vi.stubEnv('GEMINI_TELEMETRY_TARGET', undefined);
process.argv = ['node', 'script.js']; process.argv = ['node', 'script.js'];
const argv = await parseArguments({} as Settings); const argv = await parseArguments({} as Settings);
const settings: Settings = { telemetry: { target: 'local' } }; const settings: Settings = {
telemetry: { target: ServerConfig.TelemetryTarget.LOCAL },
};
const config = await loadCliConfig( const config = await loadCliConfig(
settings, settings,
[], [],
packages/cli/src/config/settings.test.ts
+4 -1
View File
@@ -2355,7 +2355,10 @@ describe('Settings Loading and Merging', () => {
mockDisableExtension = vi.mocked(disableExtension); mockDisableExtension = vi.mocked(disableExtension);
(mockFsExistsSync as Mock).mockReturnValue(true); (mockFsExistsSync as Mock).mockReturnValue(true);
vi.mocked(isWorkspaceTrusted).mockReturnValue(true); vi.mocked(isWorkspaceTrusted).mockReturnValue({
isTrusted: true,
source: undefined,
});
}); });
afterEach(() => { afterEach(() => {