mocha 2.2.5 → 2.3.3

package/lib/reporters/progress.js

@@ -2,9 +2,10 @@
  * Module dependencies.
  */
 
-var Base = require('./base')
-  , cursor = Base.cursor
-  , color = Base.color;
+var Base = require('./base');
+var inherits = require('../utils').inherits;
+var color = Base.color;
+var cursor = Base.cursor;
 
 /**
  * Expose `Progress`.
@@ -21,24 +22,21 @@ Base.colors.progress = 90;
 /**
  * Initialize a new `Progress` bar test reporter.
  *
+ * @api public
  * @param {Runner} runner
  * @param {Object} options
- * @api public
  */
-
 function Progress(runner, options) {
   Base.call(this, runner);
 
-  var self = this
-    , options = options || {}
-    , stats = this.stats
-    , width = Base.window.width * .50 | 0
-    , total = runner.total
-    , complete = 0
-    , max = Math.max
-    , lastN = -1;
+  var self = this;
+  var width = Base.window.width * .50 | 0;
+  var total = runner.total;
+  var complete = 0;
+  var lastN = -1;
 
   // default chars
+  options = options || {};
   options.open = options.open || '[';
   options.complete = options.complete || '▬';
   options.incomplete = options.incomplete || Base.symbols.dot;
@@ -46,20 +44,20 @@ function Progress(runner, options) {
   options.verbose = false;
 
   // tests started
-  runner.on('start', function(){
+  runner.on('start', function() {
     console.log();
     cursor.hide();
   });
 
   // tests complete
-  runner.on('test end', function(){
+  runner.on('test end', function() {
     complete++;
-    var incomplete = total - complete
-      , percent = complete / total
-      , n = width * percent | 0
-      , i = width - n;
 
-    if (lastN === n && !options.verbose) {
+    var percent = complete / total;
+    var n = width * percent | 0;
+    var i = width - n;
+
+    if (n === lastN && !options.verbose) {
       // Don't re-render the line if it hasn't changed
       return;
     }
@@ -78,7 +76,7 @@ function Progress(runner, options) {
 
   // tests are complete, output some stats
   // and the failures if any
-  runner.on('end', function(){
+  runner.on('end', function() {
     cursor.show();
     console.log();
     self.epilogue();
@@ -88,5 +86,4 @@ function Progress(runner, options) {
 /**
  * Inherit from `Base.prototype`.
  */
-
-Progress.prototype.__proto__ = Base.prototype;
+inherits(Progress, Base);

package/lib/reporters/spec.js

@@ -2,9 +2,10 @@
  * Module dependencies.
  */
 
-var Base = require('./base')
-  , cursor = Base.cursor
-  , color = Base.color;
+var Base = require('./base');
+var inherits = require('../utils').inherits;
+var color = Base.color;
+var cursor = Base.cursor;
 
 /**
  * Expose `Spec`.
@@ -15,50 +16,51 @@ exports = module.exports = Spec;
 /**
  * Initialize a new `Spec` test reporter.
  *
- * @param {Runner} runner
  * @api public
+ * @param {Runner} runner
  */
-
 function Spec(runner) {
   Base.call(this, runner);
 
-  var self = this
-    , stats = this.stats
-    , indents = 0
-    , n = 0;
+  var self = this;
+  var indents = 0;
+  var n = 0;
 
   function indent() {
-    return Array(indents).join('  ')
+    return Array(indents).join('  ');
   }
 
-  runner.on('start', function(){
+  runner.on('start', function() {
     console.log();
   });
 
-  runner.on('suite', function(suite){
+  runner.on('suite', function(suite) {
     ++indents;
     console.log(color('suite', '%s%s'), indent(), suite.title);
   });
 
-  runner.on('suite end', function(suite){
+  runner.on('suite end', function() {
     --indents;
-    if (1 == indents) console.log();
+    if (indents === 1) {
+      console.log();
+    }
   });
 
-  runner.on('pending', function(test){
+  runner.on('pending', function(test) {
     var fmt = indent() + color('pending', '  - %s');
     console.log(fmt, test.title);
   });
 
-  runner.on('pass', function(test){
-    if ('fast' == test.speed) {
-      var fmt = indent()
+  runner.on('pass', function(test) {
+    var fmt;
+    if (test.speed === 'fast') {
+      fmt = indent()
         + color('checkmark', '  ' + Base.symbols.ok)
         + color('pass', ' %s');
       cursor.CR();
       console.log(fmt, test.title);
     } else {
-      var fmt = indent()
+      fmt = indent()
         + color('checkmark', '  ' + Base.symbols.ok)
         + color('pass', ' %s')
         + color(test.speed, ' (%dms)');
@@ -67,7 +69,7 @@ function Spec(runner) {
     }
   });
 
-  runner.on('fail', function(test, err){
+  runner.on('fail', function(test) {
     cursor.CR();
     console.log(indent() + color('fail', '  %d) %s'), ++n, test.title);
   });
@@ -78,5 +80,4 @@ function Spec(runner) {
 /**
  * Inherit from `Base.prototype`.
  */
-
-Spec.prototype.__proto__ = Base.prototype;
+inherits(Spec, Base);

package/lib/reporters/tap.js

@@ -2,9 +2,7 @@
  * Module dependencies.
  */
 
-var Base = require('./base')
-  , cursor = Base.cursor
-  , color = Base.color;
+var Base = require('./base');
 
 /**
  * Expose `TAP`.
@@ -15,44 +13,43 @@ exports = module.exports = TAP;
 /**
  * Initialize a new `TAP` reporter.
  *
- * @param {Runner} runner
  * @api public
+ * @param {Runner} runner
  */
-
 function TAP(runner) {
   Base.call(this, runner);
 
-  var self = this
-    , stats = this.stats
-    , n = 1
-    , passes = 0
-    , failures = 0;
+  var n = 1;
+  var passes = 0;
+  var failures = 0;
 
-  runner.on('start', function(){
+  runner.on('start', function() {
     var total = runner.grepTotal(runner.suite);
     console.log('%d..%d', 1, total);
   });
 
-  runner.on('test end', function(){
+  runner.on('test end', function() {
     ++n;
   });
 
-  runner.on('pending', function(test){
+  runner.on('pending', function(test) {
     console.log('ok %d %s # SKIP -', n, title(test));
   });
 
-  runner.on('pass', function(test){
+  runner.on('pass', function(test) {
     passes++;
     console.log('ok %d %s', n, title(test));
   });
 
-  runner.on('fail', function(test, err){
+  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, '  '));
+    if (err.stack) {
+      console.log(err.stack.replace(/^/gm, '  '));
+    }
   });
 
-  runner.on('end', function(){
+  runner.on('end', function() {
     console.log('# tests ' + (passes + failures));
     console.log('# pass ' + passes);
     console.log('# fail ' + failures);
@@ -62,11 +59,10 @@ function TAP(runner) {
 /**
  * Return a TAP-safe title of `test`
  *
+ * @api private
  * @param {Object} test
  * @return {String}
- * @api private
  */
-
 function title(test) {
   return test.fullTitle().replace(/#/g, '');
 }

package/lib/reporters/xunit.js

@@ -2,20 +2,23 @@
  * Module dependencies.
  */
 
-var Base = require('./base')
-  , utils = require('../utils')
-  , fs = require('fs')
-  , escape = utils.escape;
+var Base = require('./base');
+var utils = require('../utils');
+var inherits = utils.inherits;
+var fs = require('fs');
+var escape = utils.escape;
 
 /**
  * Save timer references to avoid Sinon interfering (see GH-237).
  */
 
-var Date = global.Date
-  , setTimeout = global.setTimeout
-  , setInterval = global.setInterval
-  , clearTimeout = global.clearTimeout
-  , clearInterval = global.clearInterval;
+/* 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`.
@@ -26,117 +29,134 @@ exports = module.exports = XUnit;
 /**
  * Initialize a new `XUnit` reporter.
  *
- * @param {Runner} runner
  * @api public
+ * @param {Runner} runner
  */
-
 function XUnit(runner, options) {
   Base.call(this, runner);
-  var stats = this.stats
-    , tests = []
-    , self = this;
+
+  var stats = this.stats;
+  var tests = [];
+  var self = this;
 
   if (options.reporterOptions && options.reporterOptions.output) {
-      if (! fs.createWriteStream) {
-          throw new Error('file output not supported in browser');
-      }
-      self.fileStream = fs.createWriteStream(options.reporterOptions.output);
+    if (!fs.createWriteStream) {
+      throw new Error('file output not supported in browser');
+    }
+    self.fileStream = fs.createWriteStream(options.reporterOptions.output);
   }
 
-  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.on('end', function(){
+  runner.on('end', function() {
     self.write(tag('testsuite', {
-        name: 'Mocha Tests'
-      , 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
+      name: 'Mocha Tests',
+      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) { self.test(t); });
+    tests.forEach(function(t) {
+      self.test(t);
+    });
+
     self.write('</testsuite>');
   });
 }
 
 /**
- * Override done to close the stream (if it's a file).
+ * Inherit from `Base.prototype`.
  */
-XUnit.prototype.done = function(failures, fn) {
-    if (this.fileStream) {
-        this.fileStream.end(function() {
-            fn(failures);
-        });
-    } else {
-        fn(failures);
-    }
-};
+inherits(XUnit, Base);
 
 /**
- * Inherit from `Base.prototype`.
+ * Override done to close the stream (if it's a file).
+ *
+ * @param failures
+ * @param {Function} fn
  */
-
-XUnit.prototype.__proto__ = Base.prototype;
+XUnit.prototype.done = function(failures, fn) {
+  if (this.fileStream) {
+    this.fileStream.end(function() {
+      fn(failures);
+    });
+  } else {
+    fn(failures);
+  }
+};
 
 /**
- * Write out the given line
+ * Write out the given line.
+ *
+ * @param {string} line
  */
 XUnit.prototype.write = function(line) {
-    if (this.fileStream) {
-        this.fileStream.write(line + '\n');
-    } else {
-        console.log(line);
-    }
+  if (this.fileStream) {
+    this.fileStream.write(line + '\n');
+  } else {
+    console.log(line);
+  }
 };
 
 /**
  * Output tag for the given `test.`
+ *
+ * @param {Test} test
  */
-
-XUnit.prototype.test = function(test, ostream) {
+XUnit.prototype.test = function(test) {
   var attrs = {
-      classname: test.parent.fullTitle()
-    , name: test.title
-    , time: (test.duration / 1000) || 0
+    classname: test.parent.fullTitle(),
+    name: test.title,
+    time: (test.duration / 1000) || 0
   };
 
-  if ('failed' == test.state) {
+  if (test.state === 'failed') {
     var err = test.err;
-    this.write(tag('testcase', attrs, false, tag('failure', {}, false, cdata(escape(err.message) + "\n" + err.stack))));
+    this.write(tag('testcase', attrs, false, tag('failure', {}, false, cdata(escape(err.message) + '\n' + err.stack))));
   } else if (test.pending) {
     this.write(tag('testcase', attrs, false, tag('skipped', {}, true)));
   } else {
-    this.write(tag('testcase', attrs, true) );
+    this.write(tag('testcase', attrs, true));
   }
 };
 
 /**
  * HTML tag helper.
+ *
+ * @param name
+ * @param attrs
+ * @param close
+ * @param content
+ * @return {string}
  */
-
 function tag(name, attrs, close, content) {
-  var end = close ? '/>' : '>'
-    , pairs = []
-    , tag;
+  var end = close ? '/>' : '>';
+  var pairs = [];
+  var tag;
 
   for (var key in attrs) {
-    pairs.push(key + '="' + escape(attrs[key]) + '"');
+    if (Object.prototype.hasOwnProperty.call(attrs, key)) {
+      pairs.push(key + '="' + escape(attrs[key]) + '"');
+    }
   }
 
   tag = '<' + name + (pairs.length ? ' ' + pairs.join(' ') : '') + end;
-  if (content) tag += content + '</' + name + end;
+  if (content) {
+    tag += content + '</' + name + end;
+  }
   return tag;
 }