testem 3.15.0 → 3.15.2

package/lib/app.js

@@ -5,7 +5,7 @@ const Bluebird = require('bluebird');
 const Path = require('path');
 const log = require('npmlog');
 const StyledString = require('styled_string');
-const find = require('lodash.find');
+const _ = require('lodash');
 
 const Server = require('./server');
 const BrowserTestRunner = require('./runners/browser_test_runner');
@@ -251,7 +251,7 @@ module.exports = class App extends EventEmitter {
   }
 
   onBrowserLogin(browserName, id, socket) {
-    let browser = find(this.runners, runner => {
+    let browser = _.find(this.runners, runner => {
       return runner.launcherId === id && (!runner.socket || !runner.socket.connected);
     });
 
@@ -270,7 +270,7 @@ module.exports = class App extends EventEmitter {
   }
 
   onBrowserRelogin(browserName, id, socket) {
-    let browser = find(this.runners, runner => {
+    let browser = _.find(this.runners, runner => {
       // a browser relogin can happen if a client socket was disconnected, which may not be reflected in runner.socket's connected state
       // or if the socket was nulled by 'onDisconnect'
       return runner.launcherId === id && (runner.socket || runner.socket === null);

package/lib/config.js

@@ -25,7 +25,7 @@ const Chars = require('./utils/chars');
 const pad = require('./utils/strutils').pad;
 const isa = require('./utils/isa');
 const fileExists = require('./utils/fileutils').fileExists;
-const uniqBy = require('lodash.uniqby');
+const _ = require('lodash');
 
 const knownBrowsers = require('./utils/known-browsers');
 const globAsync = Bluebird.promisify(glob);
@@ -325,7 +325,13 @@ class Config {
         if (this.appMode === 'dev' || this.get('ignore_missing_launchers')) {
           log.warn('Launcher "' + name + '" is not recognized.');
         } else {
-          err = new Error('Launcher ' + name + ' not found. Not installed?');
+          err = new Error(
+            'Launcher ' +
+            name +
+            ' not found. Not installed? Available: ' +
+            Object.keys(available).map(elm => `"${elm}"`).join(', ') +
+            '.'
+          );
         }
       } else {
         launchers.push(launcher);
@@ -408,7 +414,7 @@ class Config {
         return {src: f, attrs: attrs};
       })));
     }, [])
-      .then(result => uniqBy(result, 'src'))
+      .then(result => _.uniqBy(result, 'src'))
       .asCallback(callback);
   }
 

package/lib/launcher-factory.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const Launcher = require('./launcher');
-const extend = require('lodash.assignin');
+const _ = require('lodash');
 
 function getUniqueId() {
   return process.hrtime().join('');
@@ -16,7 +16,7 @@ module.exports = class LauncherFactory {
 
   create(options) {
     const id = getUniqueId();
-    const settings = extend({ id }, this.settings, options);
+    const settings = _.assignIn({ id }, this.settings, options);
     return new Launcher(this.name, settings, this.config);
   }
 };

package/lib/process-ctl.js

@@ -6,7 +6,7 @@ const Bluebird = require('bluebird');
 const util = require('util');
 const EventEmitter = require('events').EventEmitter;
 const spawnargs = require('spawn-args');
-const extend = require('lodash.assignin');
+const _ = require('lodash');
 
 const envWithLocalPath = require('./utils/env-with-local-path');
 const fileutils = require('./utils/fileutils');
@@ -32,7 +32,7 @@ module.exports = class ProcessCtl extends EventEmitter {
       env: envWithLocalPath(this.config)
     };
 
-    return extend({}, defaults, options);
+    return _.assignIn({}, defaults, options);
   }
 
   _spawn(exe, args, options) {

package/lib/server/index.js

@@ -136,10 +136,10 @@ class Server extends EventEmitter {
 
     this.injectMiddleware(app);
 
-    this.configureProxy(app);
-
     app.use('/testem', express.static(`${__dirname}/../../public/testem`));
 
+    this.configureProxy(app);
+
     app.get('/', (req, res) => {
       res.redirect(`/${String(Math.floor(Math.random() * 10000))}`);
     });

package/lib/utils/add-to-PATH.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const cloneDeep = require('lodash.clonedeep');
+const _ = require('lodash');
 const isWin = require('./is-win')();
 let PATH = 'PATH';
 let delimiter = ':';
@@ -17,7 +17,7 @@ if (isWin) {
 }
 
 module.exports = function addToPATH(path) {
-  let env = cloneDeep(process.env);
+  let env = _.cloneDeep(process.env);
   env[PATH] = [path, env[PATH]].join(delimiter);
 
   return env;

package/lib/utils/browser-args.js

@@ -2,7 +2,7 @@
 
 const capitalize = require('./capitalize');
 const log = require('npmlog');
-const castArray = require('lodash.castarray');
+const _ = require('lodash');
 
 function Validation() {
   this.knownBrowser = null;
@@ -22,7 +22,7 @@ function hasOldBrowserArgsFormat(args) {
 // Lodash's castArray function will turn `undefined` into `[undefined]`, but we want an empty array in that case.
 function safeCastArray(value) {
   if (value) {
-    return castArray(value);
+    return _.castArray(value);
   } else {
     return [];
   }

package/package.json

@@ -7,7 +7,7 @@
     "unittest",
     "browser"
   ],
-  "version": "3.15.0",
+  "version": "3.15.2",
   "author": "Toby Ho <airportyh@gmail.com>",
   "repository": {
     "type": "git",
@@ -34,11 +34,7 @@
     "glob": "^7.0.4",
     "http-proxy": "^1.13.1",
     "js-yaml": "^3.2.5",
-    "lodash.assignin": "^4.1.0",
-    "lodash.castarray": "^4.4.0",
-    "lodash.clonedeep": "^4.4.1",
-    "lodash.find": "^4.5.1",
-    "lodash.uniqby": "^4.7.0",
+    "lodash": "^4.17.21",
     "mkdirp": "^3.0.1",
     "mustache": "^4.2.0",
     "node-notifier": "^10.0.0",
@@ -74,7 +70,7 @@
     "chai": "^4.0.2",
     "chai-files": "^1.2.0",
     "chai-shallow-deep-equal": "^1.4.4",
-    "cheerio": "^1.0.0-rc.2",
+    "cheerio": "1.0.0-rc.12",
     "dirty-chai": "^2.0.0",
     "eslint": "^8.12.0",
     "eslint-plugin-chai-expect": "^3.0.0",
@@ -83,7 +79,7 @@
     "request": "^2.51.0",
     "saucie": "^3.3.3",
     "shelljs": "^0.8.2",
-    "sinon": "^15.0.0",
+    "sinon": "10.0.0",
     "sinon-chai": "^3.2.0",
     "socket.io-client": "^4.1.2",
     "tape": "^5.2.2"
@@ -91,6 +87,5 @@
   "bin": {
     "testem": "./testem.js"
   },
-  "main": "./lib/api.js",
-  "optionalDependencies": {}
+  "main": "./lib/api.js"
 }