testem 3.19.1 → 3.20.0

package/lib/utils/process.js

@@ -3,6 +3,7 @@ const log = require('../log');
 const EventEmitter = require('events').EventEmitter;
 
 const isWin = require('./is-win')();
+const closeTimeoutAfterExit = 1000;
 
 module.exports = class Process extends EventEmitter {
   constructor(name, options, process) {
@@ -13,6 +14,9 @@ module.exports = class Process extends EventEmitter {
     this.process = process;
     this.stdout = '';
     this.stderr = '';
+    this.exitAt = null;
+    this._killResolve = null;
+    this._closeFallbackTimer = null;
     this.process.stdout.on('data', chunk => {
       this.stdout += chunk;
       this.emit('out');
@@ -25,6 +29,11 @@ module.exports = class Process extends EventEmitter {
     });
 
     this.process.on('close', this.onClose.bind(this));
+    this.process.on('exit', code => {
+      this.exitAt = Date.now();
+      this.exitCode = code;
+      this.scheduleCloseFallback();
+    });
     this.process.on('error', this.onError.bind(this));
 
     this.process.then(result => {
@@ -37,9 +46,35 @@ module.exports = class Process extends EventEmitter {
     });
   }
 
+  scheduleCloseFallback() {
+    if (!this._killResolve || !this.exitAt || this._closeFallbackTimer || !this._killTimer) {
+      return;
+    }
+
+    this._closeFallbackTimer = setTimeout(() => {
+      this._closeFallbackTimer = null;
+
+      if (!this._killResolve || !this.exitAt) {
+        return;
+      }
+
+      if (this._killTimer) {
+        clearTimeout(this._killTimer);
+        this._killTimer = null;
+      }
+
+      this.process = null;
+
+      const resolve = this._killResolve;
+      this._killResolve = null;
+      resolve(this.exitCode);
+    }, closeTimeoutAfterExit);
+  }
+
   onKillTimeout() {
     log.warn('Process ' + this.name + ' not terminated in ' + this.killTimeout + 'ms.');
     kill(this.process, 'SIGKILL');
+    this.scheduleCloseFallback();
   }
 
   onClose(code) {
@@ -102,7 +137,13 @@ module.exports = class Process extends EventEmitter {
     let self = this;
 
     return new Promise(resolve => {
+      self._killResolve = resolve;
       self.process.once('close', (code, sig) => {
+        if (self._closeFallbackTimer) {
+          clearTimeout(self._closeFallbackTimer);
+          self._closeFallbackTimer = null;
+        }
+        self._killResolve = null;
         self.process = null;
         if (self._killTimer) {
           clearTimeout(self._killTimer);
@@ -122,6 +163,7 @@ module.exports = class Process extends EventEmitter {
       // See https://github.com/testem/testem/pull/1335 for more information.
       if (self.process) {
         kill(self.process, sig);
+        self.scheduleCloseFallback();
       } else {
         log.info('Process ' + this.name + ' already killed.');
       }

package/lib/utils/promises.js

@@ -42,7 +42,26 @@ function disposer(promise, cleanup) {
 
 async function using(resource, fn) {
   const isDisposer = resource instanceof Disposer;
-  const value = await (isDisposer ? resource.promise : resource);
+  let value;
+
+  if (isDisposer) {
+    try {
+      value = await resource.promise;
+    } catch (setupErr) {
+      const inspection = {
+        isRejected: () => true,
+        reason: () => setupErr,
+      };
+      try {
+        await resource.cleanup(undefined, inspection);
+      } catch {
+        // Prefer the setup error below
+      }
+      throw setupErr;
+    }
+  } else {
+    value = await resource;
+  }
 
   let result, rejected = false, error;
 

package/lib/utils/reporter.js

@@ -111,7 +111,7 @@ Reporter.with = (app, stdout, path) => disposer(Promise.resolve(new Reporter(app
   if (promise.isRejected()) {
     let err = promise.reason();
 
-    if (!err.hideFromReporter) {
+    if (reporter && !err.hideFromReporter) {
       reporter.report(null, {
         passed: false,
         name: err.name || 'unknown error',
@@ -122,7 +122,7 @@ Reporter.with = (app, stdout, path) => disposer(Promise.resolve(new Reporter(app
     }
   }
 
-  return reporter.close();
+  return reporter ? reporter.close() : Promise.resolve();
 });
 
 function forwardToReporters(fn) {

package/lib/utils/tmp-cleanup.js

@@ -0,0 +1,26 @@
+
+
+const fs = require('fs');
+
+const dirsToClean = new Set();
+
+process.on('exit', () => {
+  for (const dir of dirsToClean) {
+    try {
+      fs.rmSync(dir, { recursive: true, force: true });
+    } catch {
+      // Best-effort cleanup: ignore errors during process exit
+    }
+  }
+});
+
+// Allow graceful cleanup when the process is terminated by a signal.
+// Calling process.exit() ensures the 'exit' event fires and cleanup runs.
+process.on('SIGTERM', () => process.exit(0));
+process.on('SIGINT',  () => process.exit(130));
+
+function registerCleanup(dir) {
+  dirsToClean.add(dir);
+}
+
+module.exports = { registerCleanup, _registeredDirs: dirsToClean };

package/package.json

@@ -7,7 +7,7 @@
     "unittest",
     "browser"
   ],
-  "version": "3.19.1",
+  "version": "3.20.0",
   "author": "Toby Ho <airportyh@gmail.com>",
   "repository": {
     "type": "git",
@@ -17,34 +17,34 @@
     "url": "http://github.com/testem/testem/issues"
   },
   "engines": {
-    "node": ">= 7.*"
+    "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
   },
   "license": "MIT",
   "dependencies": {
-    "@xmldom/xmldom": "^0.8.0",
-    "backbone": "^1.1.2",
-    "charm": "^1.0.0",
-    "commander": "^2.6.0",
-    "compression": "^1.7.4",
+    "@xmldom/xmldom": "^0.9.9",
+    "backbone": "^1.6.1",
+    "charm": "^1.0.2",
+    "chokidar": "^5.0.0",
+    "commander": "^14.0.3",
+    "compression": "^1.8.1",
     "consolidate": "^1.0.4",
     "execa": "^9.6.1",
-    "express": "^4.10.7",
-    "fireworm": "^0.7.2",
+    "express": "^5.2.1",
     "glob": "^13.0.6",
-    "http-proxy": "^1.13.1",
-    "js-yaml": "^3.2.5",
-    "lodash": "^4.17.21",
+    "http-proxy": "^1.18.1",
+    "js-yaml": "^4.1.1",
+    "lodash": "^4.18.1",
+    "minimatch": "^10.2.5",
     "mkdirp": "^3.0.1",
     "mustache": "^4.2.0",
-    "node-notifier": "^10.0.0",
+    "node-notifier": "^10.0.1",
     "printf": "^0.6.1",
-    "proc-log": "^5.0.0",
+    "proc-log": "^6.1.0",
     "rimraf": "^6.1.3",
-    "socket.io": "^4.5.4",
+    "socket.io": "^4.8.3",
     "spawn-args": "^0.2.0",
     "styled_string": "0.0.1",
-    "tap-parser": "^7.0.0",
-    "tmp": "^0.2.5"
+    "tap-parser": "^18.3.0"
   },
   "files": [
     "lib",
@@ -61,27 +61,38 @@
     "test:verbose": "TESTEM_VERBOSE=1 mocha tests/*_tests.js tests/**/*_tests.js",
     "cover": "cover run ./node_modules/.bin/_mocha tests/*_tests.js tests/**/*_tests.js; cover report html; open cover_html/index.html",
     "integration": "node ./bin/run-integration.js",
+    "ci:safari-smoke": "node ./scripts/safari-ci-smoke.js",
     "browser-tests": "cd examples/saucelabs/ && ../../testem.js ci -d",
     "lint": "eslint ."
   },
   "devDependencies": {
     "@cypress/request": "^3.0.10",
-    "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
+    "@eslint/eslintrc": "^3.3.5",
+    "@eslint/js": "^10.0.1",
     "chai": "^6.2.2",
-    "chai-files": "^1.2.0",
-    "chai-shallow-deep-equal": "^1.4.4",
-    "cheerio": "1.0.0-rc.12",
+    "chai-files": "^1.4.0",
+    "chai-shallow-deep-equal": "^1.4.6",
+    "cheerio": "^1.2.0",
     "dirty-chai": "^3.0.0",
-    "esbuild": "^0.25.1",
-    "eslint": "^9.39.4",
-    "eslint-plugin-chai-expect": "^3.1.0",
+    "esbuild": "^0.27.4",
+    "esbuild-plugins-node-modules-polyfill": "^1.8.1",
+    "eslint": "^10.2.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-chai-expect": "^4.0.0",
     "eslint-plugin-mocha": "^11.2.0",
-    "fresh-tape": "^5.5.3",
+    "fresh-tape": "^5.9.1",
     "mocha": "^11.7.5",
     "saucie": "^4.0.1",
     "sinon": "^21.0.3",
     "sinon-chai": "^4.0.1",
-    "socket.io-client": "^4.1.2"
+    "socket.io-client": "^4.8.3"
+  },
+  "overrides": {
+    "mocha": {
+      "diff": "^8.0.3",
+      "minimatch": "^9.0.7",
+      "serialize-javascript": "^7.0.5"
+    }
   },
   "bin": {
     "testem": "./testem.js"

package/testem.js

@@ -1,76 +1,178 @@
 #!/usr/bin/env node
 
-
-const program = require('commander');
-let progOptions = program;
+const { Command } = require('commander');
 const Config = require('./lib/config');
 const Api = require('./lib/api');
-let appMode = 'dev';
-
-program
-  .version(require(__dirname + '/package').version)
-  .usage('[options]')
-  .option('-f, --file [file]', 'config file - defaults to testem.json or testem.yml')
-  .option('-p, --port [num]', 'server port - defaults to 7357', Number)
-  .option('--host [hostname]', 'host name - defaults to localhost', String)
-  .option('-l, --launch [list]', 'list of launchers to launch(comma separated)')
-  .option('-s, --skip [list]', 'list of launchers to skip(comma separated)')
-  .option('-d, --debug [file]', 'output debug to debug log - defaults to testem.log')
-  .option('-t, --test_page [page]', 'the html page to drive the tests')
-  .option('-g, --growl', 'turn on growl / native notifications');
-
-program
-  .command('launchers')
-  .description('Print the list of available launchers (browsers & process launchers)')
-  .action(act(env => {
-    env.__proto__ = program;
-    progOptions = env;
-    appMode = 'launchers';
-  }));
-
-program
-  .command('ci')
-  .description('Continuous integration mode')
-  .option('-T, --timeout [sec]', 'timeout a browser after [sec] seconds', null)
-  .option('-P, --parallel [num]', 'number of browsers to run in parallel, defaults to 1', Number)
-  .option('-b, --bail_on_uncaught_error', 'Bail on any uncaught errors')
-  .option('-R, --reporter [reporter]', 'Test reporter to use [tap|dot|xunit|teamcity]')
-  .option('--cwd [path]', 'directory to use as root')
-  .option('--config_dir [path]', 'directory to use as root for resolving configs, if different than cwd')
-  .action(act(env => {
-    env.__proto__ = program;
-    progOptions = env;
-    appMode = 'ci';
-  }));
-
-program
-  .command('server')
-  .description('Run just the server')
-  .action(act(env => {
-    env.__proto__ = program;
-    progOptions = env;
-    appMode = 'server';
-  }));
-
-program.on('--help', () => {
-  console.log('  Keyboard Controls (in dev mode):\n');
-  console.log('    ENTER                  run the tests');
-  console.log('    q                      quit');
-  console.log('    LEFT ARROW             move to the next browser tab on the left');
-  console.log('    RIGHT ARROW            move to the next browser tab on the right');
-  console.log('    TAB                    switch between top and bottom panel (split mode only)');
-  console.log('    UP ARROW               scroll up in the target text panel');
-  console.log('    DOWN ARROW             scroll down in the target text panel');
-  console.log('    SPACE                  page down in the target text panel');
-  console.log('    b                      page up in the target text panel');
-  console.log('    d                      half a page down in the target text panel');
-  console.log('    u                      half a page up in the target text panel');
-  console.log();
-});
-
-main();
+
+// this is to workaround the weird behavior in commander where
+// if you provide additional command line arguments that aren't
+// options, it goes in as a string as the 1st argument of the
+// "action" callback, we don't want this
+function act(fun) {
+  return function() {
+    let options = arguments[arguments.length - 1];
+    fun(options);
+  };
+}
+
+/**
+ * Build and parse a fresh Commander program from the given argv array.
+ * Returns { progOptions, appMode } where progOptions is a plain object
+ * containing all resolved option values (from program.opts() /
+ * optsWithGlobals()), so option values are directly accessible as
+ * properties rather than requiring access via a Command instance.
+ * A _commander reference is attached for internal option enumeration.
+ *
+ * @param {string[]} argv - process.argv-style array
+ * @param {{ exitOverride?: boolean }} [opts]
+ *   exitOverride: when true, commander throws instead of calling process.exit
+ *   (useful in tests to prevent the process from terminating)
+ */
+function parseArgs(argv, { exitOverride = false } = {}) {
+  let progOptions = null;
+  let appMode = 'dev';
+
+  const program = new Command();
+
+  if (exitOverride) {
+    program.exitOverride();
+  }
+
+  program
+    .version(require(__dirname + '/package').version)
+    .usage('[options]')
+    .option(
+      '-f, --file [file]',
+      'config file - defaults to testem.json or testem.yml',
+    )
+    .option('-p, --port [num]', 'server port - defaults to 7357', Number)
+    .option('--host [hostname]', 'host name - defaults to localhost', String)
+    .option(
+      '-l, --launch [list]',
+      'list of launchers to launch(comma separated)',
+    )
+    .option('-s, --skip [list]', 'list of launchers to skip(comma separated)')
+    .option(
+      '-d, --debug [file]',
+      'output debug to debug log - defaults to testem.log',
+    )
+    .option('-t, --test_page [page]', 'the html page to drive the tests')
+    .option('-g, --growl', 'turn on growl / native notifications')
+    // A root action is required in commander v7+ to prevent the program from
+    // automatically displaying help and exiting when no subcommand is given.
+    // Without it, running `testem` (dev mode) would show help instead of
+    // starting the dev server.
+    .action(() => {});
+
+  program
+    .command('launchers')
+    .description(
+      'Print the list of available launchers (browsers & process launchers)',
+    )
+    .action(
+      act((env) => {
+        progOptions = env.optsWithGlobals();
+        progOptions._commander = env;
+        appMode = 'launchers';
+      }),
+    );
+
+  program
+    .command('ci')
+    .description('Continuous integration mode')
+    .option(
+      '-T, --timeout [sec]',
+      'timeout a browser after [sec] seconds',
+      null,
+    )
+    .option(
+      '-P, --parallel [num]',
+      'number of browsers to run in parallel, defaults to 1',
+      Number,
+    )
+    .option('-b, --bail_on_uncaught_error', 'Bail on any uncaught errors')
+    .option(
+      '-R, --reporter [reporter]',
+      'Test reporter to use [tap|dot|xunit|teamcity]',
+    )
+    .option('--cwd [path]', 'directory to use as root')
+    .option(
+      '--config_dir [path]',
+      'directory to use as root for resolving configs, if different than cwd',
+    )
+    .action(
+      act((env) => {
+        progOptions = env.optsWithGlobals();
+        progOptions._commander = env;
+        appMode = 'ci';
+      }),
+    );
+
+  program
+    .command('server')
+    .description('Run just the server')
+    .action(
+      act((env) => {
+        progOptions = env.optsWithGlobals();
+        progOptions._commander = env;
+        appMode = 'server';
+      }),
+    );
+
+  program.on('--help', () => {
+    console.log('  Keyboard Controls (in dev mode):\n');
+    console.log('    ENTER                  run the tests');
+    console.log('    q                      quit');
+    console.log(
+      '    LEFT ARROW             move to the next browser tab on the left',
+    );
+    console.log(
+      '    RIGHT ARROW            move to the next browser tab on the right',
+    );
+    console.log(
+      '    TAB                    switch between top and bottom panel (split mode only)',
+    );
+    console.log(
+      '    UP ARROW               scroll up in the target text panel',
+    );
+    console.log(
+      '    DOWN ARROW             scroll down in the target text panel',
+    );
+    console.log(
+      '    SPACE                  page down in the target text panel',
+    );
+    console.log('    b                      page up in the target text panel');
+    console.log(
+      '    d                      half a page down in the target text panel',
+    );
+    console.log(
+      '    u                      half a page up in the target text panel',
+    );
+    console.log();
+  });
+
+  program.parse(argv);
+
+  if (progOptions === null) {
+    // dev mode: no subcommand was invoked; use opts() so option values are
+    // plain properties rather than requiring access via the Command object
+    // (commander v14 no longer exposes options as direct Command properties)
+    const devOpts = program.opts();
+    devOpts._commander = program;
+    progOptions = devOpts;
+  }
+
+  return { progOptions, appMode };
+}
+
+module.exports = { parseArgs };
+
+if (require.main === module) {
+  main();
+}
+
 function main() {
-  program.parse(process.argv);
+  const { progOptions, appMode } = parseArgs(process.argv);
 
   let config = new Config(appMode, progOptions);
   if (appMode === 'launchers') {
@@ -86,14 +188,3 @@ function main() {
     }
   }
 }
-
-// this is to workaround the weird behavior in command where
-// if you provide additional command line arguments that aren't
-// options, it goes in as a string as the 1st arguments of the
-// "action" callback, we don't want this
-function act(fun) {
-  return function() {
-    let options = arguments[arguments.length - 1];
-    fun(options);
-  };
-}