testem 3.6.0 → 3.9.0

package/lib/config.js

@@ -140,9 +140,19 @@ class Config {
   }
 
   readJS(configFile, callback) {
-    this.fileOptions = require(this.resolveConfigPath(configFile));
-    if (callback) {
-      callback.call(this);
+    let exportedConfig = require(this.resolveConfigPath(configFile));
+    if (typeof exportedConfig === 'function') {
+      Promise.resolve(exportedConfig()).then(obj => {
+        this.fileOptions = obj;
+        if (callback) {
+          callback.call(this);
+        }
+      });
+    } else {
+      this.fileOptions = exportedConfig;
+      if (callback) {
+        callback.call(this);
+      }
     }
   }
 

package/lib/reporters/teamcity_reporter.js

@@ -106,8 +106,8 @@ module.exports = class TeamcityReporter {
 
       if (
         hasError &&
-        result.error.hasOwnProperty('expected') &&
-        result.error.hasOwnProperty('actual')
+        Object.prototype.hasOwnProperty.call(result.error, 'expected') &&
+        Object.prototype.hasOwnProperty.call(result.error, 'actual')
       ) {
         attributes.type = 'comparisonFailure';
         attributes.expected = (result.error.negative ? 'NOT ' : '') + escape(result.error.expected);

package/lib/reporters/xunit_reporter.js

@@ -80,7 +80,7 @@ class XUnitReporter {
       var errorMessage = '';
       var errorSection = '';
 
-      if (error.hasOwnProperty('actual') && error.hasOwnProperty('expected')) {
+      if (Object.prototype.hasOwnProperty.call(error, 'actual') &&  Object.prototype.hasOwnProperty.call(error, 'expected')) {
         errorMessage = 'Assertion Failed';
 
         errorSection += 'Expected:\n';

package/lib/utils/browser-args.js

@@ -15,8 +15,8 @@ function warn(message) {
 }
 
 function hasOldBrowserArgsFormat(args) {
-  return args.hasOwnProperty('mode') ||
-    args.hasOwnProperty('args');
+  return  Object.prototype.hasOwnProperty.call(args, 'mode') ||
+  Object.prototype.hasOwnProperty.call(args, 'args');
 }
 
 // Lodash's castArray function will turn `undefined` into `[undefined]`, but we want an empty array in that case.
@@ -37,7 +37,7 @@ module.exports = {
 
     if (browserArgs && typeof browserArgs === 'object') {
       for (browserName in browserArgs) {
-        if (browserArgs.hasOwnProperty(browserName)) {
+        if (Object.prototype.hasOwnProperty.call(browserArgs, browserName)) {
           let args = browserArgs[browserName];
 
           if (typeof args === 'object' && !Array.isArray(args)) {

package/lib/utils/known-browsers.js

@@ -249,6 +249,9 @@ module.exports = function knownBrowsers(platform, config) {
     {
       name: 'Edge',
       possiblePath: edgePaths(),
+      possibleExe: [
+        'microsoft-edge'
+      ],
       args(config, url) {
         return chromeArgs(this.browserTmpDir(), url);
       }
@@ -256,6 +259,9 @@ module.exports = function knownBrowsers(platform, config) {
     {
       name: 'Headless Edge',
       possiblePath: edgePaths(),
+      possibleExe: [
+        'microsoft-edge'
+      ],
       args(config, url) {
         return headlessChromeArgs(this.browserTmpDir(), url);
       }

package/package.json

@@ -7,7 +7,7 @@
     "unittest",
     "browser"
   ],
-  "version": "3.6.0",
+  "version": "3.9.0",
   "author": "Toby Ho <airportyh@gmail.com>",
   "repository": {
     "type": "git",
@@ -21,13 +21,13 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@xmldom/xmldom": "^0.7.1",
+    "@xmldom/xmldom": "^0.8.0",
     "backbone": "^1.1.2",
     "bluebird": "^3.4.6",
     "charm": "^1.0.0",
     "commander": "^2.6.0",
     "compression": "^1.7.4",
-    "consolidate": "^0.15.1",
+    "consolidate": "^0.16.0",
     "execa": "^1.0.0",
     "express": "^4.10.7",
     "fireworm": "^0.7.0",
@@ -39,12 +39,12 @@
     "lodash.clonedeep": "^4.4.1",
     "lodash.find": "^4.5.1",
     "lodash.uniqby": "^4.7.0",
-    "mkdirp": "^0.5.1",
-    "mustache": "^3.0.0",
-    "node-notifier": "^9.0.1",
-    "npmlog": "^4.0.0",
+    "mkdirp": "^1.0.4",
+    "mustache": "^4.2.0",
+    "node-notifier": "^10.0.0",
+    "npmlog": "^6.0.0",
     "printf": "^0.6.1",
-    "rimraf": "^2.4.4",
+    "rimraf": "^3.0.2",
     "socket.io": "^4.1.2",
     "spawn-args": "^0.2.0",
     "styled_string": "0.0.1",
@@ -76,15 +76,15 @@
     "chai-shallow-deep-equal": "^1.4.4",
     "cheerio": "^1.0.0-rc.2",
     "dirty-chai": "^2.0.0",
-    "eslint": "^5.0.0",
-    "eslint-plugin-chai-expect": "^2.2.0",
-    "eslint-plugin-mocha": "^5.0.0",
-    "mocha": "^8.3.2",
+    "eslint": "^8.12.0",
+    "eslint-plugin-chai-expect": "^3.0.0",
+    "eslint-plugin-mocha": "^10.0.3",
+    "mocha": "^9.2.0",
     "phantomjs": "^2.1.7",
     "request": "^2.51.0",
     "saucie": "^3.3.3",
     "shelljs": "^0.8.2",
-    "sinon": "^10.0.0",
+    "sinon": "^14.0.0",
     "sinon-chai": "^3.2.0",
     "socket.io-client": "^4.1.2",
     "tape": "^5.2.2"

package/public/.eslintrc.js

@@ -1,8 +1,9 @@
 'use strict';
+/* globals module */
 
 module.exports = {
   env: {
     browser: true,
     node: false
   }
-}
+};

package/public/testem/testem_client.js

@@ -7,10 +7,9 @@ The client-side script that reports results back to the Testem server via Socket
 It also restarts the tests by refreshing the page when instructed by the server to do so.
 
 */
-/* globals document, window */
 /* globals module */
 /* globals jasmineAdapter, jasmine2Adapter, mochaAdapter */
-/* globals qunitAdapter, decycle, TestemConfig */
+/* globals qunitAdapter, decycle */
 /* exported Testem */
 'use strict';
 

package/public/testem/testem_connection.js

@@ -1,4 +1,4 @@
-/* globals document, parent, io, window, navigator */
+/* globals io */
 /* globals module */
 'use strict';