update

Author: ymc9

packages/cli/test/db.test.ts

@@ -1,8 +1,7 @@
-import { execSync } from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
 import { describe, expect, it } from 'vitest';
-import { createProject } from './utils';
+import { createProject, runCli } from './utils';
 
 const model = `
 model User {
@@ -13,7 +12,7 @@ model User {
 describe('CLI db commands test', () => {
     it('should generate a database with db push', () => {
         const workDir = createProject(model);
-        execSync('node node_modules/@zenstackhq/cli/bin/cli db push');
+        runCli('db push', workDir);
         expect(fs.existsSync(path.join(workDir, 'zenstack/dev.db'))).toBe(true);
     });
 });

packages/cli/test/generate.test.ts

@@ -1,8 +1,7 @@
-import { execSync } from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
 import { describe, expect, it } from 'vitest';
-import { createProject } from './utils';
+import { createProject, runCli } from './utils';
 
 const model = `
 model User {
@@ -13,33 +12,33 @@ model User {
 describe('CLI generate command test', () => {
     it('should generate a TypeScript schema', () => {
         const workDir = createProject(model);
-        execSync('node node_modules/@zenstackhq/cli/bin/cli generate');
+        runCli('generate', workDir);
         expect(fs.existsSync(path.join(workDir, 'zenstack/schema.ts'))).toBe(true);
         expect(fs.existsSync(path.join(workDir, 'zenstack/schema.prisma'))).toBe(false);
     });
 
     it('should respect custom output directory', () => {
         const workDir = createProject(model);
-        execSync('node node_modules/@zenstackhq/cli/bin/cli generate --output ./zen');
+        runCli('generate --output ./zen', workDir);
         expect(fs.existsSync(path.join(workDir, 'zen/schema.ts'))).toBe(true);
     });
 
     it('should respect custom schema location', () => {
         const workDir = createProject(model);
         fs.renameSync(path.join(workDir, 'zenstack/schema.zmodel'), path.join(workDir, 'zenstack/foo.zmodel'));
-        execSync('node node_modules/@zenstackhq/cli/bin/cli generate --schema ./zenstack/foo.zmodel');
+        runCli('generate --schema ./zenstack/foo.zmodel', workDir);
         expect(fs.existsSync(path.join(workDir, 'zenstack/schema.ts'))).toBe(true);
     });
 
     it('should respect save prisma schema option', () => {
         const workDir = createProject(model);
-        execSync('node node_modules/@zenstackhq/cli/bin/cli generate --save-prisma-schema');
+        runCli('generate --save-prisma-schema', workDir);
         expect(fs.existsSync(path.join(workDir, 'zenstack/schema.prisma'))).toBe(true);
     });
 
     it('should respect save prisma schema custom path option', () => {
         const workDir = createProject(model);
-        execSync('node node_modules/@zenstackhq/cli/bin/cli generate --save-prisma-schema "../prisma/schema.prisma"');
+        runCli('generate --save-prisma-schema "../prisma/schema.prisma"', workDir);
         expect(fs.existsSync(path.join(workDir, 'prisma/schema.prisma'))).toBe(true);
     });
 });

packages/cli/test/init.test.ts

@@ -1,16 +1,13 @@
-import { execSync } from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
 import tmp from 'tmp';
 import { describe, expect, it } from 'vitest';
+import { runCli } from './utils';
 
 describe('Cli init command tests', () => {
     it('should create a new project', () => {
         const { name: workDir } = tmp.dirSync({ unsafeCleanup: true });
-        process.chdir(workDir);
-        execSync('npm init -y');
-        const cli = path.join(__dirname, '../dist/index.js');
-        execSync(`node ${cli} init`);
-        expect(fs.existsSync('zenstack/schema.zmodel')).toBe(true);
+        runCli('init', workDir);
+        expect(fs.existsSync(path.join(workDir, 'zenstack/schema.zmodel'))).toBe(true);
     });
 });

packages/cli/test/migrate.test.ts

@@ -1,8 +1,7 @@
-import { execSync } from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
 import { describe, expect, it } from 'vitest';
-import { createProject } from './utils';
+import { createProject, runCli } from './utils';
 
 const model = `
 model User {
@@ -13,30 +12,30 @@ model User {
 describe('CLI migrate commands test', () => {
     it('should generate a database with migrate dev', () => {
         const workDir = createProject(model);
-        execSync('node node_modules/@zenstackhq/cli/bin/cli migrate dev --name init');
+        runCli('migrate dev --name init', workDir);
         expect(fs.existsSync(path.join(workDir, 'zenstack/dev.db'))).toBe(true);
         expect(fs.existsSync(path.join(workDir, 'zenstack/migrations'))).toBe(true);
     });
 
     it('should reset the database with migrate reset', () => {
         const workDir = createProject(model);
-        execSync('node node_modules/@zenstackhq/cli/bin/cli db push');
+        runCli('db push', workDir);
         expect(fs.existsSync(path.join(workDir, 'zenstack/dev.db'))).toBe(true);
-        execSync('node node_modules/@zenstackhq/cli/bin/cli migrate reset --force');
+        runCli('migrate reset --force', workDir);
         expect(fs.existsSync(path.join(workDir, 'zenstack/dev.db'))).toBe(true);
     });
 
     it('should reset the database with migrate deploy', () => {
         const workDir = createProject(model);
-        execSync('node node_modules/@zenstackhq/cli/bin/cli migrate dev --name init');
+        runCli('migrate dev --name init', workDir);
         fs.rmSync(path.join(workDir, 'zenstack/dev.db'));
-        execSync('node node_modules/@zenstackhq/cli/bin/cli migrate deploy');
+        runCli('migrate deploy', workDir);
         expect(fs.existsSync(path.join(workDir, 'zenstack/dev.db'))).toBe(true);
     });
 
     it('supports migrate status', () => {
-        createProject(model);
-        execSync('node node_modules/@zenstackhq/cli/bin/cli migrate dev --name init');
-        execSync('node node_modules/@zenstackhq/cli/bin/cli migrate status');
+        const workDir = createProject(model);
+        runCli('migrate dev --name init', workDir);
+        runCli('migrate status', workDir);
     });
 });

packages/cli/test/utils.ts

@@ -1,4 +1,5 @@
 import { createTestProject } from '@zenstackhq/testtools';
+import { execSync } from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
 
@@ -13,6 +14,9 @@ export function createProject(zmodel: string, addPrelude = true) {
     fs.mkdirSync(path.join(workDir, 'zenstack'), { recursive: true });
     const schemaPath = path.join(workDir, 'zenstack/schema.zmodel');
     fs.writeFileSync(schemaPath, addPrelude ? `${ZMODEL_PRELUDE}\n\n${zmodel}` : zmodel);
-    process.chdir(workDir);
     return workDir;
 }
+
+export function runCli(command: string, cwd: string) {
+    execSync(`node ${__dirname}/../bin/cli ${command}`, { cwd });
+}