tweaks

Author: northword

packages/scaffold/src/cli.ts

@@ -53,7 +53,7 @@ async function main() {
     .description("Run tests")
     .option("--abort-on-fail", "Abort the test suite on first failure")
     .option("--exit-on-finish", "Exit the test suite after all tests have run")
-    .option("--no-watch", "watch changes and re-run test")
+    .option("--no-watch", "Exit the test suite after all tests have run")
     .action((options) => {
       process.env.NODE_ENV = "test";
 

packages/scaffold/src/core/tester/index.ts

@@ -50,15 +50,14 @@ export default class Test extends Base {
     // Start a HTTP server to receive test results
     // This is useful for CI/CD environments
     await this.reporter.start();
-    await this.ctx.hooks.callHook("test:listen", this.ctx);
 
     // Create proxy plugin to run tests
     this.testBundler = new TestBundler(
       this.ctx,
       this.reporter.port,
     );
     await this.testBundler.generate();
-    await this.ctx.hooks.callHook("test:copyAssets", this.ctx);
+    await this.ctx.hooks.callHook("test:bundleTests", this.ctx);
 
     // Start Zotero
     await this.startZotero();
@@ -131,6 +130,9 @@ export default class Test extends Base {
   }
 
   private onZoteroExit = () => {
+    this.reporter.stop();
+    this.ctx.hooks.callHook("test:exit", this.ctx);
+
     if (this.reporter.failed)
       process.exit(1);
     else

packages/scaffold/src/types/config.ts

@@ -642,6 +642,21 @@ export interface TestConfig {
    */
   abortOnFail: boolean;
 
+  /**
+   * Watch source and test file changes,
+   * and re-run tests when files change.
+   *
+   * If this set to false, Zotero will exit
+   * when test complated.
+   *
+   * 当源码或测试代码变更时自动重新运行测试。
+   *
+   * 若此选项设置为 false，Zotero 将在测试结束后立即退出。
+   *
+   * @default true (false in ci)
+   */
+  watch: boolean;
+
   /**
    * Run Zotero in deadless mode.
    *
@@ -684,28 +699,12 @@ export interface TestConfig {
    */
   waitForPlugin: string;
 
-  /**
-   * Watch source and test file changes,
-   * and re-run tests when files change.
-   *
-   * If this set to false, Zotero will exit when test complated.
-   *
-   * 当源码或测试代码变更时自动重新运行测试。
-   *
-   * 若此选项设置为 false，Zotero 将在测试结束后立即退出。
-   *
-   * @default true (false in ci)
-   */
-  watch: boolean;
-
   hooks: Partial<TestHooks>;
 }
 
 interface TestHooks {
   "test:init": (ctx: Context) => void | Promise<void>;
   "test:prebuild": (ctx: Context) => void | Promise<void>;
-  "test:listen": (ctx: Context) => void | Promise<void>;
-  "test:copyAssets": (ctx: Context) => void | Promise<void>;
   "test:bundleTests": (ctx: Context) => void | Promise<void>;
   "test:run": (ctx: Context) => void | Promise<void>;
   "test:exit": (ctx: Context) => void;