testem 2.10.0 → 2.14.0

package/lib/app.js

@@ -259,7 +259,9 @@ module.exports = class App extends EventEmitter {
         id: id,
         protocol: 'browser'
       }, this.config).create();
-      browser = new BrowserTestRunner(launcher, this.reporter, this.runnerIndex++, this.config);
+      const singleRun = this.config.get('single_run');
+
+      browser = new BrowserTestRunner(launcher, this.reporter, this.runnerIndex++, singleRun, this.config);
       this.addRunner(browser);
     }
 

package/lib/launcher.js

@@ -1,16 +1,15 @@
 'use strict';
 
 const log = require('npmlog');
-const rimraf = require('rimraf');
-const mkdirp = require('mkdirp');
+const tmp = require('tmp');
 const path = require('path');
 const Bluebird = require('bluebird');
 
 const template = require('./strutils').template;
 const ProcessCtl = require('./process-ctl');
 
-const rimrafAsync = Bluebird.promisify(rimraf);
-const mkdirpAsync = Bluebird.promisify(mkdirp);
+// setup graceful cleanup: removes the created directories when an uncaught exception occurs.
+tmp.setGracefulCleanup();
 
 module.exports = class Launcher {
   constructor(name, settings, config) {
@@ -52,10 +51,10 @@ module.exports = class Launcher {
   }
 
   launch() {
-    let settings = this.settings;
-    let dir = this.browserTmpDir(this.config, this.id);
+    const settings = this.settings;
+    this.setupBrowserTmpDir();
 
-    return rimrafAsync(dir).then(() => mkdirpAsync(dir)).then(() => {
+    return Bluebird.resolve().asCallback(() => {
       if (settings.setup) {
         return Bluebird.fromCallback(setupCallback => {
           settings.setup.call(this, this.config, setupCallback);
@@ -129,9 +128,21 @@ module.exports = class Launcher {
     }
   }
 
+  setupBrowserTmpDir() {
+    const userDataDir = this.config.getUserDataDir();
+    const tmpPath = path.join(userDataDir, 'testem-' + this.id);
+
+    this.browserTmpDirectory = tmp.dirSync({
+      template: `${tmpPath}-XXXXXX`,
+      unsafeCleanup: true
+    });
+  }
+
   browserTmpDir() {
-    let userDataDir = this.config.getUserDataDir();
+    if (!this.browserTmpDirectory) {
+      setupBrowserTmpDir();
+    }
 
-    return path.join(userDataDir, 'testem-' + this.id);
+    return this.browserTmpDirectory.name;
   }
 };

package/lib/runners/browser_test_runner.js

@@ -128,6 +128,14 @@ module.exports = class BrowserTestRunner {
     socket.on('all-test-results', this.onAllTestResults.bind(this));
     socket.on('after-tests-complete', this.onAfterTests.bind(this));
 
+    const customBrowserSocketEvents = this.launcher.config.get('custom_browser_socket_events');
+
+    if (customBrowserSocketEvents) {
+      Object.keys(customBrowserSocketEvents).forEach((key) => {
+        socket.on(key, customBrowserSocketEvents[key].bind(this));
+      });
+    }
+
     let tap = new BrowserTapConsumer(socket);
     tap.on('test-result', this.onTestResult.bind(this));
     tap.on('all-test-results', this.onAllTestResults.bind(this));
@@ -169,7 +177,8 @@ module.exports = class BrowserTestRunner {
       launcherId: this.launcherId,
       failed: result.failed,
       pending: result.pending,
-      items: result.items
+      items: result.items,
+      originalResultObj: result
     });
     this.logs = [];
     this.currentTestContext.state = 'complete';
@@ -252,8 +261,8 @@ module.exports = class BrowserTestRunner {
     if (this.finished) { return; }
 
     this.onProcessExitTimer = setTimeout(() => {
-      if (this.finished) { 
-        return; 
+      if (this.finished) {
+        return;
       }
 
       this.reportResults(new Error(this.exitRequested

package/lib/server/index.js

@@ -145,6 +145,7 @@ class Server extends EventEmitter {
   configureExpress(app) {
     app.engine('mustache', Mustache);
     app.set('view options', {layout: false});
+    app.set('etag', 'strong');
     app.use((req, res, next) => {
       if (this.ieCompatMode) {
         res.setHeader('X-UA-Compatible', `IE=${this.ieCompatMode}`);
@@ -234,9 +235,6 @@ class Server extends EventEmitter {
   }
 
   renderDefaultTestPage(req, res) {
-    res.header('Cache-Control', 'No-cache');
-    res.header('Pragma', 'No-cache');
-
     var config = this.config;
     var test_page = config.get('test_page')[0];
 
@@ -299,13 +297,6 @@ class Server extends EventEmitter {
     });
   }
 
-  killTheCache(req, res) {
-    res.setHeader('Cache-Control', 'No-cache');
-    res.setHeader('Pragma', 'No-cache');
-    delete req.headers['if-modified-since'];
-    delete req.headers['if-none-match'];
-  }
-
   route(uri) {
     var config = this.config;
     var routes = config.get('routes') || config.get('route') || {};
@@ -338,7 +329,6 @@ class Server extends EventEmitter {
     var routeRes = this.route(uri);
     uri = routeRes.uri;
     var wasRouted = routeRes.routed;
-    this.killTheCache(req, res);
     var allowUnsafeDirs = config.get('unsafe_file_serving');
     var filePath = path.resolve(config.resolvePath(uri));
     var ext = path.extname(filePath);

package/lib/utils/known-browsers.js

@@ -34,6 +34,16 @@ function chromeArgs(browserTmpDir, url) {
   ];
 }
 
+function headlessChromeArgs(browserTmpDir, url) {
+  return [
+    '--headless',
+    '--disable-gpu',
+    '--disable-software-rasterizer',
+    '--mute-audio',
+    '--remote-debugging-port=0',
+    '--window-size=1440,900'].concat(chromeArgs(browserTmpDir, url));
+}
+
 // Return the catalogue of the browsers that Testem supports for the platform. Each 'browser object'
 // will contain these fields:
 //
@@ -96,6 +106,18 @@ module.exports = function knownBrowsers(platform, config) {
         return chromeArgs(this.browserTmpDir(), url);
       }
     },
+    {
+      name: 'Headless Chrome',
+      possiblePath: chromeWinPaths(userHomeDir, 'Chrome').concat(chromeOSXPaths('Google Chrome')),
+      possibleExe: [
+        'google-chrome',
+        'google-chrome-stable',
+        'chrome'
+      ],
+      args(config, url) {
+        return headlessChromeArgs(this.browserTmpDir(), url);
+      }
+    },
 
     // On Windows, Chrome Stable/Beta/Dev are installed on the same path
     {
@@ -108,6 +130,16 @@ module.exports = function knownBrowsers(platform, config) {
         return chromeArgs(this.browserTmpDir(), url);
       }
     },
+    {
+      name: 'Headless Chrome Beta',
+      possiblePath: chromeOSXPaths('Google Chrome Beta'),
+      possibleExe: [
+        'google-chrome-beta'
+      ],
+      args(config, url) {
+        return headlessChromeArgs(this.browserTmpDir(), url);
+      }
+    },
     {
       name: 'Chrome Dev',
       possiblePath: chromeOSXPaths('Google Chrome Dev'),

package/package.json

@@ -7,7 +7,7 @@
     "unittest",
     "browser"
   ],
-  "version": "2.10.0",
+  "version": "2.14.0",
   "author": "Toby Ho <airportyh@gmail.com>",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "charm": "^1.0.0",
     "commander": "^2.6.0",
     "consolidate": "^0.15.1",
-    "execa": "^0.10.0",
+    "execa": "^1.0.0",
     "express": "^4.10.7",
     "fireworm": "^0.7.0",
     "glob": "^7.0.4",
@@ -38,15 +38,16 @@
     "lodash.find": "^4.5.1",
     "lodash.uniqby": "^4.7.0",
     "mkdirp": "^0.5.1",
-    "mustache": "^2.2.1",
+    "mustache": "^3.0.0",
     "node-notifier": "^5.0.1",
     "npmlog": "^4.0.0",
-    "printf": "^0.3.0",
+    "printf": "^0.5.1",
     "rimraf": "^2.4.4",
     "socket.io": "^2.1.0",
     "spawn-args": "^0.2.0",
     "styled_string": "0.0.1",
     "tap-parser": "^7.0.0",
+    "tmp": "0.0.33",
     "xmldom": "^0.1.19"
   },
   "files": [
@@ -84,8 +85,7 @@
     "shelljs": "^0.8.2",
     "sinon": "^6.0.0",
     "sinon-chai": "^3.2.0",
-    "tape": "^4.9.1",
-    "tmp": "0.0.33"
+    "tape": "^4.9.1"
   },
   "bin": {
     "testem": "./testem.js"

package/public/testem/qunit_adapter.js

@@ -93,6 +93,7 @@ function qunitAdapter() {
     currentTest.skipped = params.skipped;
     currentTest.total = params.total;
     currentTest.runDuration = params.runtime;
+    currentTest.testId = params.testId;
 
     results.total++;
 

package/public/testem/testem_client.js

@@ -175,6 +175,7 @@ var Testem = {
         handler.apply(this, argsWithoutFirst);
       }
     }
+
     this.emitMessage.apply(this, arguments);
   },
   on: function(evt, callback) {
@@ -266,6 +267,11 @@ var Testem = {
         case 'stop-run':
           self.emit('after-tests-complete');
           break;
+        default:
+          if (type.indexOf('testem:') === 0) {
+            self.emit(type, message.data);
+          }
+          break;
       }
     });
   },
@@ -286,6 +292,21 @@ var Testem = {
     // stringify for clients that only can handle string postMessages (IE <= 10)
     return JSON.stringify(message);
   },
+  removeEventCallbacks: function(evt, callback) {
+    var handlers = this.evtHandlers[evt];
+    var removeIdx = [];
+    if (typeof handlers === "undefined") {
+      return;
+    }
+    for (var i = 0; i < handlers.length; i++) {
+      if (handlers[i] === callback) {
+        removeIdx.push(i);
+      }
+    }
+    for (var j = 0; j < removeIdx.length; j++) {
+      handlers.splice(j, 1);
+    }
+  },
   runAfterTests: function() {
     if (Testem.afterTestsQueue.length) {
       var afterTestsCallback = Testem.afterTestsQueue.shift();

package/public/testem/testem_connection.js

@@ -1,4 +1,5 @@
-/* globals document, parent, window, io, navigator */
+/* globals document, parent, io, window, navigator */
+/* globals module */
 'use strict';
 
 var socket;
@@ -37,11 +38,13 @@ function sendMessageToParent(type, data) {
   parent.postMessage(message, '*');
 }
 
-var addListener = window.addEventListener ?
-  function(obj, evt, cb) { obj.addEventListener(evt, cb, false); } :
-  function(obj, evt, cb) { obj.attachEvent('on' + evt, cb); };
-
-addListener(window, 'message', handleMessage);
+var addListener;
+if (typeof window !== 'undefined') {
+  addListener = window.addEventListener ?
+    function(obj, evt, cb) { obj.addEventListener(evt, cb, false); } :
+    function(obj, evt, cb) { obj.attachEvent('on' + evt, cb); };
+    addListener(window, 'message', handleMessage);
+}
 
 var messageListeners = {};
 function handleMessage(event) {
@@ -158,8 +161,21 @@ function init() {
   });
 }
 
+function patchEmitterForWildcard(socket) {
+  var emit = io.Manager.prototype.emit;
+
+  function onevent (packet) {
+    var args = packet.data || [];
+    emit.call(this, '*', packet);
+    return emit.apply(this, args);
+  }
+  socket.onevent = onevent;
+}
+
 function initSocket(id) {
   socket = io.connect({ reconnectionDelayMax: 1000, randomizationFactor: 0 });
+  patchEmitterForWildcard(socket);
+
   socket.emit('browser-login', getBrowserName(navigator.userAgent), id);
   socket.on('connect', function() {
     connectStatus = 'connected';
@@ -176,6 +192,21 @@ function initSocket(id) {
   socket.on('stop-run', function() {
     sendMessageToParent('stop-run');
   });
+  socket.on('*', function(event) {
+    if (event.data && event.data[0].indexOf('testem:') === 0 ) {
+      var eventName = event.data[0];
+      var eventData = event.data[1];
+      sendMessageToParent(eventName, eventData);
+    }
+  });
+}
+
+// We should only call init() if it ran in browser.
+if (typeof window !== 'undefined') {
+  init();
 }
 
-init();
+// Exporting this as a module so that it can be unit tested in Node.
+if (typeof module !== 'undefined') {
+  module.exports = patchEmitterForWildcard;
+}