mocha 5.1.0 → 6.0.0-1

package/lib/reporters/tap.js

@@ -6,7 +6,10 @@
  * Module dependencies.
  */
 
+var util = require('util');
 var Base = require('./base');
+var inherits = require('../utils').inherits;
+var sprintf = util.format;
 
 /**
  * Expose `TAP`.
@@ -15,62 +18,270 @@ var Base = require('./base');
 exports = module.exports = TAP;
 
 /**
- * Initialize a new `TAP` reporter.
+ * Constructs a new TAP reporter with runner instance and reporter options.
  *
  * @public
  * @class
- * @memberof Mocha.reporters
  * @extends Mocha.reporters.Base
- * @api public
- * @param {Runner} runner
+ * @memberof Mocha.reporters
+ * @param {Runner} runner - Instance triggers reporter actions.
+ * @param {Object} [options] - runner options
  */
-function TAP (runner) {
-  Base.call(this, runner);
+function TAP(runner, options) {
+  Base.call(this, runner, options);
 
+  var self = this;
   var n = 1;
-  var passes = 0;
-  var failures = 0;
 
-  runner.on('start', function () {
-    var total = runner.grepTotal(runner.suite);
-    console.log('%d..%d', 1, total);
+  var tapVersion = '12';
+  if (options && options.reporterOptions) {
+    if (options.reporterOptions.tapVersion) {
+      tapVersion = options.reporterOptions.tapVersion.toString();
+    }
+  }
+
+  this._producer = createProducer(tapVersion);
+
+  runner.once('start', function() {
+    var ntests = runner.grepTotal(runner.suite);
+    self._producer.writeVersion();
+    self._producer.writePlan(ntests);
   });
 
-  runner.on('test end', function () {
+  runner.on('test end', function() {
     ++n;
   });
 
-  runner.on('pending', function (test) {
-    console.log('ok %d %s # SKIP -', n, title(test));
+  runner.on('pending', function(test) {
+    self._producer.writePending(n, test);
   });
 
-  runner.on('pass', function (test) {
-    passes++;
-    console.log('ok %d %s', n, title(test));
+  runner.on('pass', function(test) {
+    self._producer.writePass(n, test);
   });
 
-  runner.on('fail', function (test, err) {
-    failures++;
-    console.log('not ok %d %s', n, title(test));
-    if (err.stack) {
-      console.log(err.stack.replace(/^/gm, '  '));
-    }
+  runner.on('fail', function(test, err) {
+    self._producer.writeFail(n, test, err);
   });
 
-  runner.once('end', function () {
-    console.log('# tests ' + (passes + failures));
-    console.log('# pass ' + passes);
-    console.log('# fail ' + failures);
+  runner.once('end', function() {
+    self._producer.writeEpilogue(runner.stats);
   });
 }
 
 /**
- * Return a TAP-safe title of `test`
+ * Inherit from `Base.prototype`.
+ */
+inherits(TAP, Base);
+
+/**
+ * Returns a TAP-safe title of `test`.
  *
- * @api private
- * @param {Object} test
- * @return {String}
+ * @private
+ * @param {Test} test - Test instance.
+ * @return {String} title with any hash character removed
  */
-function title (test) {
+function title(test) {
   return test.fullTitle().replace(/#/g, '');
 }
+
+/**
+ * Writes newline-terminated formatted string to reporter output stream.
+ *
+ * @private
+ * @param {string} format - `printf`-like format string
+ * @param {...*} [varArgs] - Format string arguments
+ */
+function println(format, varArgs) {
+  var vargs = Array.from(arguments);
+  vargs[0] += '\n';
+  process.stdout.write(sprintf.apply(null, vargs));
+}
+
+/**
+ * Returns a `tapVersion`-appropriate TAP producer instance, if possible.
+ *
+ * @private
+ * @param {string} tapVersion - Version of TAP specification to produce.
+ * @returns {TAPProducer} specification-appropriate instance
+ * @throws {Error} if specification version has no associated producer.
+ */
+function createProducer(tapVersion) {
+  var producers = {
+    '12': new TAP12Producer(),
+    '13': new TAP13Producer()
+  };
+  var producer = producers[tapVersion];
+
+  if (!producer) {
+    throw new Error(
+      'invalid or unsupported TAP version: ' + JSON.stringify(tapVersion)
+    );
+  }
+
+  return producer;
+}
+
+/**
+ * @summary
+ * Constructs a new TAPProducer.
+ *
+ * @description
+ * <em>Only</em> to be used as an abstract base class.
+ *
+ * @private
+ * @constructor
+ */
+function TAPProducer() {}
+
+/**
+ * Writes the TAP version to reporter output stream.
+ *
+ * @abstract
+ */
+TAPProducer.prototype.writeVersion = function() {};
+
+/**
+ * Writes the plan to reporter output stream.
+ *
+ * @abstract
+ * @param {number} ntests - Number of tests that are planned to run.
+ */
+TAPProducer.prototype.writePlan = function(ntests) {
+  println('%d..%d', 1, ntests);
+};
+
+/**
+ * Writes that test passed to reporter output stream.
+ *
+ * @abstract
+ * @param {number} n - Index of test that passed.
+ * @param {Test} test - Instance containing test information.
+ */
+TAPProducer.prototype.writePass = function(n, test) {
+  println('ok %d %s', n, title(test));
+};
+
+/**
+ * Writes that test was skipped to reporter output stream.
+ *
+ * @abstract
+ * @param {number} n - Index of test that was skipped.
+ * @param {Test} test - Instance containing test information.
+ */
+TAPProducer.prototype.writePending = function(n, test) {
+  println('ok %d %s # SKIP -', n, title(test));
+};
+
+/**
+ * Writes that test failed to reporter output stream.
+ *
+ * @abstract
+ * @param {number} n - Index of test that failed.
+ * @param {Test} test - Instance containing test information.
+ * @param {Error} err - Reason the test failed.
+ */
+TAPProducer.prototype.writeFail = function(n, test, err) {
+  println('not ok %d %s', n, title(test));
+};
+
+/**
+ * Writes the summary epilogue to reporter output stream.
+ *
+ * @abstract
+ * @param {Object} stats - Object containing run statistics.
+ */
+TAPProducer.prototype.writeEpilogue = function(stats) {
+  // :TBD: Why is this not counting pending tests?
+  println('# tests ' + (stats.passes + stats.failures));
+  println('# pass ' + stats.passes);
+  // :TBD: Why are we not showing pending results?
+  println('# fail ' + stats.failures);
+};
+
+/**
+ * @summary
+ * Constructs a new TAP12Producer.
+ *
+ * @description
+ * Produces output conforming to the TAP12 specification.
+ *
+ * @private
+ * @constructor
+ * @extends TAPProducer
+ * @see {@link https://testanything.org/tap-specification.html|Specification}
+ */
+function TAP12Producer() {
+  /**
+   * Writes that test failed to reporter output stream, with error formatting.
+   * @override
+   */
+  this.writeFail = function(n, test, err) {
+    TAPProducer.prototype.writeFail.call(this, n, test, err);
+    if (err.message) {
+      println(err.message.replace(/^/gm, '  '));
+    }
+    if (err.stack) {
+      println(err.stack.replace(/^/gm, '  '));
+    }
+  };
+}
+
+/**
+ * Inherit from `TAPProducer.prototype`.
+ */
+inherits(TAP12Producer, TAPProducer);
+
+/**
+ * @summary
+ * Constructs a new TAP13Producer.
+ *
+ * @description
+ * Produces output conforming to the TAP13 specification.
+ *
+ * @private
+ * @constructor
+ * @extends TAPProducer
+ * @see {@link https://testanything.org/tap-version-13-specification.html|Specification}
+ */
+function TAP13Producer() {
+  /**
+   * Writes the TAP version to reporter output stream.
+   * @override
+   */
+  this.writeVersion = function() {
+    println('TAP version 13');
+  };
+
+  /**
+   * Writes that test failed to reporter output stream, with error formatting.
+   * @override
+   */
+  this.writeFail = function(n, test, err) {
+    TAPProducer.prototype.writeFail.call(this, n, test, err);
+    var emitYamlBlock = err.message != null || err.stack != null;
+    if (emitYamlBlock) {
+      println(indent(1) + '---');
+      if (err.message) {
+        println(indent(2) + 'message: |-');
+        println(err.message.replace(/^/gm, indent(3)));
+      }
+      if (err.stack) {
+        println(indent(2) + 'stack: |-');
+        println(err.stack.replace(/^/gm, indent(3)));
+      }
+      println(indent(1) + '...');
+    }
+  };
+
+  function indent(level) {
+    return Array(level + 1).join('  ');
+  }
+}
+
+/**
+ * Inherit from `TAPProducer.prototype`.
+ */
+inherits(TAP13Producer, TAPProducer);
+
+TAP.description = 'TAP-compatible output';

package/lib/reporters/xunit.js

@@ -13,18 +13,12 @@ var fs = require('fs');
 var escape = utils.escape;
 var mkdirp = require('mkdirp');
 var path = require('path');
-
+var errors = require('../errors');
+var createNotSupportedError = errors.createNotSupportedError;
 /**
  * Save timer references to avoid Sinon interfering (see GH-237).
  */
-
-/* eslint-disable no-unused-vars, no-native-reassign */
 var Date = global.Date;
-var setTimeout = global.setTimeout;
-var setInterval = global.setInterval;
-var clearTimeout = global.clearTimeout;
-var clearInterval = global.clearInterval;
-/* eslint-enable no-unused-vars, no-native-reassign */
 
 /**
  * Expose `XUnit`.
@@ -39,10 +33,9 @@ exports = module.exports = XUnit;
  * @class
  * @memberof Mocha.reporters
  * @extends Mocha.reporters.Base
- * @api public
  * @param {Runner} runner
  */
-function XUnit (runner, options) {
+function XUnit(runner, options) {
   Base.call(this, runner);
 
   var stats = this.stats;
@@ -58,7 +51,7 @@ function XUnit (runner, options) {
   if (options && options.reporterOptions) {
     if (options.reporterOptions.output) {
       if (!fs.createWriteStream) {
-        throw new Error('file output not supported in browser');
+        throw createNotSupportedError('file output not supported in browser');
       }
 
       mkdirp.sync(path.dirname(options.reporterOptions.output));
@@ -72,30 +65,36 @@ function XUnit (runner, options) {
   // fall back to the default suite name
   suiteName = suiteName || DEFAULT_SUITE_NAME;
 
-  runner.on('pending', function (test) {
+  runner.on('pending', function(test) {
     tests.push(test);
   });
 
-  runner.on('pass', function (test) {
+  runner.on('pass', function(test) {
     tests.push(test);
   });
 
-  runner.on('fail', function (test) {
+  runner.on('fail', function(test) {
     tests.push(test);
   });
 
-  runner.once('end', function () {
-    self.write(tag('testsuite', {
-      name: suiteName,
-      tests: stats.tests,
-      failures: stats.failures,
-      errors: stats.failures,
-      skipped: stats.tests - stats.failures - stats.passes,
-      timestamp: (new Date()).toUTCString(),
-      time: (stats.duration / 1000) || 0
-    }, false));
-
-    tests.forEach(function (t) {
+  runner.once('end', function() {
+    self.write(
+      tag(
+        'testsuite',
+        {
+          name: suiteName,
+          tests: stats.tests,
+          failures: 0,
+          errors: stats.failures,
+          skipped: stats.tests - stats.failures - stats.passes,
+          timestamp: new Date().toUTCString(),
+          time: stats.duration / 1000 || 0
+        },
+        false
+      )
+    );
+
+    tests.forEach(function(t) {
       self.test(t);
     });
 
@@ -114,9 +113,9 @@ inherits(XUnit, Base);
  * @param failures
  * @param {Function} fn
  */
-XUnit.prototype.done = function (failures, fn) {
+XUnit.prototype.done = function(failures, fn) {
   if (this.fileStream) {
-    this.fileStream.end(function () {
+    this.fileStream.end(function() {
       fn(failures);
     });
   } else {
@@ -129,7 +128,7 @@ XUnit.prototype.done = function (failures, fn) {
  *
  * @param {string} line
  */
-XUnit.prototype.write = function (line) {
+XUnit.prototype.write = function(line) {
   if (this.fileStream) {
     this.fileStream.write(line + '\n');
   } else if (typeof process === 'object' && process.stdout) {
@@ -144,16 +143,34 @@ XUnit.prototype.write = function (line) {
  *
  * @param {Test} test
  */
-XUnit.prototype.test = function (test) {
+XUnit.prototype.test = function(test) {
+  Base.useColors = false;
+
   var attrs = {
     classname: test.parent.fullTitle(),
     name: test.title,
-    time: (test.duration / 1000) || 0
+    time: test.duration / 1000 || 0
   };
 
   if (test.state === 'failed') {
     var err = test.err;
-    this.write(tag('testcase', attrs, false, tag('failure', {}, false, escape(err.message) + '\n' + escape(err.stack))));
+    var diff =
+      Base.hideDiff || !err.actual || !err.expected
+        ? ''
+        : '\n' + Base.generateDiff(err.actual, err.expected);
+    this.write(
+      tag(
+        'testcase',
+        attrs,
+        false,
+        tag(
+          'failure',
+          {},
+          false,
+          escape(err.message) + escape(diff) + '\n' + escape(err.stack)
+        )
+      )
+    );
   } else if (test.isPending()) {
     this.write(tag('testcase', attrs, false, tag('skipped', {}, true)));
   } else {
@@ -170,7 +187,7 @@ XUnit.prototype.test = function (test) {
  * @param content
  * @return {string}
  */
-function tag (name, attrs, close, content) {
+function tag(name, attrs, close, content) {
   var end = close ? '/>' : '>';
   var pairs = [];
   var tag;
@@ -187,3 +204,5 @@ function tag (name, attrs, close, content) {
   }
   return tag;
 }
+
+XUnit.description = 'XUnit-compatible XML output';