fix: CI and unit tests
This commit is contained in:
@@ -18,7 +18,8 @@ export * as ui from './utils/ui.js';
|
|||||||
export {
|
export {
|
||||||
checkForUpdate,
|
checkForUpdate,
|
||||||
performAutoUpdate,
|
performAutoUpdate,
|
||||||
displayUpgradeNotification
|
displayUpgradeNotification,
|
||||||
|
compareVersions,
|
||||||
} from './utils/auto-update.js';
|
} from './utils/auto-update.js';
|
||||||
|
|
||||||
// Re-export commonly used types from tm-core
|
// Re-export commonly used types from tm-core
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ function getCurrentVersion(): string {
|
|||||||
* @param v2 - Second version
|
* @param v2 - Second version
|
||||||
* @returns -1 if v1 < v2, 0 if v1 = v2, 1 if v1 > v2
|
* @returns -1 if v1 < v2, 0 if v1 = v2, 1 if v1 > v2
|
||||||
*/
|
*/
|
||||||
function compareVersions(v1: string, v2: string): number {
|
export function compareVersions(v1: string, v2: string): number {
|
||||||
const toParts = (v: string) => {
|
const toParts = (v: string) => {
|
||||||
const [core, pre = ''] = v.split('-', 2);
|
const [core, pre = ''] = v.split('-', 2);
|
||||||
const nums = core.split('.').map((n) => Number.parseInt(n, 10) || 0);
|
const nums = core.split('.').map((n) => Number.parseInt(n, 10) || 0);
|
||||||
|
|||||||
8
package-lock.json
generated
8
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "task-master-ai",
|
"name": "task-master-ai",
|
||||||
"version": "0.27.0",
|
"version": "0.27.1-rc.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "task-master-ai",
|
"name": "task-master-ai",
|
||||||
"version": "0.27.0",
|
"version": "0.27.1-rc.0",
|
||||||
"license": "MIT WITH Commons-Clause",
|
"license": "MIT WITH Commons-Clause",
|
||||||
"workspaces": [
|
"workspaces": [
|
||||||
"apps/*",
|
"apps/*",
|
||||||
@@ -357,9 +357,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"apps/extension": {
|
"apps/extension": {
|
||||||
"version": "0.25.1",
|
"version": "0.25.2-rc.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"task-master-ai": "*"
|
"task-master-ai": "0.27.1-rc.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@dnd-kit/core": "^6.3.1",
|
"@dnd-kit/core": "^6.3.1",
|
||||||
|
|||||||
@@ -96,11 +96,10 @@ import {
|
|||||||
RULES_SETUP_ACTION,
|
RULES_SETUP_ACTION,
|
||||||
RULES_ACTIONS
|
RULES_ACTIONS
|
||||||
} from '../../src/constants/rules-actions.js';
|
} from '../../src/constants/rules-actions.js';
|
||||||
|
import { compareVersions } from '@tm/cli';
|
||||||
|
|
||||||
describe('Commands Module - CLI Setup and Integration', () => {
|
describe('Commands Module - CLI Setup and Integration', () => {
|
||||||
const mockExistsSync = jest.spyOn(fs, 'existsSync');
|
const mockExistsSync = jest.spyOn(fs, 'existsSync');
|
||||||
const mockReadFileSync = jest.spyOn(fs, 'readFileSync');
|
|
||||||
const mockJoin = jest.spyOn(path, 'join');
|
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
jest.clearAllMocks();
|
jest.clearAllMocks();
|
||||||
@@ -118,52 +117,39 @@ describe('Commands Module - CLI Setup and Integration', () => {
|
|||||||
expect(program.name()).toBe('dev');
|
expect(program.name()).toBe('dev');
|
||||||
});
|
});
|
||||||
|
|
||||||
test('should read version from package.json when available', () => {
|
test('should return version that matches package.json when TM_PUBLIC_VERSION is set', () => {
|
||||||
mockExistsSync.mockReturnValue(true);
|
// Read actual version from package.json
|
||||||
mockReadFileSync.mockReturnValue('{"version": "1.0.0"}');
|
const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
|
||||||
mockJoin.mockReturnValue('package.json');
|
const expectedVersion = packageJson.version;
|
||||||
|
|
||||||
|
// Set environment variable to match package.json
|
||||||
|
const originalEnv = process.env.TM_PUBLIC_VERSION;
|
||||||
|
process.env.TM_PUBLIC_VERSION = expectedVersion;
|
||||||
|
|
||||||
const program = setupCLI();
|
const program = setupCLI();
|
||||||
const version = program._version();
|
const version = program.version();
|
||||||
expect(mockReadFileSync).toHaveBeenCalledWith('package.json', 'utf8');
|
expect(version).toBe(expectedVersion);
|
||||||
expect(version).toBe('1.0.0');
|
|
||||||
|
// Restore original environment
|
||||||
|
if (originalEnv !== undefined) {
|
||||||
|
process.env.TM_PUBLIC_VERSION = originalEnv;
|
||||||
|
} else {
|
||||||
|
delete process.env.TM_PUBLIC_VERSION;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
test('should use default version when package.json is not available', () => {
|
test('should use default version when TM_PUBLIC_VERSION is not available', () => {
|
||||||
mockExistsSync.mockReturnValue(false);
|
const originalEnv = process.env.TM_PUBLIC_VERSION;
|
||||||
|
delete process.env.TM_PUBLIC_VERSION;
|
||||||
|
|
||||||
const program = setupCLI();
|
const program = setupCLI();
|
||||||
const version = program._version();
|
const version = program.version();
|
||||||
expect(mockReadFileSync).not.toHaveBeenCalled();
|
|
||||||
expect(version).toBe('unknown');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('should use default version when package.json reading throws an error', () => {
|
|
||||||
mockExistsSync.mockReturnValue(true);
|
|
||||||
mockReadFileSync.mockImplementation(() => {
|
|
||||||
throw new Error('Read error');
|
|
||||||
});
|
|
||||||
|
|
||||||
// Mock console methods to prevent chalk formatting conflicts
|
|
||||||
const consoleErrorSpy = jest
|
|
||||||
.spyOn(console, 'error')
|
|
||||||
.mockImplementation(() => {});
|
|
||||||
const consoleLogSpy = jest
|
|
||||||
.spyOn(console, 'log')
|
|
||||||
.mockImplementation(() => {});
|
|
||||||
const consoleWarnSpy = jest
|
|
||||||
.spyOn(console, 'warn')
|
|
||||||
.mockImplementation(() => {});
|
|
||||||
|
|
||||||
const program = setupCLI();
|
|
||||||
const version = program._version();
|
|
||||||
expect(mockReadFileSync).toHaveBeenCalled();
|
|
||||||
expect(version).toBe('unknown');
|
expect(version).toBe('unknown');
|
||||||
|
|
||||||
// Restore console methods
|
// Restore original environment
|
||||||
consoleErrorSpy.mockRestore();
|
if (originalEnv !== undefined) {
|
||||||
consoleLogSpy.mockRestore();
|
process.env.TM_PUBLIC_VERSION = originalEnv;
|
||||||
consoleWarnSpy.mockRestore();
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -277,30 +263,6 @@ describe('Commands Module - CLI Setup and Integration', () => {
|
|||||||
|
|
||||||
// Test utility functions that commands rely on
|
// Test utility functions that commands rely on
|
||||||
describe('Version comparison utility', () => {
|
describe('Version comparison utility', () => {
|
||||||
let compareVersions;
|
|
||||||
|
|
||||||
beforeAll(async () => {
|
|
||||||
// Import from @tm/cli instead of commands.js
|
|
||||||
const { compareVersions: cv } = await import(
|
|
||||||
'../../apps/cli/src/utils/auto-update.js'
|
|
||||||
);
|
|
||||||
|
|
||||||
// Create a local compareVersions function for testing
|
|
||||||
compareVersions = (v1, v2) => {
|
|
||||||
const v1Parts = v1.split('.').map((p) => parseInt(p, 10));
|
|
||||||
const v2Parts = v2.split('.').map((p) => parseInt(p, 10));
|
|
||||||
|
|
||||||
for (let i = 0; i < Math.max(v1Parts.length, v2Parts.length); i++) {
|
|
||||||
const v1Part = v1Parts[i] || 0;
|
|
||||||
const v2Part = v2Parts[i] || 0;
|
|
||||||
|
|
||||||
if (v1Part < v2Part) return -1;
|
|
||||||
if (v1Part > v2Part) return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
test('compareVersions correctly compares semantic versions', () => {
|
test('compareVersions correctly compares semantic versions', () => {
|
||||||
expect(compareVersions('1.0.0', '1.0.0')).toBe(0);
|
expect(compareVersions('1.0.0', '1.0.0')).toBe(0);
|
||||||
|
|||||||
Reference in New Issue
Block a user