testem 2.13.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/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));

package/package.json

@@ -7,7 +7,7 @@
     "unittest",
     "browser"
   ],
-  "version": "2.13.0",
+  "version": "2.14.0",
   "author": "Toby Ho <airportyh@gmail.com>",
   "repository": {
     "type": "git",

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;
+}