testem 2.7.2 → 2.9.0

package/lib/app.js

@@ -150,7 +150,14 @@ module.exports = class App extends EventEmitter {
 
     return Bluebird.using(this.runHook('before_tests'), () => {
       return Bluebird.using(RunTimeout.with(this.config.get('timeout')), timeout => {
-        timeout.on('timeout', () => this.killRunners());
+        timeout.on('timeout', () => {
+          let timeoutSeconds = timeout.timeout;
+          if (timeoutSeconds) {
+            log.info(`Test suite execution has timed out (config.timeout = ${timeoutSeconds} seconds). Terminating all test runners`);
+            this.testSuiteTimedOut = true;
+          }
+          this.killRunners();
+        });
         this.timeoutID = timeout.timeoutID; // TODO Remove, just for the tests
         this.currentRun = this.singleRun(timeout);
         this.emit('testRun');

package/lib/config.js

@@ -403,6 +403,14 @@ class Config {
     this.getFileSet(srcFiles, srcFilesIgnore, callback);
   }
 
+  getFooterScripts(callback) {
+    var want = this.get('footer_scripts') || [];
+    var dontWant = this.get('src_files_ignore') || '';
+        
+    this.getFileSet(want, dontWant, callback);
+  };
+
+
   getServeFiles(callback) {
     let want = this.get('serve_files') || this.get('src_files') || '*.js';
     let dontWant = this.get('serve_files_ignore') || this.get('src_files_ignore') || '';
@@ -468,9 +476,12 @@ class Config {
 
       this.getCSSFiles((err, files) => {
         ret.css_files = files.map(replaceSlashes);
-        if (cb) {
-          cb(err, ret);
-        }
+        this.getFooterScripts((err, files) => {
+          ret.footer_scripts = files;
+          if (cb) {
+            cb(err, ret);
+          }
+        });
       });
     });
   }

package/lib/reporters/dev/split_log_panel.js

@@ -29,7 +29,7 @@ function failureDisplay(item) {
   }
 
   if (item.expected) {
-    extra.push(' expected ' + item.expected);
+    extra.push(' expected ' + (item.negative ? 'NOT ' : '') + item.expected);
   }
 
   if (item.actual) {

package/lib/reporters/dot_reporter.js

@@ -80,8 +80,8 @@ module.exports = class DotReporter {
 
       if ('expected' in error && 'actual' in error) {
         printf(this.out, '\n' +
-               '     expected: %O\n' +
-               '       actual: %O\n', error.expected, error.actual);
+               '     expected: %s%O\n' +
+               '       actual: %O\n', (error.negative ? 'NOT ' : ''), error.expected, error.actual);
       }
 
       if (error.stack) {

package/lib/reporters/teamcity_reporter.js

@@ -1,6 +1,47 @@
 'use strict';
 
-class TeamcityReporter {
+function namify(prefix, result) {
+  let line = (prefix ? (prefix + ' - ') : '') +
+    result.name.trim();
+
+  return escape(line);
+}
+
+/**
+ * Borrowed from https://github.com/travisjeffery/mocha-teamcity-reporter
+ * Escape the given `str`.
+ */
+
+function escape(str) {
+  if (!str) {
+    return '';
+  }
+  return str
+    .toString()
+    .replace(/\|/g, '||')
+    .replace(/\n/g, '|n')
+    .replace(/\r/g, '|r')
+    .replace(/\[/g, '|[')
+    .replace(/\]/g, '|]')
+    .replace(/\u0085/g, '|x')
+    .replace(/\u2028/g, '|l')
+    .replace(/\u2029/g, '|p')
+    .replace(/'/g, '|\'');
+}
+
+function teamcityLine(type, options) {
+  const attributes = Object.keys(options)
+    .map(attributeName => `${attributeName}='${options[attributeName]}'`)
+    .join(' ');
+
+  return `##teamcity[${type} ${attributes}]\n`;
+}
+
+function runDurationAttribute(result) {
+  return typeof result.runDuration === 'number' ? {duration: result.runDuration} : undefined;
+}
+
+module.exports = class TeamcityReporter {
   constructor(silent, out) {
     this.out = out || process.stdout;
     this.silent = silent;
@@ -14,8 +55,13 @@ class TeamcityReporter {
   }
 
   report(prefix, data) {
-    this.out.write('##teamcity[testStarted name=\'' + this._namify(prefix, data) + '\']\n');
+    const name = namify(prefix, data);
+    this.out.write(teamcityLine('testStarted', {name}));
     this._display(prefix, data);
+    this.out.write(teamcityLine('testFinished', Object.assign(
+      {name},
+      runDurationAttribute(data)
+    )));
     this.total++;
     if (data.skipped) {
       this.skipped++;
@@ -30,7 +76,10 @@ class TeamcityReporter {
     }
     this.endTime = new Date();
     this.out.write('\n\n');
-    this.out.write('##teamcity[testSuiteFinished name=\'testem.suite\' duration=\'' + this._duration() + '\']\n');
+    this.out.write(teamcityLine('testSuiteFinished', {
+      name: 'testem.suite',
+      duration: Math.round((this.endTime - this.startTime)),
+    }));
     this.out.write('\n\n');
   }
 
@@ -38,52 +87,36 @@ class TeamcityReporter {
     if (this.silent) {
       return;
     }
+    const name = namify(prefix, result);
+
     if (result.skipped) {
-      this.out.write('##teamcity[testIgnored name=\'' + this._namify(prefix, result) + '\' message=\'pending\']\n');
+      this.out.write(teamcityLine('testIgnored', {
+        name,
+        message: 'pending',
+      }));
     } else if (!result.passed) {
-      var message = (result.error && result.error.message) || '';
-      var stack = (result.error && result.error.stack) || '';
-      this.out.write('##teamcity[testFailed name=\'' + this._namify(prefix, result) + '\' message=\'' + escape(message) + '\' details=\'' + escape(stack) + '\']\n');
-    }
-    this.out.write('##teamcity[testFinished name=\'' + this._namify(prefix, result) + '\'' + this._runDurationAttribute(result) + ']\n');
-
-  }
+      const hasError = result.error;
+      const attributes = {name};
 
-  _namify(prefix, result) {
-    var line = (prefix ? (prefix + ' - ') : '') +
-      result.name.trim();
-    return escape(line);
-  }
+      const message = (hasError && result.error.message) || '';
+      const stack = (hasError && result.error.stack) || '';
 
-  _duration() {
-    return Math.round((this.endTime - this.startTime));
-  }
+      attributes.message = escape(message);
+      attributes.details = escape(stack);
 
-  _runDurationAttribute(result) {
-    return typeof result.runDuration === 'number' ? ' duration=\'' + result.runDuration + '\'' : '';
-  }
-}
+      if (
+        hasError &&
+        result.error.hasOwnProperty('expected') &&
+        result.error.hasOwnProperty('actual')
+      ) {
+        attributes.type = 'comparisonFailure';
+        attributes.expected = (result.error.negative ? 'NOT ' : '') + escape(result.error.expected);
+        attributes.actual = escape(result.error.actual);
+      }
 
-/**
- * Borrowed from https://github.com/travisjeffery/mocha-teamcity-reporter
- * Escape the given `str`.
- */
-
-function escape(str) {
-  if (!str) {
-    return '';
+      this.out.write(teamcityLine('testFailed', attributes));
+    }
   }
-  return str
-    .toString()
-    .replace(/\|/g, '||')
-    .replace(/\n/g, '|n')
-    .replace(/\r/g, '|r')
-    .replace(/\[/g, '|[')
-    .replace(/\]/g, '|]')
-    .replace(/\u0085/g, '|x')
-    .replace(/\u2028/g, '|l')
-    .replace(/\u2029/g, '|p')
-    .replace(/'/g, '|\'');
-}
+};
 
-module.exports = TeamcityReporter;
+module.exports.teamcityLine = teamcityLine;

package/lib/runners/browser_test_runner.js

@@ -21,6 +21,7 @@ module.exports = class BrowserTestRunner {
 
     this.pendingTimer = undefined;
     this.onProcessExitTimer = undefined;
+    this.exitRequested = false;
   }
 
   start(onFinish) {
@@ -61,6 +62,11 @@ module.exports = class BrowserTestRunner {
       return Bluebird.resolve();
     }
 
+    // mark that somebody (generally app.js) has requested that the
+    // test runner exit. This is not an unexpected exit--this setting
+    // is to tell the processExit handler that.
+    this.exitRequested = true;
+
     log.info(`Closing browser ${this.name()}.`);
     return this.process.kill().then(() => {
       this.process = null;
@@ -246,11 +252,15 @@ module.exports = class BrowserTestRunner {
     if (this.finished) { return; }
 
     this.onProcessExitTimer = setTimeout(() => {
-      if (this.finished) {
-        return;
+      if (this.finished) { 
+        return; 
       }
 
-      this.reportResults(new Error('Browser exited unexpectedly'), code, browserProcess);
+      this.reportResults(new Error(this.exitRequested
+                                   ? "Browser exited on request from test driver"
+                                   : "Browser exited unexpectedly"),
+                         code,
+                         browserProcess);
     }, 1000);
   }
 

package/lib/server/index.js

@@ -212,7 +212,7 @@ class Server extends EventEmitter {
     }
   }
 
-  renderRunnerPage(err, files, res) {
+  renderRunnerPage(err, files, footerScripts, res) {
     var config = this.config;
     var framework = config.get('framework') || 'jasmine';
     var css_files = config.get('css_files');
@@ -228,7 +228,8 @@ class Server extends EventEmitter {
     }[framework] + '.mustache';
     res.render(`${__dirname}/../../views/${templateFile}`, {
       scripts: files,
-      styles: css_files
+      styles: css_files,
+      footer_scripts: footerScripts
     });
   }
 
@@ -249,7 +250,9 @@ class Server extends EventEmitter {
       res.redirect(url);
     } else {
       config.getServeFiles((err, files) => {
-        this.renderRunnerPage(err, files, res);
+        config.getFooterScripts((err, footerScripts) => {
+          this.renderRunnerPage(err, files, footerScripts, res);
+        });
       });
     }
   }

package/package.json

@@ -7,7 +7,7 @@
     "unittest",
     "browser"
   ],
-  "version": "2.7.2",
+  "version": "2.9.0",
   "author": "Toby Ho <airportyh@gmail.com>",
   "repository": {
     "type": "git",
@@ -75,16 +75,16 @@
     "chai-shallow-deep-equal": "^1.4.4",
     "cheerio": "^1.0.0-rc.2",
     "dirty-chai": "^2.0.0",
-    "eslint": "^4.1.0",
+    "eslint": "^5.0.0",
     "eslint-plugin-chai-expect": "^1.1.1",
     "eslint-plugin-mocha": "^5.0.0",
     "mocha": "^3.0.0",
     "request": "^2.51.0",
-    "saucie": "^3.0.1",
+    "saucie": "^3.3.2",
     "shelljs": "^0.8.2",
-    "sinon": "^5.0.10",
-    "sinon-chai": "^3.0.0",
-    "tape": "^4.0.0",
+    "sinon": "^6.0.0",
+    "sinon-chai": "^3.2.0",
+    "tape": "^4.9.1",
     "tmp": "0.0.33"
   },
   "bin": {

package/public/testem/qunit_adapter.js

@@ -71,7 +71,8 @@ function qunitAdapter() {
           actual: params.actual,
           expected: params.expected,
           stack: params.source,
-          message: params.message
+          message: params.message,
+          negative: params.negative
         });
       }
 

package/public/testem/testem_client.js

@@ -409,5 +409,15 @@ function emit() {
 
 if (typeof window !== 'undefined') {
   window.Testem = Testem;
+
+  // Stub window.alert and window.confirm to throw error so alert and confirm does not get used in tests
+  // this will prevent browser disconnect failures
+  window.alert = function() {
+    throw new Error('[Testem] Calling window.alert() in tests is disabled, because it causes testem to fail with browser disconnect error.');
+  }
+
+  window.confirm = function() {
+    throw new Error('[Testem] Calling window.confirm() in tests is disabled, because it causes testem to fail with browser disconnect error.');
+  }
   init();
 }

package/views/busterrunner.mustache

@@ -9,4 +9,5 @@
 {{#scripts}}<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>{{/scripts}}
 </head>
 <body></body>
+{{#footer_scripts}}<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>{{/footer_scripts}}
 </html>

package/views/customrunner.mustache

@@ -8,4 +8,5 @@
 </head>
 <body>
 </body>
+{{#footer_scripts}}<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>{{/footer_scripts}}
 </html>

package/views/jasmine2runner.mustache

@@ -16,4 +16,5 @@
 <body>
   <div id="jasmine_content"></div>
 </body>
+{{#footer_scripts}}<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>{{/footer_scripts}}
 </html>

package/views/jasminerunner.mustache

@@ -25,4 +25,5 @@
 <body>
   <div id="jasmine_content"></div>
 </body>
+{{#footer_scripts}}<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>{{/footer_scripts}}
 </html>

package/views/mochachairunner.mustache

@@ -11,6 +11,7 @@
 </head>
 <body>
 <div id="mocha"></div>
+{{#footer_scripts}}<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>{{/footer_scripts}}
 <script>
 mocha.run()
 </script>

package/views/mocharunner.mustache

@@ -11,6 +11,7 @@
 </head>
 <body>
 <div id="mocha"></div>
+{{#footer_scripts}}<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>{{/footer_scripts}}
 <script>
 mocha.run()
 </script>

package/views/qunitrunner.mustache

@@ -12,4 +12,5 @@
 <div id="qunit"></div>
 <div id="qunit-fixture"></div>
 </body>
+{{#footer_scripts}}<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>{{/footer_scripts}}
 </html>

package/views/taprunner.mustache

@@ -16,5 +16,6 @@ Testem.handleConsoleMessage = function(msg){
 }
 </script>
 {{#scripts}}<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>{{/scripts}}
+{{#footer_scripts}}<script src="{{{src}}}"{{#attrs}} {{&.}}{{/attrs}}></script>{{/footer_scripts}}
 </body>
-</html>
+</html>