f

Author: fengmk2

.github/workflows/nodejs.yml

@@ -12,5 +12,6 @@ jobs:
     uses: node-modules/github-actions/.github/workflows/node-test.yml@master
     with:
       version: '18.19.0, 18, 20, 22'
+      os: 'ubuntu-latest, macos-latest'
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

package.json

@@ -62,7 +62,10 @@
     "bin": "eggctl",
     "commands": "./dist/esm/commands",
     "dirname": "eggctl",
-    "topicSeparator": " "
+    "topicSeparator": " ",
+    "additionalHelpFlags": [
+      "-h"
+    ]
   },
   "bin": {
     "egg-scripts": "./bin/run.js",

test/egg-scripts.test.js

@@ -0,0 +1,26 @@
+import coffee from 'coffee';
+import { getSourceFilename } from '../src/helper.js';
+
+describe('test/egg-scripts.test.ts', () => {
+  const eggBin = getSourceFilename('../bin/run.js');
+
+  it('show help', async () => {
+    await coffee.fork(eggBin, [ '--help' ])
+      .debug()
+      .expect('stdout', /\$ eggctl \[COMMAND]/)
+      .expect('code', 0)
+      .end();
+
+    await coffee.fork(eggBin, [ 'start', '-h' ])
+      .debug()
+      .expect('stdout', /\$ eggctl start \[BASEDIR] /)
+      .expect('code', 0)
+      .end();
+
+    await coffee.fork(eggBin, [ 'stop', '-h' ])
+      .debug()
+      .expect('stdout', /\$ eggctl stop \[BASEDIR] /)
+      .expect('code', 0)
+      .end();
+  });
+});

test/egg-scripts.test.ts

@@ -8,7 +8,7 @@
     "typescript": true
   },
   "scripts": {
-    "build": "sh ../../../node_modules/.bin/tsc",
+    "build": "./../../../node_modules/.bin/tsc",
     "windows-build": "call ../../../node_modules/.bin/tsc.cmd"
   }
 }

test/fixtures/ts-pkg/package.json

@@ -5,7 +5,7 @@
     "egg": "^1.0.0"
   },
   "scripts": {
-    "build": "sh ../../../node_modules/.bin/tsc",
+    "build": "./../../../node_modules/.bin/tsc",
     "windows-build": "call ../../../node_modules/.bin/tsc.cmd"
   }
 }

test/fixtures/ts/package.json

@@ -204,7 +204,7 @@ describe('test/stop.test.ts', () => {
     beforeEach(async () => {
       await cleanup(fixturePath);
       app = coffee.fork(eggBin, [ 'start', '--workers=2', '--title=example', fixturePath ]) as Coffee;
-      // app.debug();
+      app.debug();
       app.expect('code', 0);
 
       app2 = coffee.fork(eggBin, [ 'start', '--workers=2', '--title=test', '--port=7002', fixturePath ]) as Coffee;
@@ -213,14 +213,14 @@ describe('test/stop.test.ts', () => {
       await scheduler.wait(waitTime);
 
       assert.equal(replaceWeakRefMessage(app.stderr), '');
-      assert(app.stdout.match(/custom-framework started on http:\/\/127\.0\.0\.1:7001/));
+      assert.match(app.stdout, /custom-framework started on http:\/\/127\.0\.0\.1:7001/);
       const result = await request('http://127.0.0.1:7001');
-      assert(result.data.toString() === 'hi, egg');
+      assert.equal(result.data.toString(), 'hi, egg');
 
       assert.equal(replaceWeakRefMessage(app2.stderr), '');
-      assert(app2.stdout.match(/custom-framework started on http:\/\/127\.0\.0\.1:7002/));
+      assert.match(app2.stdout, /custom-framework started on http:\/\/127\.0\.0\.1:7002/);
       const result2 = await request('http://127.0.0.1:7002');
-      assert(result2.data.toString() === 'hi, egg');
+      assert.equal(result2.data.toString(), 'hi, egg');
     });
 
     afterEach(async () => {

test/stop.test.ts

@@ -94,7 +94,7 @@ describe('test/ts.test.ts', () => {
         cwd: fixturePath,
         shell: isWindows,
       });
-      assert(!result.stderr.toString());
+      assert.equal(result.stderr.toString(), '');
     });
 
     afterEach(async () => {
@@ -112,8 +112,9 @@ describe('test/ts.test.ts', () => {
       assert.equal(replaceWeakRefMessage(app.stderr), '');
       assert.match(app.stdout, /egg started on http:\/\/127\.0\.0\.1:7001/);
       const result = await request('http://127.0.0.1:7001', { dataType: 'json' });
-      // console.log(result.data);
-      assert(result.data.stack.includes(path.normalize('app/controller/home.ts:6:13')));
+      console.log(result.data);
+      assert.match(result.data.stack, /home\.ts:6:13/);
+      // assert(result.data.stack.includes(path.normalize('app/controller/home.ts:6:13')));
     });
   });
 });