testem 3.18.0 → 3.19.0

package/lib/config.js

@@ -14,7 +14,7 @@ const fs = require('fs');
 const yaml = require('js-yaml');
 const log = require('npmlog');
 const path = require('path');
-const glob = require('glob');
+const glob = require('glob').glob;
 const url = require('url');
 const querystring = require('querystring');
 const Bluebird = require('bluebird');
@@ -28,7 +28,8 @@ const fileExists = require('./utils/fileutils').fileExists;
 const _ = require('lodash');
 
 const knownBrowsers = require('./utils/known-browsers');
-const globAsync = Bluebird.promisify(glob);
+const { convertToPosix } = require('./utils/posix');
+const globAsync = glob;
 
 class Config {
   constructor(appMode, progOptions, config) {
@@ -409,10 +410,12 @@ class Config {
         return allThatIWant.concat({ src: pattern, attrs: attrs });
       }
 
-      return globAsync(this.resolvePath(pattern), { ignore: dontWant }).then(files => allThatIWant.concat(files.map(f => {
-        f = this.reverseResolvePath(f);
-        return { src: f, attrs: attrs };
-      })));
+      return globAsync(convertToPosix(this.resolvePath(pattern)), { ignore: dontWant.map(convertToPosix) })
+        .then(files => files.sort())
+        .then(files => allThatIWant.concat(files.map(f => {
+          f = this.reverseResolvePath(f);
+          return { src: f, attrs: attrs };
+        })));
     }, [])
       .then(result => _.uniqBy(result, 'src'))
       .asCallback(callback);

package/lib/process-ctl.js

@@ -1,7 +1,7 @@
 
 
 const log = require('npmlog');
-const execa = require('execa');
+const execa = require('execa').execa;
 const Bluebird = require('bluebird');
 const util = require('util');
 const EventEmitter = require('events').EventEmitter;
@@ -11,6 +11,7 @@ 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 fileExists = fileutils.fileExists;
 const executableExists = fileutils.executableExists;
@@ -37,7 +38,20 @@ 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);
   }

package/lib/runners/process_test_runner.js

@@ -21,6 +21,7 @@ class ProcessTestRunner {
         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);
   }

package/lib/tap_consumer.js

@@ -1,7 +1,7 @@
 
 
 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');

package/lib/utils/fileutils.js

@@ -1,7 +1,7 @@
 
 
 const fs = require('fs');
-const execa = require('execa');
+const execa = require('execa').execa;
 const Bluebird = require('bluebird');
 const log = require('npmlog');
 
@@ -15,9 +15,14 @@ exports.fileExists = function fileExists(path) {
 
 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'
   ];
@@ -144,7 +145,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;
+  }
+};

package/lib/utils/process.js

@@ -1,6 +1,4 @@
-
-
-const execa = require('execa');
+const execa = require('execa').execa;
 const log = require('npmlog');
 const Bluebird = require('bluebird');
 const EventEmitter = require('events').EventEmitter;
@@ -29,6 +27,15 @@ module.exports = class Process extends EventEmitter {
 
     this.process.on('close', this.onClose.bind(this));
     this.process.on('error', this.onError.bind(this));
+
+    this.process.then(result => {
+      if (result.failed && result.exitCode !== 0 &&
+        result.shortMessage.includes(isWin ? 'is not recognized' : 'ENOENT'))
+      {
+        this.onError(new Error(result.shortMessage), this.stdout, this.stderr);
+      }
+      return Promise.resolve(result);
+    });
   }
 
   onKillTimeout() {
@@ -48,7 +55,7 @@ module.exports = class Process extends EventEmitter {
 
   onError(error) {
     log.warn(this.name + ' errored', error);
-    this.process = null;
+    // this.process = null;
     this.exitCode = 1;
     this.emit('processError', error, this.stdout, this.stderr);
   }
@@ -132,14 +139,18 @@ function kill(p, sig) {
       args.push('/f');
     }
 
-    execa(command, args).then(result => {
+    const killProcess = execa(command, args, { reject: false });
+
+    killProcess.on('error', err => {
+      log.error(err);
+    });
+
+    killProcess.then(result => {
       // Processes without windows can't be killed without /F, detect and force
       // kill them directly
       if (result.stderr.indexOf('can only be terminated forcefully') !== -1) {
         kill(p, 'SIGKILL');
       }
-    }).catch(err => {
-      log.error(err);
     });
   } else {
     p.kill(sig);

package/package.json

@@ -7,7 +7,7 @@
     "unittest",
     "browser"
   ],
-  "version": "3.18.0",
+  "version": "3.19.0",
   "author": "Toby Ho <airportyh@gmail.com>",
   "repository": {
     "type": "git",
@@ -28,10 +28,10 @@
     "commander": "^2.6.0",
     "compression": "^1.7.4",
     "consolidate": "^0.16.0",
-    "execa": "^1.0.0",
+    "execa": "^9.6.1",
     "express": "^4.10.7",
     "fireworm": "^0.7.2",
-    "glob": "^7.0.4",
+    "glob": "^13.0.6",
     "http-proxy": "^1.13.1",
     "js-yaml": "^3.2.5",
     "lodash": "^4.17.21",
@@ -40,7 +40,7 @@
     "node-notifier": "^10.0.0",
     "npmlog": "^6.0.0",
     "printf": "^0.6.1",
-    "rimraf": "^3.0.2",
+    "rimraf": "^6.1.3",
     "socket.io": "^4.5.4",
     "spawn-args": "^0.2.0",
     "styled_string": "0.0.1",