testem 3.18.0 → 3.19.1

package/lib/process-ctl.js

@@ -1,8 +1,7 @@
 
 
-const log = require('npmlog');
-const execa = require('execa');
-const Bluebird = require('bluebird');
+const log = require('./log');
+const execa = require('execa').execa;
 const util = require('util');
 const EventEmitter = require('events').EventEmitter;
 const spawnargs = require('spawn-args');
@@ -11,6 +10,8 @@ const _ = require('lodash');
 const envWithLocalPath = require('./utils/env-with-local-path');
 const fileutils = require('./utils/fileutils');
 const Process = require('./utils/process');
+const isWin = require('./utils/is-win')();
+const { reduce } = require('./utils/promises');
 
 const fileExists = fileutils.fileExists;
 const executableExists = fileutils.executableExists;
@@ -37,16 +38,29 @@ module.exports = class ProcessCtl extends EventEmitter {
 
   _spawn(exe, args, options) {
     log.info('spawning: ' + exe + ' - ' + util.inspect(args));
-    let p  = new Process(this.name, { killTimeout: this.killTimeout }, execa(exe, args, options));
+
+    // promise should always succeed, Process will uses .on('error') to handle errors
+    let process = execa(exe, args, Object.assign({ reject: false }, options));
+
+    process.then(result => {
+      if (result.failed && result.exitCode !== 0 &&
+        result.shortMessage.includes(isWin ? 'is not recognized' : 'ENOENT'))
+      {
+        this.emit('processError', new Error(result.shortMessage), result.stdout, result.stderr);
+      }
+      return Promise.resolve(result);
+    });
+
+    let p  = new Process(this.name, { killTimeout: this.killTimeout }, process);
     this.emit('processStarted', p);
-    return Bluebird.resolve(p);
+    return Promise.resolve(p);
   }
 
   spawn(exe, args, options) {
     let _options = this.prepareOptions(options);
 
     if (Array.isArray(exe)) {
-      return Bluebird.reduce(exe, (found, exe) => {
+      return reduce(exe, (found, exe) => {
         if (found) {
           return found;
         }

package/lib/reporters/dev/index.js

@@ -10,7 +10,7 @@ The actual AppView. This encapsulates the entire UI.
 */
 
 const StyledString = require('styled_string');
-const log = require('npmlog');
+const log = require('../../log');
 const Backbone = require('backbone');
 
 const View = require('./view');
@@ -60,6 +60,7 @@ module.exports = View.extend({
       if (atLeastOne && this.get('currentTab') < 0) {
         this.set('currentTab', 0);
       }
+      this.renderTop();
       this.renderMiddle();
       this.renderBottom();
     });

package/lib/reporters/dev/split_log_panel.js

@@ -213,7 +213,7 @@ module.exports = View.extend({
       out += 'Top Level:\n' + indent(topLevelError) + '\n\n';
     }
 
-    if (results && (tests = results.get('tests'))) {
+    if (results && (tests = results.get('tests')) && !topLevelError) {
       var total = results.get('total');
       var pending = results.get('pending');
       var allDone = results.get('all');

package/lib/runners/browser_test_runner.js

@@ -1,10 +1,9 @@
 
 
-const log = require('npmlog');
+const log = require('../log');
 const BrowserTapConsumer = require('../browser_tap_consumer');
-const Bluebird = require('bluebird');
-
 const LogEntry = require('../utils/log-entry');
+const { asCallback } = require('../utils/promises');
 const toResult = require('./to-result');
 
 module.exports = class BrowserTestRunner {
@@ -33,7 +32,7 @@ module.exports = class BrowserTestRunner {
     this.finished = false;
     this.pending = true;
 
-    return new Bluebird.Promise(resolve => {
+    return new Promise(resolve => {
       this.onFinish = resolve;
 
       if (this.socket) {
@@ -48,19 +47,19 @@ module.exports = class BrowserTestRunner {
           this.onProcessError(err);
         });
       }
-    }).asCallback(onFinish);
+    }).then(...asCallback(onFinish));
   }
 
   stop(cb) {
     if (this.socket) {
       this.socket.emit('stop-run');
     }
-    return Bluebird.resolve().asCallback(cb);
+    return Promise.resolve().then(...asCallback(cb));
   }
 
   exit() {
     if (!this.process) {
-      return Bluebird.resolve();
+      return Promise.resolve();
     }
 
     // mark that somebody (generally app.js) has requested that the
@@ -119,6 +118,12 @@ module.exports = class BrowserTestRunner {
     socket.on('test-metadata', this.onTestMetadata.bind(this));
     socket.on('top-level-error', this.onGlobalError.bind(this));
 
+    socket.on('tap-debug', function(data) {
+      if (process.env.TESTEM_VERBOSE) {
+        log.verbose('tap-debug', data && data.msg);
+      }
+    });
+
     socket.on('browser-console', function(/* ...args */) {
       let args = Array.prototype.slice.call(arguments);
       let type = args.shift();

package/lib/runners/hook_runner.js

@@ -1,7 +1,7 @@
 
 
-const Bluebird = require('bluebird');
-const log = require('npmlog');
+const { fromCallback, disposer } = require('../utils/promises');
+const log = require('../log');
 
 const template = require('../utils/strutils').template;
 const ProcessCtl = require('../process-ctl');
@@ -11,13 +11,13 @@ module.exports = class HookRunner {
     this.config = config;
   }
 
-  run(hook, data, callback) {
+  run(hook, data) {
     let hookCfg = this.config.get(hook);
     if (!hookCfg) {
-      return Bluebird.resolve();
+      return Promise.resolve();
     }
     if (typeof hookCfg === 'function') {
-      return Bluebird.fromCallback(callback => {
+      return fromCallback(callback => {
         hookCfg(this.config, data, callback);
       });
     }
@@ -57,7 +57,7 @@ module.exports = class HookRunner {
       hookProcessPromise = this.processCtl.spawn(exe, args, options);
       command = exe + ' ' + args.join(' ');
     } else {
-      return Bluebird.reject(new Error('No command or exe/args specified for hook ' + hook));
+      return Promise.reject(new Error('No command or exe/args specified for hook ' + hook));
     }
 
     waitForTextTimeout = waitForTextTimeout || 10000;
@@ -65,7 +65,7 @@ module.exports = class HookRunner {
 
     let exited = false;
     let finished;
-    let p = new Bluebird.Promise((resolve, reject) => {
+    let p = new Promise((resolve, reject) => {
       finished = (err, stdout, stderr) => {
         if (exited) {
           return;
@@ -109,7 +109,7 @@ module.exports = class HookRunner {
       }
     });
 
-    return p.asCallback(callback);
+    return p;
   }
 
   varsubParams() {
@@ -135,17 +135,19 @@ module.exports = class HookRunner {
       return this.hookProcess.kill();
     }
 
-    return Bluebird.resolve();
+    return Promise.resolve();
   }
 
   static with(config, hook, data) {
     let hookRunner = new HookRunner(config);
 
-    return hookRunner.run(hook, data).catch(err => {
+    let runPromise = hookRunner.run(hook, data).catch(err => {
       log.error(hook + ' error', err);
 
       throw err;
-    }).disposer(() => hookRunner.stop());
+    });
+
+    return disposer(runPromise, () => hookRunner.stop());
   }
 };
 

package/lib/runners/process_test_runner.js

@@ -1,7 +1,6 @@
 
-var Bluebird = require('bluebird');
-
 var toResult = require('./to-result');
+const { asCallback } = require('../utils/promises');
 
 class ProcessTestRunner {
   constructor(launcher, reporter) {
@@ -15,19 +14,20 @@ class ProcessTestRunner {
     this.onStart();
     this.finished = false;
 
-    return new Bluebird.Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       this.onFinish = resolve;
       this.launcher.start().then(testProcess => {
         this.process = testProcess;
         this.process.once('processExit', this.onProcessExit.bind(this));
         this.process.once('processError', this.onProcessError.bind(this));
+        return Promise.resolve(testProcess);
       }).catch(reject);
-    }).asCallback(onFinish);
+    }).then(...asCallback(onFinish));
   }
 
   exit() {
     if (!this.process) {
-      return Bluebird.resolve();
+      return Promise.resolve();
     }
 
     return this.process.kill();

package/lib/runners/tap_process_test_runner.js

@@ -1,10 +1,9 @@
 
 
 var TapConsumer = require('../tap_consumer');
-var log = require('npmlog');
-var Bluebird = require('bluebird');
-
+var log = require('../log');
 var toResult = require('./to-result');
+const { asCallback } = require('../utils/promises');
 
 class TapProcessTestRunner {
   constructor(launcher, reporter) {
@@ -23,19 +22,19 @@ class TapProcessTestRunner {
     this.tapConsumer.on('test-result', this.onTestResult.bind(this));
     this.tapConsumer.on('all-test-results', this.onAllTestResults.bind(this));
 
-    return new Bluebird.Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       this.onFinish = resolve;
       this.launcher.start().then(tapProcess => {
         this.process = tapProcess;
         this.process.once('processError', this.onProcessError.bind(this));
         this.process.process.stdout.pipe(this.tapConsumer.stream);
       }).catch(reject);
-    }).asCallback(onFinish);
+    }).then(...asCallback(onFinish));
   }
 
   exit() {
     if (!this.process) {
-      return Bluebird.resolve();
+      return Promise.resolve();
     }
 
     return this.process.kill();

package/lib/runners/to-result.js

@@ -1,6 +1,6 @@
 
 
-const log = require('npmlog');
+const log = require('../log');
 
 module.exports = function toResult(launcherId, err, code, runnerProcess, config, testContext) {
   let logs = [];

package/lib/server/index.js

@@ -14,15 +14,13 @@ var socketIO = require('socket.io');
 var compression = require('compression');
 var fs = require('fs');
 var path = require('path');
-var log = require('npmlog');
+var log = require('../log');
 var EventEmitter = require('events').EventEmitter;
 var Mustache = require('consolidate').mustache;
 var http = require('http');
 var https = require('https');
 var httpProxy = require('http-proxy');
-var Bluebird = require('bluebird');
-
-var readFileAsync = Bluebird.promisify(fs.readFile);
+const { fromCallback, each } = require('../utils/promises');
 
 class Server extends EventEmitter {
   constructor(config) {
@@ -37,7 +35,7 @@ class Server extends EventEmitter {
     this.nextSocketId = 0;
   }
 
-  start(callback) {
+  start() {
     this.createExpress();
 
     // Start the server!
@@ -50,7 +48,7 @@ class Server extends EventEmitter {
       });
     });
 
-    return new Bluebird.Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       this.server.on('listening', () => {
         this.config.set('port', this.server.address().port);
         resolve();
@@ -63,23 +61,23 @@ class Server extends EventEmitter {
       });
 
       this.server.listen(this.config.get('port'));
-    }).asCallback(callback);
+    });
   }
 
-  stop(callback) {
+  stop() {
     if (this.server && !this.stopped) {
       this.stopped = true;
 
-      return Bluebird.fromCallback(closeCallback => {
+      return fromCallback(closeCallback => {
         this.server.close(closeCallback);
 
         // Destroy all open sockets
         for (var socketId in this.sockets) {
           this.sockets[socketId].destroy();
         }
-      }).asCallback(callback);
+      });
     } else {
-      return Bluebird.resolve().asCallback(callback);
+      return Promise.resolve();
     }
   }
 
@@ -281,11 +279,13 @@ class Server extends EventEmitter {
       var url = base + test_page;
       res.redirect(url);
     } else {
-      config.getServeFiles((err, files) => {
-        config.getFooterScripts((err, footerScripts) => {
-          this.renderRunnerPage(err, files, footerScripts, res);
+      Promise.all([config.getServeFiles(), config.getFooterScripts()])
+        .then(([files, footerScripts]) => {
+          this.renderRunnerPage(null, files, footerScripts, res);
+        })
+        .catch(err => {
+          this.renderRunnerPage(err, [], [], res);
         });
-      });
     }
   }
 
@@ -314,11 +314,11 @@ class Server extends EventEmitter {
       'mocha_adapter.js',
       'testem_client.js'
     ];
-    Bluebird.each(files, file => {
+    each(files, file => {
       if (file.indexOf(path.sep) === -1) {
         file = `${__dirname}/../../public/testem/${file}`;
       }
-      return readFileAsync(file).then(data => {
+      return fs.promises.readFile(file).then(data => {
         res.write(`\n//============== ${path.basename(file)} ==================\n\n`);
         res.write(data);
       }).catch(err => {
@@ -376,20 +376,21 @@ class Server extends EventEmitter {
         this.emit('file-requested', filePath);
       });
     } else {
-      fs.stat(filePath, (err, stat) => {
-        this.emit('file-requested', filePath);
-        if (err) {
-          return res.sendFile(filePath);
-        }
-        if (stat.isDirectory()) {
-          fs.readdir(filePath, (err, files) => {
-            var dirListingPage = `${__dirname}/../../views/directorylisting.mustache`;
-            res.render(dirListingPage, { files: files });
-          });
-        } else {
+      fs.promises.stat(filePath)
+        .then(stat => {
+          this.emit('file-requested', filePath);
+          if (stat.isDirectory()) {
+            return fs.promises.readdir(filePath).then(files => {
+              var dirListingPage = `${__dirname}/../../views/directorylisting.mustache`;
+              res.render(dirListingPage, { files: files });
+            });
+          }
           res.sendFile(filePath);
-        }
-      });
+        })
+        .catch(() => {
+          this.emit('file-requested', filePath);
+          res.sendFile(filePath);
+        });
     }
   }
 

package/lib/tap_consumer.js

@@ -1,10 +1,10 @@
 
 
 const yaml = require('js-yaml');
-const extend = require('util')._extend;
+const extend = Object.assign;
 const EventEmitter = require('events').EventEmitter;
 const TapParser = require('tap-parser');
-const log = require('npmlog');
+const log = require('./log');
 
 module.exports = class TapConsumer extends EventEmitter {
   constructor() {

package/lib/utils/browser-args.js

@@ -1,7 +1,7 @@
 
 
 const capitalize = require('./capitalize');
-const log = require('npmlog');
+const log = require('../log');
 const _ = require('lodash');
 
 function Validation() {

package/lib/utils/esbuild-browser-polyfills.js

@@ -0,0 +1,46 @@
+/**
+ * Shared esbuild config for bundling Node.js-dependent test code to run in a
+ * browser via testem.
+ *
+ * esbuild's `@esbuild-plugins/node-modules-polyfill` stores the `process`
+ * polyfill as a scoped variable inside the IIFE it emits, but CJS module
+ * factories (wrapped in `__commonJS`) reference `process`, `__dirname`, and
+ * `setImmediate` as free globals — causing ReferenceErrors at runtime.
+ *
+ * These two options fix that:
+ *   - `banner.js`: sets `globalThis.process`, `globalThis.setImmediate`, and
+ *     `globalThis.Buffer` before the bundle executes, so CJS factories find
+ *     them as globals.
+ *   - `define`: replaces `__dirname` / `__filename` literals, which esbuild
+ *     does not inject when targeting the browser platform.
+ */
+
+var banner = '(function(){' +
+  'if(typeof process==="undefined"){' +
+    'var p={env:{},browser:true,platform:"browser",' +
+      'nextTick:function(fn){Promise.resolve().then(fn);},' +
+      'on:function(){},once:function(){},off:function(){},' +
+      'emit:function(){},removeListener:function(){},' +
+      'removeAllListeners:function(){},addListener:function(){},' +
+      'binding:function(){throw new Error("process.binding not supported");},' +
+      'cwd:function(){return "/";},' +
+      'exit:function(){}' +
+    '};' +
+    'if(typeof globalThis!=="undefined")globalThis.process=p;' +
+    'else if(typeof window!=="undefined")window.process=p;' +
+  '}' +
+  'if(typeof setImmediate==="undefined"){' +
+    'var si=function(fn){Promise.resolve().then(fn);};' +
+    'if(typeof globalThis!=="undefined")globalThis.setImmediate=si;' +
+    'else if(typeof window!=="undefined")window.setImmediate=si;' +
+  '}' +
+'})();';
+
+module.exports = {
+  banner: { js: banner },
+  bufferInject: require.resolve('./esbuild-buffer-inject.js'),
+  define: {
+    __dirname: '""',
+    __filename: '""'
+  }
+};

package/lib/utils/esbuild-buffer-inject.js

@@ -0,0 +1,6 @@
+// esbuild inject shim: exposes Buffer as a global for browser bundles.
+// The @esbuild-plugins/node-modules-polyfill plugin resolves `require('buffer')`
+// to a browser polyfill, but does not assign it to globalThis automatically.
+import { Buffer } from 'buffer';
+if (typeof globalThis !== 'undefined') { globalThis.Buffer = Buffer; }
+else if (typeof window !== 'undefined') { window.Buffer = Buffer; }

package/lib/utils/fileutils.js

@@ -1,23 +1,28 @@
 
 
 const fs = require('fs');
-const execa = require('execa');
-const Bluebird = require('bluebird');
-const log = require('npmlog');
+const execa = require('execa').execa;
+const { promisify } = require('util');
+const log = require('../log');
 
-const fsStatAsync = Bluebird.promisify(fs.stat);
+const fsStatAsync = promisify(fs.stat);
 
 const isWin = require('./is-win')();
 
 exports.fileExists = function fileExists(path) {
-  return fsStatAsync(path).then(stat => stat.isFile()).catchReturn(false);
+  return fsStatAsync(path).then(stat => stat.isFile()).catch(() => false);
 };
 
 exports.executableExists = function executableExists(exe, options) {
   let cmd = isWin ? 'where' : 'which';
-  let test = execa(cmd, [exe], options);
-
-  test.on('error', error => log.error('Error spawning "' + cmd + exe + '"', error));
-
-  return test.then(result => result.code === 0, () => false);
+  let test = execa(cmd, [exe], Object.assign({ reject: false }, options));
+
+  return test.then(result => {
+    if (result.exitCode === 0) {
+      return true;
+    } else if (!result.exitCode) {
+      log.error('Error spawning "' + cmd + ' ' + exe + '"', result);
+    }
+    return false;
+  });
 };

package/lib/utils/is-win.js

@@ -1,5 +1,3 @@
-
-
 function test(platform) {
   return /^win/.test(platform);
 }

package/lib/utils/known-browsers.js

@@ -84,6 +84,7 @@ function firefoxPaths() {
   return [
     'C:\\Program Files\\Mozilla Firefox\\firefox.exe',
     'C:\\Program Files (x86)\\Mozilla Firefox\\firefox.exe',
+    'C:\\Users\\' + process.env.USERNAME + '\\AppData\\Local\\Mozilla Firefox\\firefox.exe',
     process.env.HOME + '/Applications/Firefox.app/Contents/MacOS/firefox',
     '/Applications/Firefox.app/Contents/MacOS/firefox'
   ];
@@ -94,24 +95,25 @@ function firefoxSetup(browserTmpDir, config, done) {
   let perfJS = path.join(browserTmpDir, 'user.js');
 
   if (config.get('firefox_user_js')) {
-    return fs.readFile(config.get('firefox_user_js'), (err, content) => {
-      if (err) {
-        return done(err);
-      }
-
-      fs.writeFile(perfJS, content, done);
-    });
+    return fs.promises.readFile(config.get('firefox_user_js'))
+      .then(content => fs.promises.writeFile(perfJS, content))
+      .then(() => done(null), done);
   }
 
-  // using user.js to suppress the check default browser popup
-  // and the welcome start page
+  // using user.js to suppress the check default browser popup,
+  // the welcome start page, and first-run helper installation prompts
   let prefs = [
     'user_pref("browser.shell.checkDefaultBrowser", false);',
     'user_pref("browser.cache.disk.smart_size.first_run", false);',
     'user_pref("datareporting.policy.dataSubmissionEnabled", false);',
-    'user_pref("datareporting.policy.dataSubmissionPolicyNotifiedTime", "1481830156314");'
+    'user_pref("datareporting.policy.dataSubmissionPolicyNotifiedTime", "1481830156314");',
+    'user_pref("app.update.auto", false);',
+    'user_pref("app.update.enabled", false);',
+    'user_pref("browser.EULA.override", true);',
+    'user_pref("toolkit.telemetry.reportingpolicy.firstRun", false);'
   ];
-  fs.writeFile(perfJS, prefs.join(os.EOL), done);
+  fs.promises.writeFile(perfJS, prefs.join(os.EOL))
+    .then(() => done(null), done);
 }
 
 // Return the catalogue of the browsers that Testem supports for the platform. Each 'browser object'
@@ -144,7 +146,7 @@ module.exports = function knownBrowsers(platform, config) {
       possibleExe: 'firefox',
 
       args(config, url) {
-        return ['-profile', '--headless', this.browserTmpDir(), url];
+        return ['-profile', '-headless', this.browserTmpDir(), url];
       },
       setup(config, done) {
         firefoxSetup(this.browserTmpDir(), config, done);

package/lib/utils/posix.js

@@ -0,0 +1,13 @@
+const isWin = require('./is-win');
+
+module.exports = {
+  isPosix(path) {
+    return path.includes('/') && !path.includes('\\');
+  },
+  convertToPosix(path) {
+    if (isWin()) {
+      return path.replace(/\\/g, '/');
+    }
+    return path;
+  }
+};