mirror of
https://github.com/QwenLM/qwen-code.git
synced 2025-12-19 09:33:53 +00:00
Sync upstream Gemini-CLI v0.8.2 (#838)
This commit is contained in:
tanzhenxin
GitHub
@@ -4,146 +4,183 @@
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
|
||||
import { getReleaseVersion } from '../get-release-version';
|
||||
import { vi, describe, it, expect, beforeEach } from 'vitest';
|
||||
import { getVersion } from '../get-release-version.js';
|
||||
import { execSync } from 'node:child_process';
|
||||
import { readFileSync } from 'node:fs';
|
||||
|
||||
// Mock child_process so we can spy on execSync
|
||||
vi.mock('child_process', () => ({
|
||||
execSync: vi.fn(),
|
||||
}));
|
||||
|
||||
// Mock fs module
|
||||
vi.mock('fs', () => ({
|
||||
default: {
|
||||
readFileSync: vi.fn(),
|
||||
},
|
||||
}));
|
||||
|
||||
describe('getReleaseVersion', async () => {
|
||||
// Dynamically import execSync and fs after mocking
|
||||
const { execSync } = await import('node:child_process');
|
||||
const fs = await import('fs');
|
||||
const originalEnv = { ...process.env };
|
||||
vi.mock('node:child_process');
|
||||
vi.mock('node:fs');
|
||||
|
||||
describe('getVersion', () => {
|
||||
beforeEach(() => {
|
||||
vi.resetAllMocks();
|
||||
process.env = { ...originalEnv };
|
||||
// Mock date to be consistent
|
||||
vi.setSystemTime(new Date('2025-08-20T00:00:00.000Z'));
|
||||
// Provide a default mock for execSync to avoid toString() on undefined
|
||||
vi.mocked(execSync).mockReturnValue('');
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
process.env = originalEnv;
|
||||
vi.useRealTimers();
|
||||
});
|
||||
|
||||
it('should generate a nightly version and get previous tag', () => {
|
||||
process.env.IS_NIGHTLY = 'true';
|
||||
vi.mocked(fs.default.readFileSync).mockReturnValue(
|
||||
JSON.stringify({ version: '0.1.0' }),
|
||||
vi.setSystemTime(new Date('2025-09-17T00:00:00.000Z'));
|
||||
// Mock package.json being read by getNightlyVersion
|
||||
vi.mocked(readFileSync).mockReturnValue(
|
||||
JSON.stringify({ version: '0.8.0' }),
|
||||
);
|
||||
|
||||
vi.mocked(execSync).mockImplementation((command) => {
|
||||
if (command.includes('git tag --list "v*.*.*"')) {
|
||||
return 'v0.1.0\nv0.0.1'; // Mock stable tags for getLatestStableTag
|
||||
}
|
||||
if (command.includes('git tag -l "v0.1.1-nightly.*"')) {
|
||||
return ''; // No existing nightly tags
|
||||
}
|
||||
if (command.includes('gh release list')) {
|
||||
return 'v0.1.0-nightly.5'; // Previous nightly release
|
||||
}
|
||||
return '';
|
||||
});
|
||||
|
||||
const { releaseTag, releaseVersion, npmTag, previousReleaseTag } =
|
||||
getReleaseVersion();
|
||||
expect(releaseTag).toBe('v0.1.1-nightly.0');
|
||||
expect(releaseVersion).toBe('0.1.1-nightly.0');
|
||||
expect(npmTag).toBe('nightly');
|
||||
expect(previousReleaseTag).toBe('v0.1.0-nightly.5');
|
||||
});
|
||||
|
||||
it('should use the manual version and get previous tag', () => {
|
||||
process.env.MANUAL_VERSION = 'v0.1.1';
|
||||
// This is the base mock for a clean state with no conflicts or rollbacks
|
||||
const mockExecSync = (command) => {
|
||||
// NPM dist-tags
|
||||
if (command.includes('npm view') && command.includes('--tag=latest'))
|
||||
return '0.6.1';
|
||||
if (command.includes('npm view') && command.includes('--tag=preview'))
|
||||
return '0.7.0-preview.1';
|
||||
if (command.includes('npm view') && command.includes('--tag=nightly'))
|
||||
return '0.8.0-nightly.20250916.abcdef';
|
||||
|
||||
vi.mocked(execSync).mockImplementation((command) => {
|
||||
if (command.includes('gh release list')) {
|
||||
return 'v0.1.0'; // Previous stable release
|
||||
}
|
||||
return '';
|
||||
// NPM versions list
|
||||
if (command.includes('npm view') && command.includes('versions --json'))
|
||||
return JSON.stringify([
|
||||
'0.6.0',
|
||||
'0.6.1',
|
||||
'0.7.0-preview.0',
|
||||
'0.7.0-preview.1',
|
||||
'0.8.0-nightly.20250916.abcdef',
|
||||
]);
|
||||
|
||||
// Deprecation checks (default to not deprecated)
|
||||
if (command.includes('deprecated')) return '';
|
||||
|
||||
// Git Tag Mocks
|
||||
if (command.includes("git tag -l 'v[0-9].[0-9].[0-9]'")) return 'v0.6.1';
|
||||
if (command.includes("git tag -l 'v*-preview*'")) return 'v0.7.0-preview.1';
|
||||
if (command.includes("git tag -l 'v*-nightly*'"))
|
||||
return 'v0.8.0-nightly.20250916.abcdef';
|
||||
|
||||
// Git Hash Mock
|
||||
if (command.includes('git rev-parse --short HEAD')) return 'd3bf8a3d';
|
||||
|
||||
// For doesVersionExist checks - default to not found
|
||||
if (
|
||||
command.includes('npm view') &&
|
||||
command.includes('@google/gemini-cli@')
|
||||
) {
|
||||
throw new Error('NPM version not found');
|
||||
}
|
||||
if (command.includes('git tag -l')) return '';
|
||||
if (command.includes('gh release view')) {
|
||||
throw new Error('GH release not found');
|
||||
}
|
||||
|
||||
return '';
|
||||
};
|
||||
|
||||
describe('Happy Path - Version Calculation', () => {
|
||||
it('should calculate the next stable version from the latest preview', () => {
|
||||
vi.mocked(execSync).mockImplementation(mockExecSync);
|
||||
const result = getVersion({ type: 'stable' });
|
||||
expect(result.releaseVersion).toBe('0.7.0');
|
||||
expect(result.npmTag).toBe('latest');
|
||||
expect(result.previousReleaseTag).toBe('v0.6.1');
|
||||
});
|
||||
|
||||
const result = getReleaseVersion();
|
||||
it('should calculate the next preview version from the latest nightly', () => {
|
||||
vi.mocked(execSync).mockImplementation(mockExecSync);
|
||||
const result = getVersion({ type: 'preview' });
|
||||
expect(result.releaseVersion).toBe('0.8.0-preview.0');
|
||||
expect(result.npmTag).toBe('preview');
|
||||
expect(result.previousReleaseTag).toBe('v0.7.0-preview.1');
|
||||
});
|
||||
|
||||
expect(result).toEqual({
|
||||
releaseTag: 'v0.1.1',
|
||||
releaseVersion: '0.1.1',
|
||||
npmTag: 'latest',
|
||||
previousReleaseTag: 'v0.1.0',
|
||||
it('should calculate the next nightly version from package.json', () => {
|
||||
vi.mocked(execSync).mockImplementation(mockExecSync);
|
||||
const result = getVersion({ type: 'nightly' });
|
||||
// Note: The base version now comes from package.json, not the previous nightly tag.
|
||||
expect(result.releaseVersion).toBe('0.8.0-nightly.20250917.d3bf8a3d');
|
||||
expect(result.npmTag).toBe('nightly');
|
||||
expect(result.previousReleaseTag).toBe('v0.8.0-nightly.20250916.abcdef');
|
||||
});
|
||||
|
||||
it('should calculate the next patch version for a stable release', () => {
|
||||
vi.mocked(execSync).mockImplementation(mockExecSync);
|
||||
const result = getVersion({ type: 'patch', 'patch-from': 'stable' });
|
||||
expect(result.releaseVersion).toBe('0.6.2');
|
||||
expect(result.npmTag).toBe('latest');
|
||||
expect(result.previousReleaseTag).toBe('v0.6.1');
|
||||
});
|
||||
|
||||
it('should calculate the next patch version for a preview release', () => {
|
||||
vi.mocked(execSync).mockImplementation(mockExecSync);
|
||||
const result = getVersion({ type: 'patch', 'patch-from': 'preview' });
|
||||
expect(result.releaseVersion).toBe('0.7.0-preview.2');
|
||||
expect(result.npmTag).toBe('preview');
|
||||
expect(result.previousReleaseTag).toBe('v0.7.0-preview.1');
|
||||
});
|
||||
});
|
||||
|
||||
it('should prepend v to manual version if missing', () => {
|
||||
process.env.MANUAL_VERSION = '1.2.3';
|
||||
const { releaseTag } = getReleaseVersion();
|
||||
expect(releaseTag).toBe('v1.2.3');
|
||||
});
|
||||
describe('Advanced Scenarios', () => {
|
||||
it('should ignore a deprecated version and use the next highest', () => {
|
||||
const mockWithDeprecated = (command) => {
|
||||
// The highest nightly is 0.9.0, but it's deprecated
|
||||
if (command.includes('npm view') && command.includes('versions --json'))
|
||||
return JSON.stringify([
|
||||
'0.8.0-nightly.20250916.abcdef',
|
||||
'0.9.0-nightly.20250917.deprecated', // This one is deprecated
|
||||
]);
|
||||
// Mock the deprecation check
|
||||
if (
|
||||
command.includes(
|
||||
'npm view @google/gemini-cli@0.9.0-nightly.20250917.deprecated deprecated',
|
||||
)
|
||||
)
|
||||
return 'This version is deprecated';
|
||||
// The dist-tag still points to the older, valid version
|
||||
if (command.includes('npm view') && command.includes('--tag=nightly'))
|
||||
return '0.8.0-nightly.20250916.abcdef';
|
||||
|
||||
it('should handle pre-release versions correctly', () => {
|
||||
process.env.MANUAL_VERSION = 'v1.2.3-beta.1';
|
||||
const { releaseTag, releaseVersion, npmTag } = getReleaseVersion();
|
||||
expect(releaseTag).toBe('v1.2.3-beta.1');
|
||||
expect(releaseVersion).toBe('1.2.3-beta.1');
|
||||
expect(npmTag).toBe('beta');
|
||||
});
|
||||
return mockExecSync(command);
|
||||
};
|
||||
vi.mocked(execSync).mockImplementation(mockWithDeprecated);
|
||||
|
||||
it('should throw an error for invalid version format', () => {
|
||||
process.env.MANUAL_VERSION = '1.2';
|
||||
expect(() => getReleaseVersion()).toThrow(
|
||||
'Error: Version must be in the format vX.Y.Z or vX.Y.Z-prerelease',
|
||||
);
|
||||
});
|
||||
|
||||
it('should throw an error if no version is provided for non-nightly/preview release', () => {
|
||||
expect(() => getReleaseVersion()).toThrow(
|
||||
'Error: No version specified and this is not a nightly or preview release.',
|
||||
);
|
||||
});
|
||||
|
||||
it('should throw an error for versions with build metadata', () => {
|
||||
process.env.MANUAL_VERSION = 'v1.2.3+build456';
|
||||
expect(() => getReleaseVersion()).toThrow(
|
||||
'Error: Versions with build metadata (+) are not supported for releases.',
|
||||
);
|
||||
});
|
||||
|
||||
it('should generate nightly version with existing nightly tags', () => {
|
||||
process.env.IS_NIGHTLY = 'true';
|
||||
vi.mocked(fs.default.readFileSync).mockReturnValue(
|
||||
JSON.stringify({ version: '1.2.3' }),
|
||||
);
|
||||
|
||||
vi.mocked(execSync).mockImplementation((command) => {
|
||||
if (command.includes('git tag --list "v*.*.*"')) {
|
||||
return 'v1.2.3\nv1.2.2\nv1.2.1\nv1.2.0\nv1.1.0';
|
||||
}
|
||||
if (command.includes('git tag -l "v1.2.4-nightly.*"')) {
|
||||
return 'v1.2.4-nightly.0\nv1.2.4-nightly.1\nv1.2.4-nightly.2'; // Existing nightly tags
|
||||
}
|
||||
if (command.includes('gh release list')) {
|
||||
return 'v1.2.4-nightly.2'; // Previous nightly release
|
||||
}
|
||||
return '';
|
||||
const result = getVersion({ type: 'preview' });
|
||||
// It should base the preview off 0.8.0, not the deprecated 0.9.0
|
||||
expect(result.releaseVersion).toBe('0.8.0-preview.0');
|
||||
});
|
||||
|
||||
const result = getReleaseVersion();
|
||||
it('should auto-increment patch version if the calculated one already exists', () => {
|
||||
const mockWithConflict = (command) => {
|
||||
// The calculated version 0.7.0 already exists as a git tag
|
||||
if (command.includes("git tag -l 'v0.7.0'")) return 'v0.7.0';
|
||||
// The next version, 0.7.1, is available
|
||||
if (command.includes("git tag -l 'v0.7.1'")) return '';
|
||||
|
||||
expect(result.releaseTag).toBe('v1.2.4-nightly.3');
|
||||
expect(result.releaseVersion).toBe('1.2.4-nightly.3');
|
||||
expect(result.npmTag).toBe('nightly');
|
||||
expect(result.previousReleaseTag).toBe('v1.2.4-nightly.2');
|
||||
return mockExecSync(command);
|
||||
};
|
||||
vi.mocked(execSync).mockImplementation(mockWithConflict);
|
||||
|
||||
const result = getVersion({ type: 'stable' });
|
||||
// Should have skipped 0.7.0 and landed on 0.7.1
|
||||
expect(result.releaseVersion).toBe('0.7.1');
|
||||
});
|
||||
|
||||
it('should auto-increment preview number if the calculated one already exists', () => {
|
||||
const mockWithConflict = (command) => {
|
||||
// The calculated preview 0.8.0-preview.0 already exists on NPM
|
||||
if (
|
||||
command.includes(
|
||||
'npm view @google/gemini-cli@0.8.0-preview.0 version',
|
||||
)
|
||||
)
|
||||
return '0.8.0-preview.0';
|
||||
// The next one is available
|
||||
if (
|
||||
command.includes(
|
||||
'npm view @google/gemini-cli@0.8.0-preview.1 version',
|
||||
)
|
||||
)
|
||||
throw new Error('Not found');
|
||||
|
||||
return mockExecSync(command);
|
||||
};
|
||||
vi.mocked(execSync).mockImplementation(mockWithConflict);
|
||||
|
||||
const result = getVersion({ type: 'preview' });
|
||||
// Should have skipped preview.0 and landed on preview.1
|
||||
expect(result.releaseVersion).toBe('0.8.0-preview.1');
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user