mirror of
https://github.com/QwenLM/qwen-code.git
synced 2025-12-19 09:33:53 +00:00
# 🚀 Sync Gemini CLI v0.2.1 - Major Feature Update (#483)
This commit is contained in:
@@ -24,14 +24,14 @@ describe('validateNonInterActiveAuth', () => {
|
||||
>;
|
||||
|
||||
beforeEach(() => {
|
||||
originalEnvGeminiApiKey = process.env.GEMINI_API_KEY;
|
||||
originalEnvVertexAi = process.env.GOOGLE_GENAI_USE_VERTEXAI;
|
||||
originalEnvGcp = process.env.GOOGLE_GENAI_USE_GCA;
|
||||
originalEnvOpenAiApiKey = process.env.OPENAI_API_KEY;
|
||||
delete process.env.GEMINI_API_KEY;
|
||||
delete process.env.GOOGLE_GENAI_USE_VERTEXAI;
|
||||
delete process.env.GOOGLE_GENAI_USE_GCA;
|
||||
delete process.env.OPENAI_API_KEY;
|
||||
originalEnvGeminiApiKey = process.env['GEMINI_API_KEY'];
|
||||
originalEnvVertexAi = process.env['GOOGLE_GENAI_USE_VERTEXAI'];
|
||||
originalEnvGcp = process.env['GOOGLE_GENAI_USE_GCA'];
|
||||
originalEnvOpenAiApiKey = process.env['OPENAI_API_KEY'];
|
||||
delete process.env['GEMINI_API_KEY'];
|
||||
delete process.env['GOOGLE_GENAI_USE_VERTEXAI'];
|
||||
delete process.env['GOOGLE_GENAI_USE_GCA'];
|
||||
delete process.env['OPENAI_API_KEY'];
|
||||
consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
|
||||
processExitSpy = vi.spyOn(process, 'exit').mockImplementation((code) => {
|
||||
throw new Error(`process.exit(${code}) called`);
|
||||
@@ -41,24 +41,24 @@ describe('validateNonInterActiveAuth', () => {
|
||||
|
||||
afterEach(() => {
|
||||
if (originalEnvGeminiApiKey !== undefined) {
|
||||
process.env.GEMINI_API_KEY = originalEnvGeminiApiKey;
|
||||
process.env['GEMINI_API_KEY'] = originalEnvGeminiApiKey;
|
||||
} else {
|
||||
delete process.env.GEMINI_API_KEY;
|
||||
delete process.env['GEMINI_API_KEY'];
|
||||
}
|
||||
if (originalEnvVertexAi !== undefined) {
|
||||
process.env.GOOGLE_GENAI_USE_VERTEXAI = originalEnvVertexAi;
|
||||
process.env['GOOGLE_GENAI_USE_VERTEXAI'] = originalEnvVertexAi;
|
||||
} else {
|
||||
delete process.env.GOOGLE_GENAI_USE_VERTEXAI;
|
||||
delete process.env['GOOGLE_GENAI_USE_VERTEXAI'];
|
||||
}
|
||||
if (originalEnvGcp !== undefined) {
|
||||
process.env.GOOGLE_GENAI_USE_GCA = originalEnvGcp;
|
||||
process.env['GOOGLE_GENAI_USE_GCA'] = originalEnvGcp;
|
||||
} else {
|
||||
delete process.env.GOOGLE_GENAI_USE_GCA;
|
||||
delete process.env['GOOGLE_GENAI_USE_GCA'];
|
||||
}
|
||||
if (originalEnvOpenAiApiKey !== undefined) {
|
||||
process.env.OPENAI_API_KEY = originalEnvOpenAiApiKey;
|
||||
process.env['OPENAI_API_KEY'] = originalEnvOpenAiApiKey;
|
||||
} else {
|
||||
delete process.env.OPENAI_API_KEY;
|
||||
delete process.env['OPENAI_API_KEY'];
|
||||
}
|
||||
vi.restoreAllMocks();
|
||||
});
|
||||
@@ -84,7 +84,7 @@ describe('validateNonInterActiveAuth', () => {
|
||||
});
|
||||
|
||||
it('uses LOGIN_WITH_GOOGLE if GOOGLE_GENAI_USE_GCA is set', async () => {
|
||||
process.env.GOOGLE_GENAI_USE_GCA = 'true';
|
||||
process.env['GOOGLE_GENAI_USE_GCA'] = 'true';
|
||||
const nonInteractiveConfig: NonInteractiveConfig = {
|
||||
refreshAuth: refreshAuthMock,
|
||||
};
|
||||
@@ -97,7 +97,7 @@ describe('validateNonInterActiveAuth', () => {
|
||||
});
|
||||
|
||||
it('uses USE_GEMINI if GEMINI_API_KEY is set', async () => {
|
||||
process.env.GEMINI_API_KEY = 'fake-key';
|
||||
process.env['GEMINI_API_KEY'] = 'fake-key';
|
||||
const nonInteractiveConfig: NonInteractiveConfig = {
|
||||
refreshAuth: refreshAuthMock,
|
||||
};
|
||||
@@ -110,7 +110,7 @@ describe('validateNonInterActiveAuth', () => {
|
||||
});
|
||||
|
||||
it('uses USE_OPENAI if OPENAI_API_KEY is set', async () => {
|
||||
process.env.OPENAI_API_KEY = 'fake-openai-key';
|
||||
process.env['OPENAI_API_KEY'] = 'fake-openai-key';
|
||||
const nonInteractiveConfig: NonInteractiveConfig = {
|
||||
refreshAuth: refreshAuthMock,
|
||||
};
|
||||
@@ -123,9 +123,9 @@ describe('validateNonInterActiveAuth', () => {
|
||||
});
|
||||
|
||||
it('uses USE_VERTEX_AI if GOOGLE_GENAI_USE_VERTEXAI is true (with GOOGLE_CLOUD_PROJECT and GOOGLE_CLOUD_LOCATION)', async () => {
|
||||
process.env.GOOGLE_GENAI_USE_VERTEXAI = 'true';
|
||||
process.env.GOOGLE_CLOUD_PROJECT = 'test-project';
|
||||
process.env.GOOGLE_CLOUD_LOCATION = 'us-central1';
|
||||
process.env['GOOGLE_GENAI_USE_VERTEXAI'] = 'true';
|
||||
process.env['GOOGLE_CLOUD_PROJECT'] = 'test-project';
|
||||
process.env['GOOGLE_CLOUD_LOCATION'] = 'us-central1';
|
||||
const nonInteractiveConfig: NonInteractiveConfig = {
|
||||
refreshAuth: refreshAuthMock,
|
||||
};
|
||||
@@ -138,8 +138,8 @@ describe('validateNonInterActiveAuth', () => {
|
||||
});
|
||||
|
||||
it('uses USE_VERTEX_AI if GOOGLE_GENAI_USE_VERTEXAI is true and GOOGLE_API_KEY is set', async () => {
|
||||
process.env.GOOGLE_GENAI_USE_VERTEXAI = 'true';
|
||||
process.env.GOOGLE_API_KEY = 'vertex-api-key';
|
||||
process.env['GOOGLE_GENAI_USE_VERTEXAI'] = 'true';
|
||||
process.env['GOOGLE_API_KEY'] = 'vertex-api-key';
|
||||
const nonInteractiveConfig: NonInteractiveConfig = {
|
||||
refreshAuth: refreshAuthMock,
|
||||
};
|
||||
@@ -152,11 +152,11 @@ describe('validateNonInterActiveAuth', () => {
|
||||
});
|
||||
|
||||
it('uses LOGIN_WITH_GOOGLE if GOOGLE_GENAI_USE_GCA is set, even with other env vars', async () => {
|
||||
process.env.GOOGLE_GENAI_USE_GCA = 'true';
|
||||
process.env.GEMINI_API_KEY = 'fake-key';
|
||||
process.env.GOOGLE_GENAI_USE_VERTEXAI = 'true';
|
||||
process.env.GOOGLE_CLOUD_PROJECT = 'test-project';
|
||||
process.env.GOOGLE_CLOUD_LOCATION = 'us-central1';
|
||||
process.env['GOOGLE_GENAI_USE_GCA'] = 'true';
|
||||
process.env['GEMINI_API_KEY'] = 'fake-key';
|
||||
process.env['GOOGLE_GENAI_USE_VERTEXAI'] = 'true';
|
||||
process.env['GOOGLE_CLOUD_PROJECT'] = 'test-project';
|
||||
process.env['GOOGLE_CLOUD_LOCATION'] = 'us-central1';
|
||||
const nonInteractiveConfig: NonInteractiveConfig = {
|
||||
refreshAuth: refreshAuthMock,
|
||||
};
|
||||
@@ -169,10 +169,10 @@ describe('validateNonInterActiveAuth', () => {
|
||||
});
|
||||
|
||||
it('uses USE_VERTEX_AI if both GEMINI_API_KEY and GOOGLE_GENAI_USE_VERTEXAI are set', async () => {
|
||||
process.env.GEMINI_API_KEY = 'fake-key';
|
||||
process.env.GOOGLE_GENAI_USE_VERTEXAI = 'true';
|
||||
process.env.GOOGLE_CLOUD_PROJECT = 'test-project';
|
||||
process.env.GOOGLE_CLOUD_LOCATION = 'us-central1';
|
||||
process.env['GEMINI_API_KEY'] = 'fake-key';
|
||||
process.env['GOOGLE_GENAI_USE_VERTEXAI'] = 'true';
|
||||
process.env['GOOGLE_CLOUD_PROJECT'] = 'test-project';
|
||||
process.env['GOOGLE_CLOUD_LOCATION'] = 'us-central1';
|
||||
const nonInteractiveConfig: NonInteractiveConfig = {
|
||||
refreshAuth: refreshAuthMock,
|
||||
};
|
||||
@@ -185,10 +185,10 @@ describe('validateNonInterActiveAuth', () => {
|
||||
});
|
||||
|
||||
it('uses USE_GEMINI if GOOGLE_GENAI_USE_VERTEXAI is false, GEMINI_API_KEY is set, and project/location are available', async () => {
|
||||
process.env.GOOGLE_GENAI_USE_VERTEXAI = 'false';
|
||||
process.env.GEMINI_API_KEY = 'fake-key';
|
||||
process.env.GOOGLE_CLOUD_PROJECT = 'test-project';
|
||||
process.env.GOOGLE_CLOUD_LOCATION = 'us-central1';
|
||||
process.env['GOOGLE_GENAI_USE_VERTEXAI'] = 'false';
|
||||
process.env['GEMINI_API_KEY'] = 'fake-key';
|
||||
process.env['GOOGLE_CLOUD_PROJECT'] = 'test-project';
|
||||
process.env['GOOGLE_CLOUD_LOCATION'] = 'us-central1';
|
||||
const nonInteractiveConfig: NonInteractiveConfig = {
|
||||
refreshAuth: refreshAuthMock,
|
||||
};
|
||||
@@ -202,7 +202,7 @@ describe('validateNonInterActiveAuth', () => {
|
||||
|
||||
it('uses configuredAuthType if provided', async () => {
|
||||
// Set required env var for USE_GEMINI
|
||||
process.env.GEMINI_API_KEY = 'fake-key';
|
||||
process.env['GEMINI_API_KEY'] = 'fake-key';
|
||||
const nonInteractiveConfig: NonInteractiveConfig = {
|
||||
refreshAuth: refreshAuthMock,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user