testem 3.2.0 → 3.4.1

package/README.md

@@ -1,7 +1,7 @@
 Got Scripts? Test’em!
 =================
 
-[![Build Status](https://travis-ci.org/testem/testem.svg?branch=master)](https://travis-ci.org/testem/testem) [![Dependency Status](https://david-dm.org/testem/testem.svg)](https://david-dm.org/testem/testem) [![npm version](https://badge.fury.io/js/testem.svg)](http://badge.fury.io/js/testem) [![Windows build status](https://ci.appveyor.com/api/projects/status/l948rc4rv391ayge/branch/master?svg=true)](https://ci.appveyor.com/project/johanneswuerbach/testem/branch/master)
+[![Build Status](https://github.com/testem/testem/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/testem/testem/actions/workflows/ci.yml?query=branch%3Amaster) [![npm version](https://badge.fury.io/js/testem.svg)](http://badge.fury.io/js/testem)
 
 Unit testing in Javascript can be tedious and painful, but Testem makes it so easy that you will actually *want* to write tests.
 

package/lib/config.js

@@ -125,7 +125,7 @@ class Config {
       if (callback) {
         callback.call(this);
       }
-    } else if (configFile.match(/\.js$/)) {
+    } else if (configFile.match(/\.c?js$/)) {
       this.readJS(configFile, callback);
     } else if (configFile.match(/\.json$/)) {
       this.readJSON(configFile, callback);

package/lib/reporters/dot_reporter.js

@@ -2,6 +2,7 @@
 
 const indent = require('../utils/strutils').indent;
 const printf = require('printf');
+const displayutils = require('../utils/displayutils');
 
 module.exports = class DotReporter {
   constructor(silent, out) {
@@ -98,7 +99,11 @@ module.exports = class DotReporter {
   }
 
   summaryDisplay() {
-    return printf('  %d tests complete (%d ms)', this.total, this.duration());
+    let lines = [
+      `[duration - ${this.duration()} ms]`,
+      displayutils.summaryDisplay.call(this),
+    ];
+    return lines.join('\n');
   }
 
   duration() {

package/lib/reporters/tap_reporter.js

@@ -38,20 +38,7 @@ module.exports = class TapReporter {
   }
 
   summaryDisplay() {
-    let lines = [
-      '1..' + this.total,
-      '# tests ' + this.total,
-      '# pass  ' + this.pass,
-      '# skip  ' + this.skipped,
-      '# todo  ' + this.todo,
-      '# fail  ' + (this.total - this.pass - this.skipped - this.todo)
-    ];
-
-    if (this.pass + this.skipped + this.todo === this.total) {
-      lines.push('');
-      lines.push('# ok');
-    }
-    return lines.join('\n');
+    return displayutils.summaryDisplay.call(this);
   }
 
   /*

package/lib/runners/to-result.js

@@ -78,7 +78,7 @@ module.exports = function toResult(launcherId, err, code, runnerProcess, config,
     message += 'Stdout: \n ' + runnerProcess.stdout + '\n';
   }
 
-  if (config && config.get('debug')) {
+  if (config && config.get('debug') && runnerProcess && runnerProcess.name) {
     log.info(runnerProcess.name + '.stdout', runnerProcess.stdout);
     log.info(runnerProcess.name + '.stderr', runnerProcess.stderr);
   }

package/lib/utils/displayutils.js

@@ -64,9 +64,15 @@ function yamlDisplay(err, logs) {
     .map(key => key + ': >\n' + strutils.indent(String(err[key])));
   if (logs) {
     testLogs = ['browser log: |'].concat(
-      logs.map(
-        log => strutils.indent(log.toString())
-      )
+      logs.map((log) => {
+        let logLine;
+        if (strutils.isString(log)) {
+          logLine = log;
+        } else {
+          logLine = JSON.stringify(log);
+        }
+        return strutils.indent(logLine);
+      })
     );
   } else {
     testLogs = [];
@@ -87,3 +93,22 @@ function resultString(id, prefix, result, quietLogs, strictSpecCompliance) {
 }
 
 exports.resultString = resultString;
+
+function summaryDisplay() {
+  let lines = [
+    '1..' + this.total,
+    '# tests ' + this.total,
+    '# pass  ' + this.pass,
+    '# skip  ' + this.skipped,
+    '# todo  ' + this.todo,
+    '# fail  ' + (this.total - this.pass - this.skipped - this.todo)
+  ];
+
+  if (this.pass + this.skipped + this.todo === this.total) {
+    lines.push('');
+    lines.push('# ok');
+  }
+  return lines.join('\n');
+}
+
+exports.summaryDisplay = summaryDisplay;

package/lib/utils/known-browsers.js

@@ -71,6 +71,15 @@ function headlessBraveArgs(browserTmpDir, url) {
     '--window-size=1440,900'].concat(braveArgs(browserTmpDir, url));
 }
 
+function edgePaths() {
+  return [
+    'C:\\Program Files\\Microsoft\\Edge\\Application\\msedge.exe',
+    'C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe',
+    process.env.HOME + '/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge',
+    '/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge'
+  ];
+}
+
 function firefoxPaths() {
   return [
     'C:\\Program Files\\Mozilla Firefox\\firefox.exe',
@@ -237,6 +246,20 @@ module.exports = function knownBrowsers(platform, config) {
         return chromeArgs(this.browserTmpDir(), url);
       }
     },
+    {
+      name: 'Edge',
+      possiblePath: edgePaths(),
+      args(config, url) {
+        return chromeArgs(this.browserTmpDir(), url);
+      }
+    },
+    {
+      name: 'Headless Edge',
+      possiblePath: edgePaths(),
+      args(config, url) {
+        return headlessChromeArgs(this.browserTmpDir(), url);
+      }
+    },
     {
       name: 'Safari',
       possiblePath: [

package/lib/utils/strutils.js

@@ -38,3 +38,7 @@ exports.template = function template(str, params) {
     return name in params ? params[name] : unchanged;
   });
 };
+
+exports.isString = function(x) {
+  return Object.prototype.toString.call(x) === '[object String]';
+};

package/package.json

@@ -7,7 +7,7 @@
     "unittest",
     "browser"
   ],
-  "version": "3.2.0",
+  "version": "3.4.1",
   "author": "Toby Ho <airportyh@gmail.com>",
   "repository": {
     "type": "git",
@@ -40,16 +40,16 @@
     "lodash.uniqby": "^4.7.0",
     "mkdirp": "^0.5.1",
     "mustache": "^3.0.0",
-    "node-notifier": "^5.0.1",
+    "node-notifier": "^9.0.1",
     "npmlog": "^4.0.0",
-    "printf": "^0.5.1",
+    "printf": "^0.6.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"
+    "xmldom": "^0.6.0"
   },
   "files": [
     "lib",
@@ -62,7 +62,7 @@
   ],
   "scripts": {
     "install:all": "npm install && npm install phantomjs-prebuilt",
-    "test": "mocha --opts tests/mocha.opts tests/*_tests.js tests/**/*_tests.js",
+    "test": "mocha tests/*_tests.js tests/**/*_tests.js",
     "cover": "cover run ./node_modules/.bin/_mocha tests/*_tests.js tests/**/*_tests.js; cover report html; open cover_html/index.html",
     "integration": "node ./bin/run-integration.js",
     "browser-tests": "cd examples/saucelabs/ && ../../testem.js ci -d",
@@ -77,16 +77,16 @@
     "cheerio": "^1.0.0-rc.2",
     "dirty-chai": "^2.0.0",
     "eslint": "^5.0.0",
-    "eslint-plugin-chai-expect": "^1.1.1",
+    "eslint-plugin-chai-expect": "^2.2.0",
     "eslint-plugin-mocha": "^5.0.0",
-    "mocha": "^3.0.0",
+    "mocha": "^8.3.2",
     "phantomjs": "^2.1.7",
     "request": "^2.51.0",
     "saucie": "^3.3.3",
     "shelljs": "^0.8.2",
-    "sinon": "^7.2.3",
+    "sinon": "^10.0.0",
     "sinon-chai": "^3.2.0",
-    "tape": "^4.9.1"
+    "tape": "^5.2.2"
   },
   "bin": {
     "testem": "./testem.js"

package/public/testem/testem_connection.js

@@ -101,7 +101,9 @@ function getBrowserName(userAgent) {
       return ['Opera', m[2]].join(' ');
     }],
     /(Opera).*Version\/([0-9]+\.[0-9]+)/,
-    /(Edge)\/([0-9]+\.[0-9]+)/,
+    [/(Edg)\/([0-9]+\.[0-9]+)/, function(m) {
+      return ['Edge', m[2]].join(' ');
+    }],
     /(Chrome)\/([0-9]+\.[0-9]+)/,
     /(Firefox)\/([0-9a-z]+\.[0-9a-z]+)/,
     /(PhantomJS)\/([0-9]+\.[0-9]+)/,