testem 3.10.1 → 3.12.0

package/lib/reporters/xunit_reporter.js

@@ -3,7 +3,7 @@
 var XmlDom = require('@xmldom/xmldom');
 var indent = require('../utils/strutils').indent;
 
-class XUnitReporter {
+module.exports = class XUnitReporter {
   constructor(silent, out, config) {
     this.out = out || process.stdout;
     this.excludeStackTraces = config.get('xunit_exclude_stack');
@@ -13,6 +13,7 @@ class XUnitReporter {
     this.total = 0;
     this.pass = 0;
     this.skipped = 0;
+    this.todo = 0;
     this.results = [];
     this.startTime = new Date();
     this.endTime = null;
@@ -23,12 +24,15 @@ class XUnitReporter {
       launcher: prefix,
       result: data
     });
-    this.display(prefix, data);
+    this.display();
     this.total++;
+
     if (data.skipped) {
       this.skipped++;
-    } else if (data.passed) {
+    } else if (data.passed && !data.todo) {
       this.pass++;
+    } else if (!data.passed && data.todo) {
+      this.todo++;
     }
   }
 
@@ -46,11 +50,12 @@ class XUnitReporter {
 
     var rootNode = doc.documentElement;
     rootNode.setAttribute('name', 'Testem Tests');
-    rootNode.setAttribute('tests', this.total);
-    rootNode.setAttribute('skipped', this.skipped);
-    rootNode.setAttribute('failures', this.failures());
-    rootNode.setAttribute('timestamp', new Date());
-    rootNode.setAttribute('time', this.duration());
+    rootNode.setAttribute('tests', `${this.total}`);
+    rootNode.setAttribute('skipped', `${this.skipped}`);
+    rootNode.setAttribute('todo', `${this.todo}`);
+    rootNode.setAttribute('failures', `${this.failures()}`);
+    rootNode.setAttribute('timestamp', new Date().toString());
+    rootNode.setAttribute('time', `${this.duration() }`);
 
     for (var i = 0, len = this.results.length; i < len; i++) {
       var testcaseNode = this.getTestResultNode(doc, this.results[i]);
@@ -107,6 +112,9 @@ class XUnitReporter {
     } else if (result.skipped) {
       var skippedNode = document.createElement('skipped');
       resultNode.appendChild(skippedNode);
+    } else if (result.todo) {
+      var todoNode = document.createElement('todo');
+      resultNode.appendChild(todoNode);
     } else if (!result.passed) {
       var failureNode = document.createElement('failure');
       resultNode.appendChild(failureNode);
@@ -116,11 +124,14 @@ class XUnitReporter {
   }
 
   failures() {
-    return this.total - this.pass - this.skipped;
+    return this.total - this.pass - this.skipped - this.todo;
   }
 
   duration() {
-    return this._durationFromMs(this.endTime - this.startTime);
+    const endTime = this.endTime ? this.endTime.getTime() : 0;
+    const startTime = this.startTime.getTime();
+
+    return this._durationFromMs(endTime - startTime);
   }
 
   _durationFromMs(ms) {
@@ -132,6 +143,4 @@ class XUnitReporter {
       return 0;
     }
   }
-}
-
-module.exports = XUnitReporter;
+};

package/lib/server/index.js

@@ -217,10 +217,19 @@ class Server extends EventEmitter {
       this.proxy = new httpProxy.createProxyServer({changeOrigin: true});
 
       this.proxy.on('error', (err, req, res) => {
-        res.status(500).json(err);
+        res && res.status && res.status(500).json(err);
       });
 
-      Object.keys(proxies).forEach(url => {
+      Object.keys(proxies).forEach((url) => {
+        if (proxies[url].ws === true) {
+          // set up proxy for WebSocket
+          this.server.on('upgrade', (req, socket, head) => {
+            if (req.url.startsWith(url)) {
+              this.proxy.ws(req, socket, head, proxies[url]);
+            }
+          });
+          return;
+        }
         app.all(`${url}*`, (req, res, next) => {
           var opts = proxies[url];
           if (this.shouldProxy(req, opts)) {

package/package.json

@@ -7,7 +7,7 @@
     "unittest",
     "browser"
   ],
-  "version": "3.10.1",
+  "version": "3.12.0",
   "author": "Toby Ho <airportyh@gmail.com>",
   "repository": {
     "type": "git",
@@ -39,13 +39,13 @@
     "lodash.clonedeep": "^4.4.1",
     "lodash.find": "^4.5.1",
     "lodash.uniqby": "^4.7.0",
-    "mkdirp": "^1.0.4",
+    "mkdirp": "^3.0.1",
     "mustache": "^4.2.0",
     "node-notifier": "^10.0.0",
     "npmlog": "^6.0.0",
     "printf": "^0.6.1",
     "rimraf": "^3.0.2",
-    "socket.io": "^4.1.2",
+    "socket.io": "^4.5.4",
     "spawn-args": "^0.2.0",
     "styled_string": "0.0.1",
     "tap-parser": "^7.0.0",