testem 3.19.0 → 3.20.0

package/lib/browser_launcher.js

@@ -8,10 +8,9 @@ This file more or less figures out how to launch any browser on any platform.
 */
 
 
-var Bluebird = require('bluebird');
-
 var fileutils = require('./utils/fileutils');
 var envWithLocalPath = require('./utils/env-with-local-path');
+const { filter, asCallback } = require('./utils/promises');
 
 var executableExists = function(exe, config) {
   return fileutils.executableExists(exe, { env: envWithLocalPath(config) });
@@ -24,7 +23,7 @@ function getAvailableBrowsers(config, browsers, cb) {
     b.protocol = 'browser';
   });
 
-  return Bluebird.filter(browsers, function(browser) {
+  return filter(browsers, function(browser) {
     return isInstalled(browser, config).then(function(result) {
       if (!result) {
         return false;
@@ -33,7 +32,7 @@ function getAvailableBrowsers(config, browsers, cb) {
       browser.exe = result;
       return true;
     });
-  }).asCallback(cb);
+  }).then(...asCallback(cb));
 }
 
 function isInstalled(browser, config) {
@@ -50,11 +49,11 @@ function isInstalled(browser, config) {
 
 function checkBrowser(browser, property, method) {
   if (!browser[property]) {
-    return Bluebird.resolve(false);
+    return Promise.resolve(false);
   }
 
   if (Array.isArray(browser[property])) {
-    return Bluebird.filter(browser[property], method).then(function(result) {
+    return filter(browser[property], method).then(function(result) {
       if (result.length === 0) {
         return false;
       }

package/lib/config.js

@@ -8,16 +8,14 @@ or `testem.json` config file.
 
 */
 
-
 const os = require('os');
 const fs = require('fs');
 const yaml = require('js-yaml');
-const log = require('npmlog');
+const log = require('./log');
 const path = require('path');
-const glob = require('glob').glob;
 const url = require('url');
 const querystring = require('querystring');
-const Bluebird = require('bluebird');
+const { filter, reduce } = require('./utils/promises');
 
 const browser_launcher = require('./browser_launcher');
 const LauncherFactory = require('./launcher-factory');
@@ -29,7 +27,7 @@ const _ = require('lodash');
 
 const knownBrowsers = require('./utils/known-browsers');
 const { convertToPosix } = require('./utils/posix');
-const globAsync = glob;
+const expandGlobPattern = require('./utils/expand_glob_pattern');
 
 class Config {
   constructor(appMode, progOptions, config) {
@@ -39,7 +37,7 @@ class Config {
     this.fileOptions = {};
     this.config = config || {};
     this.getters = {
-      test_page: 'getTestPage'
+      test_page: 'getTestPage',
     };
 
     if (appMode === 'dev') {
@@ -71,12 +69,31 @@ class Config {
 
       // Try all testem.json, testem.yml and testem.js
       // testem.json gets precedence
-      let files = ['testem.json', '.testem.json', '.testem.yml', 'testem.yml', 'testem.js', '.testem.js', 'testem.cjs', '.testem.cjs'];
-      return Bluebird.filter(files.map(this.resolveConfigPath.bind(this)), fileExists).then(matched => {
+      let files = [
+        'testem.json',
+        '.testem.json',
+        '.testem.yml',
+        'testem.yml',
+        'testem.js',
+        '.testem.js',
+        'testem.cjs',
+        '.testem.cjs',
+      ];
+      return filter(
+        files.map(this.resolveConfigPath.bind(this)),
+        fileExists,
+      ).then((matched) => {
         let configFile = matched[0];
         if (matched.length > 1) {
-          let baseNames = matched.map(fileName => path.basename(fileName));
-          console.warn('Found ' + matched.length + ' config files (' + baseNames + '), using ' + baseNames[0]);
+          let baseNames = matched.map((fileName) => path.basename(fileName));
+          console.warn(
+            'Found ' +
+              matched.length +
+              ' config files (' +
+              baseNames +
+              '), using ' +
+              baseNames[0],
+          );
         }
         if (configFile) {
           this.readConfigFile(configFile, callback);
@@ -99,7 +116,7 @@ class Config {
 
   client() {
     return {
-      decycle_depth: this.get('client_decycle_depth')
+      decycle_depth: this.get('client_decycle_depth'),
     };
   }
 
@@ -122,7 +139,8 @@ class Config {
   }
 
   readConfigFile(configFile, callback) {
-    if (!configFile) { // allow empty configFile for programmatic setups
+    if (!configFile) {
+      // allow empty configFile for programmatic setups
       if (callback) {
         callback.call(this);
       }
@@ -143,7 +161,7 @@ class Config {
   readJS(configFile, callback) {
     let exportedConfig = require(this.resolveConfigPath(configFile));
     if (typeof exportedConfig === 'function') {
-      Promise.resolve(exportedConfig()).then(obj => {
+      Promise.resolve(exportedConfig()).then((obj) => {
         this.fileOptions = obj;
         if (callback) {
           callback.call(this);
@@ -158,28 +176,36 @@ class Config {
   }
 
   readYAML(configFile, callback) {
-    fs.readFile(configFile, (err, data) => {
-      if (!err) {
-        let cfg = yaml.load(String(data));
-        this.fileOptions = cfg;
-      }
-      if (callback) {
-        callback.call(this);
-      }
-    });
+    return fs.promises
+      .readFile(configFile)
+      .then(
+        (data) => {
+          this.fileOptions = yaml.load(String(data));
+        },
+        () => {},
+      )
+      .then(() => {
+        if (callback) {
+          callback.call(this);
+        }
+      });
   }
 
   readJSON(configFile, callback) {
-    fs.readFile(configFile, (err, data) => {
-      if (!err) {
-        let cfg = JSON.parse(data.toString());
-        this.fileOptions = cfg;
-        this.progOptions.file = configFile;
-      }
-      if (callback) {
-        callback.call(this);
-      }
-    });
+    return fs.promises
+      .readFile(configFile)
+      .then(
+        (data) => {
+          this.fileOptions = JSON.parse(data.toString());
+          this.progOptions.file = configFile;
+        },
+        () => {},
+      )
+      .then(() => {
+        if (callback) {
+          callback.call(this);
+        }
+      });
   }
 
   mergeUrlAndQueryParams(urlString, queryParamsObj) {
@@ -196,11 +222,12 @@ class Config {
 
     let urlObj = url.parse(urlString);
     let outputQueryParams = querystring.parse(urlObj.query) || {};
-    Object.keys(queryParamsObj).forEach(param => {
+    Object.keys(queryParamsObj).forEach((param) => {
       outputQueryParams[param] = queryParamsObj[param];
     });
     urlObj.query = outputQueryParams;
-    urlObj.search = querystring.stringify(outputQueryParams)
+    urlObj.search = querystring
+      .stringify(outputQueryParams)
       .replace(/=&/g, '&')
       .replace(/=$/, '');
     urlObj.path = urlObj.pathname + urlObj.search;
@@ -215,20 +242,32 @@ class Config {
       testPage = [testPage];
     }
 
-    return testPage.map(page => this.mergeUrlAndQueryParams(page, queryParams));
+    return testPage.map((page) =>
+      this.mergeUrlAndQueryParams(page, queryParams),
+    );
   }
 
   getConfigProperty(key) {
     if (this.config && key in this.config) {
       return this.config[key];
     }
-    if (key in this.progOptions && typeof this.progOptions[key] !== 'undefined') {
+    if (
+      key in this.progOptions &&
+      typeof this.progOptions[key] !== 'undefined'
+    ) {
       return this.progOptions[key];
     }
-    if (key in this.fileOptions && typeof this.fileOptions[key] !== 'undefined') {
+    if (
+      key in this.fileOptions &&
+      typeof this.fileOptions[key] !== 'undefined'
+    ) {
       return this.fileOptions[key];
     }
-    if (this.defaultOptions && key in this.defaultOptions && typeof this.defaultOptions[key] !== 'undefined') {
+    if (
+      this.defaultOptions &&
+      key in this.defaultOptions &&
+      typeof this.defaultOptions[key] !== 'undefined'
+    ) {
       return this.defaultOptions[key];
     }
     if (key in this.defaults) {
@@ -264,27 +303,35 @@ class Config {
 
   getAvailableLaunchers(cb) {
     let browsers = knownBrowsers(process.platform, this);
-    browser_launcher.getAvailableBrowsers(this, browsers, (err, availableBrowsers) => {
-      if (err) {
-        return cb(err);
-      }
+    browser_launcher.getAvailableBrowsers(
+      this,
+      browsers,
+      (err, availableBrowsers) => {
+        if (err) {
+          return cb(err);
+        }
 
-      let availableLaunchers = {};
-      availableBrowsers.forEach(browser => {
-        let newLauncher = new LauncherFactory(browser.name, browser, this);
-        availableLaunchers[browser.name.toLowerCase()] = newLauncher;
-      });
+        let availableLaunchers = {};
+        availableBrowsers.forEach((browser) => {
+          let newLauncher = new LauncherFactory(browser.name, browser, this);
+          availableLaunchers[browser.name.toLowerCase()] = newLauncher;
+        });
 
-      // add custom launchers
-      let customLaunchers = this.get('launchers');
-      if (customLaunchers) {
-        for (let name in customLaunchers) {
-          let newLauncher = new LauncherFactory(name, customLaunchers[name], this);
-          availableLaunchers[name.toLowerCase()] = newLauncher;
+        // add custom launchers
+        let customLaunchers = this.get('launchers');
+        if (customLaunchers) {
+          for (let name in customLaunchers) {
+            let newLauncher = new LauncherFactory(
+              name,
+              customLaunchers[name],
+              this,
+            );
+            availableLaunchers[name.toLowerCase()] = newLauncher;
+          }
         }
-      }
-      cb(null, availableLaunchers);
-    });
+        cb(null, availableLaunchers);
+      },
+    );
   }
 
   getLaunchers(cb) {
@@ -310,7 +357,7 @@ class Config {
     let skip = this.get('skip');
     if (skip) {
       skip = skip.toLowerCase().split(',');
-      launchers = launchers.filter(name => skip.indexOf(name) === -1);
+      launchers = launchers.filter((name) => skip.indexOf(name) === -1);
     }
     return launchers;
   }
@@ -320,7 +367,7 @@ class Config {
     let wanted = this.getWantedLauncherNames(available);
     let err = null;
 
-    wanted.forEach(name => {
+    wanted.forEach((name) => {
       let launcher = available[name.toLowerCase()];
       if (!launcher) {
         if (this.appMode === 'dev' || this.get('ignore_missing_launchers')) {
@@ -328,10 +375,12 @@ class Config {
         } else {
           err = new Error(
             'Launcher ' +
-            name +
-            ' not found. Not installed? Available: ' +
-            Object.keys(available).map(elm => `"${elm}"`).join(', ') +
-            '.'
+              name +
+              ' not found. Not installed? Available: ' +
+              Object.keys(available)
+                .map((elm) => `"${elm}"`)
+                .join(', ') +
+              '.',
           );
         }
       } else {
@@ -343,38 +392,62 @@ class Config {
 
   printLauncherInfo() {
     this.getAvailableLaunchers((err, launchers) => {
-      let launch_in_dev = (this.get('launch_in_dev') || [])
-        .map(s => s.toLowerCase());
+      let launch_in_dev = (this.get('launch_in_dev') || []).map((s) =>
+        s.toLowerCase(),
+      );
       let launch_in_ci = this.get('launch_in_ci');
       if (launch_in_ci) {
-        launch_in_ci = launch_in_ci.map(s => s.toLowerCase());
+        launch_in_ci = launch_in_ci.map((s) => s.toLowerCase());
       }
-      launchers = Object.keys(launchers).map(k => launchers[k]);
+      launchers = Object.keys(launchers).map((k) => launchers[k]);
 
-      const launcherColumnWidth = launchers.reduce((acc, current) => acc > current.name.length ? acc : current.name.length, 0);
+      const launcherColumnWidth = launchers.reduce(
+        (acc, current) =>
+          acc > current.name.length ? acc : current.name.length,
+        0,
+      );
       const launcherTitle = 'Launcher'.padEnd(launcherColumnWidth, ' ');
       const launcherTitleDivider = ''.padEnd(launcherColumnWidth, '-');
 
-      console.log('Have ' + launchers.length + ' launchers available; auto-launch info displayed on the right.');
+      console.log(
+        'Have ' +
+          launchers.length +
+          ' launchers available; auto-launch info displayed on the right.',
+      );
       console.log(); // newline
       console.log(`${launcherTitle}  Type          CI  Dev`);
       console.log(`${launcherTitleDivider}  ------------  --  ---`);
-      console.log(launchers.map(launcher => {
-        let protocol = launcher.settings.protocol;
-        let kind = protocol === 'browser' ?
-          'browser' : (
-            protocol === 'tap' ?
-              'process(TAP)' : 'process');
-        let dev = launch_in_dev.indexOf(launcher.name.toLowerCase()) !== -1 ?
-          Chars.mark :
-          ' ';
-        let ci = !launch_in_ci || launch_in_ci.indexOf(launcher.name.toLowerCase()) !== -1 ?
-          Chars.mark :
-          ' ';
-        return (pad(launcher.name, launcherColumnWidth + 2, ' ', 1) +
-          pad(kind, 12, ' ', 1) +
-          '  ' + ci + '    ' + dev + '      ');
-      }).join('\n'));
+      console.log(
+        launchers
+          .map((launcher) => {
+            let protocol = launcher.settings.protocol;
+            let kind =
+              protocol === 'browser'
+                ? 'browser'
+                : protocol === 'tap'
+                  ? 'process(TAP)'
+                  : 'process';
+            let dev =
+              launch_in_dev.indexOf(launcher.name.toLowerCase()) !== -1
+                ? Chars.mark
+                : ' ';
+            let ci =
+              !launch_in_ci ||
+              launch_in_ci.indexOf(launcher.name.toLowerCase()) !== -1
+                ? Chars.mark
+                : ' ';
+            return (
+              pad(launcher.name, launcherColumnWidth + 2, ' ', 1) +
+              pad(kind, 12, ' ', 1) +
+              '  ' +
+              ci +
+              '    ' +
+              dev +
+              '      '
+            );
+          })
+          .join('\n'),
+      );
     });
   }
 
@@ -389,7 +462,7 @@ class Config {
     // Filter glob < 6 negation patterns to still support them
     // See https://github.com/isaacs/node-glob/tree/3f883c43#comments-and-negation
     let positiveWants = [];
-    want.forEach(patternEntry => {
+    want.forEach((patternEntry) => {
       let pattern = isa(patternEntry, String) ? patternEntry : patternEntry.src;
       if (pattern.indexOf('!') === 0) {
         return dontWant.push(pattern.substring(1));
@@ -398,47 +471,71 @@ class Config {
       positiveWants.push(patternEntry);
     });
 
-    dontWant = dontWant.map(p => p ? this.resolvePath(p) : p);
-    Bluebird.reduce(positiveWants, (allThatIWant, patternEntry) => {
-      let pattern = isa(patternEntry, String) ? patternEntry : patternEntry.src;
-      let attrs = patternEntry.attrs || [];
-      let patternUrl = url.parse(pattern);
-
-      if (patternUrl.protocol === 'file:') {
-        pattern = patternUrl.hostname + patternUrl.path;
-      } else if (patternUrl.protocol) {
-        return allThatIWant.concat({ src: pattern, attrs: attrs });
-      }
+    dontWant = dontWant.map((p) => (p ? this.resolvePath(p) : p));
+    return reduce(
+      positiveWants,
+      (allThatIWant, patternEntry) => {
+        let pattern = isa(patternEntry, String)
+          ? patternEntry
+          : patternEntry.src;
+        let attrs = patternEntry.attrs || [];
+        let patternUrl = url.parse(pattern);
+
+        if (patternUrl.protocol === 'file:') {
+          pattern = patternUrl.hostname + patternUrl.path;
+        } else if (patternUrl.protocol) {
+          return allThatIWant.concat({ src: pattern, 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);
+        return expandGlobPattern(
+          convertToPosix(this.resolvePath(pattern)),
+          dontWant.map(convertToPosix),
+        ).then((files) =>
+          allThatIWant.concat(
+            files.map((f) => {
+              f = this.reverseResolvePath(f);
+              return { src: f, attrs: attrs };
+            }),
+          ),
+        );
+      },
+      [],
+    )
+      .then((result) => _.uniqBy(result, 'src'))
+      .then(
+        (result) => {
+          if (callback) {
+            callback(null, result);
+          }
+          return result;
+        },
+        (err) => {
+          if (callback) {
+            callback(err);
+          }
+          throw err;
+        },
+      );
   }
 
   getSrcFiles(callback) {
     let srcFiles = this.get('src_files') || '*.js';
     let srcFilesIgnore = this.get('src_files_ignore') || '';
-    this.getFileSet(srcFiles, srcFilesIgnore, callback);
+    return this.getFileSet(srcFiles, srcFilesIgnore, callback);
   }
 
   getFooterScripts(callback) {
     var want = this.get('footer_scripts') || [];
     var dontWant = this.get('src_files_ignore') || '';
 
-    this.getFileSet(want, dontWant, callback);
+    return this.getFileSet(want, dontWant, callback);
   }
 
-
   getServeFiles(callback) {
     let want = this.get('serve_files') || this.get('src_files') || '*.js';
-    let dontWant = this.get('serve_files_ignore') || this.get('src_files_ignore') || '';
-    this.getFileSet(want, dontWant, callback);
+    let dontWant =
+      this.get('serve_files_ignore') || this.get('src_files_ignore') || '';
+    return this.getFileSet(want, dontWant, callback);
   }
 
   getUserDataDir() {
@@ -455,7 +552,7 @@ class Config {
 
   getCSSFiles(callback) {
     let want = this.get('css_files') || '';
-    this.getFileSet(want, '', callback);
+    return this.getFileSet(want, '', callback);
   }
 
   getAllOptions() {
@@ -465,17 +562,23 @@ class Config {
         return;
       }
       if (o.options) {
-        o.options.forEach(o => {
+        o.options.forEach((o) => {
           options.push(o.name());
         });
       }
       getOptions(o.parent);
     }
-    getOptions(this.progOptions);
+    const progOpts = this.progOptions;
+    // In subcommand modes, progOptions is a plain object from optsWithGlobals() with
+    // a _commander reference pointing to the Command instance for option enumeration.
+    // In dev mode (no subcommand), progOptions is the Commander program object directly.
+    getOptions(
+      progOpts && progOpts._commander ? progOpts._commander : progOpts,
+    );
     return options;
   }
 
-  getTemplateData(cb) {
+  async getTemplateData(cb) {
     let ret = {};
     let options = this.getAllOptions();
     let key;
@@ -490,24 +593,31 @@ class Config {
     for (key in this.config) {
       ret[key] = this.config[key];
     }
-    this.getServeFiles((err, files) => {
-      let replaceSlashes = f => ({
-        src: f.src.replace(/\\/g, '/'),
-        attrs: f.attrs
-      });
 
-      ret.serve_files = files.map(replaceSlashes);
-
-      this.getCSSFiles((err, files) => {
-        ret.css_files = files.map(replaceSlashes);
-        this.getFooterScripts((err, files) => {
-          ret.footer_scripts = files;
-          if (cb) {
-            cb(err, ret);
-          }
-        });
-      });
+    const replaceSlashes = (f) => ({
+      src: f.src.replace(/\\/g, '/'),
+      attrs: f.attrs,
     });
+
+    try {
+      const [serveFiles, cssFiles, footerScripts] = await Promise.all([
+        this.getServeFiles(),
+        this.getCSSFiles(),
+        this.getFooterScripts(),
+      ]);
+
+      ret.serve_files = serveFiles.map(replaceSlashes);
+      ret.css_files = cssFiles.map(replaceSlashes);
+      ret.footer_scripts = footerScripts;
+
+      if (cb) {
+        cb(null, ret);
+      }
+    } catch (err) {
+      if (cb) {
+        cb(err, ret);
+      }
+    }
   }
 }
 
@@ -530,10 +640,13 @@ Config.prototype.defaults = {
   client_decycle_depth: 5,
   socket_heartbeat_timeout() {
     let browserDisconnectTimeout = this.get('browser_disconnect_timeout');
-    let defaultBrowserDisconnectTimeout = this.defaults.browser_disconnect_timeout;
+    let defaultBrowserDisconnectTimeout =
+      this.defaults.browser_disconnect_timeout;
 
-    return (browserDisconnectTimeout !== defaultBrowserDisconnectTimeout) ? browserDisconnectTimeout : 5;
-  }
+    return browserDisconnectTimeout !== defaultBrowserDisconnectTimeout
+      ? browserDisconnectTimeout
+      : 5;
+  },
 };
 
 module.exports = Config;