clone/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-04-24 14:46:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve remaining Windows test failures and revert empty env check

Browse Source
This commit is contained in:
Bryan Morgan
2026-01-31 18:34:53 -05:00
parent cc1e0edfa1
commit 784530d52f
3 changed files with 14 additions and 1287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1279
docs/proposals/client-side-experimentation-framework.md
View File

File diff suppressed because it is too large Load Diff

18
packages/cli/src/config/settings.test.ts
View File

@@ -1707,15 +1707,20 @@ describe('Settings Loading and Merging', () => {
isWorkspaceTrustedValue = true as boolean | undefined,
}) {
delete process.env['TESTTEST']; // reset
const geminiEnvPath = path.join(MOCK_WORKSPACE_DIR, GEMINI_DIR, '.env');
const geminiEnvPath = path.resolve(
path.join(MOCK_WORKSPACE_DIR, GEMINI_DIR, '.env'),
);
vi.spyOn(trustedFolders, 'isWorkspaceTrusted').mockReturnValue({
isTrusted: isWorkspaceTrustedValue,
source: 'file',
});
(mockFsExistsSync as Mock).mockImplementation((p: fs.PathLike) =>
[USER_SETTINGS_PATH, geminiEnvPath].includes(p.toString()),
);
(mockFsExistsSync as Mock).mockImplementation((p: fs.PathLike) => {
const normalizedP = path.resolve(p.toString());
return [path.resolve(USER_SETTINGS_PATH), geminiEnvPath].includes(
normalizedP,
);
});
const userSettingsContent: Settings = {
ui: {
theme: 'dark',
@@ -1731,9 +1736,10 @@ describe('Settings Loading and Merging', () => {
};
(fs.readFileSync as Mock).mockImplementation(
(p: fs.PathOrFileDescriptor) => {
if (p === USER_SETTINGS_PATH)
const normalizedP = path.resolve(p.toString());
if (normalizedP === path.resolve(USER_SETTINGS_PATH))
return JSON.stringify(userSettingsContent);
if (p === geminiEnvPath) return 'TESTTEST=1234';
if (normalizedP === geminiEnvPath) return 'TESTTEST=1234';
return '{}';
},
);

4
packages/cli/src/config/settings.ts
View File

@@ -469,8 +469,8 @@ export function loadEnvironment(
continue;
}
// Load variable only if it's not already set in the environment or if it's an empty string.
if (!Object.hasOwn(process.env, key) || process.env[key] === '') {
// Load variable only if it's not already set in the environment.
if (!Object.hasOwn(process.env, key)) {
process.env[key] = parsedEnv[key];
}
}