mocha 2.2.5 → 2.3.3

package/lib/reporters/json-stream.js

@@ -2,8 +2,7 @@
  * Module dependencies.
  */
 
-var Base = require('./base')
-  , color = Base.color;
+var Base = require('./base');
 
 /**
  * Expose `List`.
@@ -14,32 +13,31 @@ exports = module.exports = List;
 /**
  * Initialize a new `List` test reporter.
  *
- * @param {Runner} runner
  * @api public
+ * @param {Runner} runner
  */
-
 function List(runner) {
   Base.call(this, runner);
 
-  var self = this
-    , stats = this.stats
-    , total = runner.total;
+  var self = this;
+  var total = runner.total;
 
-  runner.on('start', function(){
+  runner.on('start', function() {
     console.log(JSON.stringify(['start', { total: total }]));
   });
 
-  runner.on('pass', function(test){
+  runner.on('pass', function(test) {
     console.log(JSON.stringify(['pass', clean(test)]));
   });
 
-  runner.on('fail', function(test, err){
+  runner.on('fail', function(test, err) {
     test = clean(test);
     test.err = err.message;
+    test.stack = err.stack || null;
     console.log(JSON.stringify(['fail', test]));
   });
 
-  runner.on('end', function(){
+  runner.on('end', function() {
     process.stdout.write(JSON.stringify(['end', self.stats]));
   });
 }
@@ -48,15 +46,14 @@ function List(runner) {
  * Return a plain-object representation of `test`
  * free of cyclic properties etc.
  *
+ * @api private
  * @param {Object} test
  * @return {Object}
- * @api private
  */
-
 function clean(test) {
   return {
-      title: test.title
-    , fullTitle: test.fullTitle()
-    , duration: test.duration
-  }
+    title: test.title,
+    fullTitle: test.fullTitle(),
+    duration: test.duration
+  };
 }

package/lib/reporters/json.js

@@ -2,9 +2,7 @@
  * Module dependencies.
  */
 
-var Base = require('./base')
-  , cursor = Base.cursor
-  , color = Base.color;
+var Base = require('./base');
 
 /**
  * Expose `JSON`.
@@ -15,36 +13,35 @@ exports = module.exports = JSONReporter;
 /**
  * Initialize a new `JSON` reporter.
  *
- * @param {Runner} runner
  * @api public
+ * @param {Runner} runner
  */
-
 function JSONReporter(runner) {
-  var self = this;
   Base.call(this, runner);
 
-  var tests = []
-    , pending = []
-    , failures = []
-    , passes = [];
+  var self = this;
+  var tests = [];
+  var pending = [];
+  var failures = [];
+  var passes = [];
 
-  runner.on('test end', function(test){
+  runner.on('test end', function(test) {
     tests.push(test);
   });
 
-  runner.on('pass', function(test){
+  runner.on('pass', function(test) {
     passes.push(test);
   });
 
-  runner.on('fail', function(test){
+  runner.on('fail', function(test) {
     failures.push(test);
   });
 
-  runner.on('pending', function(test){
+  runner.on('pending', function(test) {
     pending.push(test);
   });
 
-  runner.on('end', function(){
+  runner.on('end', function() {
     var obj = {
       stats: self.stats,
       tests: tests.map(clean),
@@ -63,26 +60,26 @@ function JSONReporter(runner) {
  * Return a plain-object representation of `test`
  * free of cyclic properties etc.
  *
+ * @api private
  * @param {Object} test
  * @return {Object}
- * @api private
  */
-
 function clean(test) {
   return {
     title: test.title,
     fullTitle: test.fullTitle(),
     duration: test.duration,
     err: errorJSON(test.err || {})
-  }
+  };
 }
 
 /**
  * Transform `error` into a JSON object.
+ *
+ * @api private
  * @param {Error} err
  * @return {Object}
  */
-
 function errorJSON(err) {
   var res = {};
   Object.getOwnPropertyNames(err).forEach(function(key) {

package/lib/reporters/landing.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 cursor = Base.cursor;
+var color = Base.color;
 
 /**
  * Expose `Landing`.
@@ -33,56 +34,52 @@ Base.colors.runway = 90;
 /**
  * Initialize a new `Landing` reporter.
  *
- * @param {Runner} runner
  * @api public
+ * @param {Runner} runner
  */
-
 function Landing(runner) {
   Base.call(this, runner);
 
-  var self = this
-    , stats = this.stats
-    , width = Base.window.width * .75 | 0
-    , total = runner.total
-    , stream = process.stdout
-    , plane = color('plane', '✈')
-    , crashed = -1
-    , n = 0;
+  var self = this;
+  var width = Base.window.width * .75 | 0;
+  var total = runner.total;
+  var stream = process.stdout;
+  var plane = color('plane', '✈');
+  var crashed = -1;
+  var n = 0;
 
   function runway() {
     var buf = Array(width).join('-');
     return '  ' + color('runway', buf);
   }
 
-  runner.on('start', function(){
+  runner.on('start', function() {
     stream.write('\n\n\n  ');
     cursor.hide();
   });
 
-  runner.on('test end', function(test){
+  runner.on('test end', function(test) {
     // check if the plane crashed
-    var col = -1 == crashed
-      ? width * ++n / total | 0
-      : crashed;
+    var col = crashed === -1 ? width * ++n / total | 0 : crashed;
 
     // show the crash
-    if ('failed' == test.state) {
+    if (test.state === 'failed') {
       plane = color('plane crash', '✈');
       crashed = col;
     }
 
     // render landing strip
-    stream.write('\u001b['+(width+1)+'D\u001b[2A');
+    stream.write('\u001b[' + (width + 1) + 'D\u001b[2A');
     stream.write(runway());
     stream.write('\n  ');
     stream.write(color('runway', Array(col).join('⋅')));
-    stream.write(plane)
+    stream.write(plane);
     stream.write(color('runway', Array(width - col).join('⋅') + '\n'));
     stream.write(runway());
     stream.write('\u001b[0m');
   });
 
-  runner.on('end', function(){
+  runner.on('end', function() {
     cursor.show();
     console.log();
     self.epilogue();
@@ -92,5 +89,4 @@ function Landing(runner) {
 /**
  * Inherit from `Base.prototype`.
  */
-
-Landing.prototype.__proto__ = Base.prototype;
+inherits(Landing, Base);

package/lib/reporters/list.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 `List`.
@@ -15,40 +16,38 @@ exports = module.exports = List;
 /**
  * Initialize a new `List` test reporter.
  *
- * @param {Runner} runner
  * @api public
+ * @param {Runner} runner
  */
-
 function List(runner) {
   Base.call(this, runner);
 
-  var self = this
-    , stats = this.stats
-    , n = 0;
+  var self = this;
+  var n = 0;
 
-  runner.on('start', function(){
+  runner.on('start', function() {
     console.log();
   });
 
-  runner.on('test', function(test){
+  runner.on('test', function(test) {
     process.stdout.write(color('pass', '    ' + test.fullTitle() + ': '));
   });
 
-  runner.on('pending', function(test){
+  runner.on('pending', function(test) {
     var fmt = color('checkmark', '  -')
       + color('pending', ' %s');
     console.log(fmt, test.fullTitle());
   });
 
-  runner.on('pass', function(test){
-    var fmt = color('checkmark', '  '+Base.symbols.dot)
+  runner.on('pass', function(test) {
+    var fmt = color('checkmark', '  ' + Base.symbols.dot)
       + color('pass', ' %s: ')
       + color(test.speed, '%dms');
     cursor.CR();
     console.log(fmt, test.fullTitle(), test.duration);
   });
 
-  runner.on('fail', function(test, err){
+  runner.on('fail', function(test) {
     cursor.CR();
     console.log(color('fail', '  %d) %s'), ++n, test.fullTitle());
   });
@@ -59,5 +58,4 @@ function List(runner) {
 /**
  * Inherit from `Base.prototype`.
  */
-
-List.prototype.__proto__ = Base.prototype;
+inherits(List, Base);

package/lib/reporters/markdown.js

@@ -2,8 +2,8 @@
  * Module dependencies.
  */
 
-var Base = require('./base')
-  , utils = require('../utils');
+var Base = require('./base');
+var utils = require('../utils');
 
 /**
  * Constants
@@ -20,33 +20,28 @@ exports = module.exports = Markdown;
 /**
  * Initialize a new `Markdown` reporter.
  *
- * @param {Runner} runner
  * @api public
+ * @param {Runner} runner
  */
-
 function Markdown(runner) {
   Base.call(this, runner);
 
-  var self = this
-    , stats = this.stats
-    , level = 0
-    , buf = '';
+  var level = 0;
+  var buf = '';
 
   function title(str) {
     return Array(level).join('#') + ' ' + str;
   }
 
-  function indent() {
-    return Array(level).join('  ');
-  }
-
   function mapTOC(suite, obj) {
-    var ret = obj,
-        key = SUITE_PREFIX + suite.title;
+    var ret = obj;
+    var key = SUITE_PREFIX + suite.title;
+
     obj = obj[key] = obj[key] || { suite: suite };
-    suite.suites.forEach(function(suite){
+    suite.suites.forEach(function(suite) {
       mapTOC(suite, obj);
     });
+
     return ret;
   }
 
@@ -55,7 +50,9 @@ function Markdown(runner) {
     var buf = '';
     var link;
     for (var key in obj) {
-      if ('suite' == key) continue;
+      if (key === 'suite') {
+        continue;
+      }
       if (key !== SUITE_PREFIX) {
         link = ' - [' + key.substring(1) + ']';
         link += '(#' + utils.slug(obj[key].suite.fullTitle()) + ')\n';
@@ -73,18 +70,18 @@ function Markdown(runner) {
 
   generateTOC(runner.suite);
 
-  runner.on('suite', function(suite){
+  runner.on('suite', function(suite) {
     ++level;
     var slug = utils.slug(suite.fullTitle());
     buf += '<a name="' + slug + '"></a>' + '\n';
     buf += title(suite.title) + '\n';
   });
 
-  runner.on('suite end', function(suite){
+  runner.on('suite end', function() {
     --level;
   });
 
-  runner.on('pass', function(test){
+  runner.on('pass', function(test) {
     var code = utils.clean(test.fn.toString());
     buf += test.title + '.\n';
     buf += '\n```js\n';
@@ -92,7 +89,7 @@ function Markdown(runner) {
     buf += '```\n\n';
   });
 
-  runner.on('end', function(){
+  runner.on('end', function() {
     process.stdout.write('# TOC\n');
     process.stdout.write(generateTOC(runner.suite));
     process.stdout.write(buf);

package/lib/reporters/min.js

@@ -3,6 +3,7 @@
  */
 
 var Base = require('./base');
+var inherits = require('../utils').inherits;
 
 /**
  * Expose `Min`.
@@ -13,14 +14,13 @@ exports = module.exports = Min;
 /**
  * Initialize a new `Min` minimal test reporter (best used with --watch).
  *
- * @param {Runner} runner
  * @api public
+ * @param {Runner} runner
  */
-
 function Min(runner) {
   Base.call(this, runner);
 
-  runner.on('start', function(){
+  runner.on('start', function() {
     // clear screen
     process.stdout.write('\u001b[2J');
     // set cursor position
@@ -33,5 +33,4 @@ function Min(runner) {
 /**
  * Inherit from `Base.prototype`.
  */
-
-Min.prototype.__proto__ = Base.prototype;
+inherits(Min, Base);

package/lib/reporters/nyan.js

@@ -3,6 +3,7 @@
  */
 
 var Base = require('./base');
+var inherits = require('../utils').inherits;
 
 /**
  * Expose `Dot`.
@@ -19,50 +20,57 @@ exports = module.exports = NyanCat;
 
 function NyanCat(runner) {
   Base.call(this, runner);
-  var self = this
-    , stats = this.stats
-    , width = Base.window.width * .75 | 0
-    , rainbowColors = this.rainbowColors = self.generateColors()
-    , colorIndex = this.colorIndex = 0
-    , numerOfLines = this.numberOfLines = 4
-    , trajectories = this.trajectories = [[], [], [], []]
-    , nyanCatWidth = this.nyanCatWidth = 11
-    , trajectoryWidthMax = this.trajectoryWidthMax = (width - nyanCatWidth)
-    , scoreboardWidth = this.scoreboardWidth = 5
-    , tick = this.tick = 0
-    , n = 0;
-
-  runner.on('start', function(){
+
+  var self = this;
+  var width = Base.window.width * .75 | 0;
+  var nyanCatWidth = this.nyanCatWidth = 11;
+
+  this.colorIndex = 0;
+  this.numberOfLines = 4;
+  this.rainbowColors = self.generateColors();
+  this.scoreboardWidth = 5;
+  this.tick = 0;
+  this.trajectories = [[], [], [], []];
+  this.trajectoryWidthMax = (width - nyanCatWidth);
+
+  runner.on('start', function() {
     Base.cursor.hide();
     self.draw();
   });
 
-  runner.on('pending', function(test){
+  runner.on('pending', function() {
     self.draw();
   });
 
-  runner.on('pass', function(test){
+  runner.on('pass', function() {
     self.draw();
   });
 
-  runner.on('fail', function(test, err){
+  runner.on('fail', function() {
     self.draw();
   });
 
-  runner.on('end', function(){
+  runner.on('end', function() {
     Base.cursor.show();
-    for (var i = 0; i < self.numberOfLines; i++) write('\n');
+    for (var i = 0; i < self.numberOfLines; i++) {
+      write('\n');
+    }
     self.epilogue();
   });
 }
 
+/**
+ * Inherit from `Base.prototype`.
+ */
+inherits(NyanCat, Base);
+
 /**
  * Draw the nyan cat
  *
  * @api private
  */
 
-NyanCat.prototype.draw = function(){
+NyanCat.prototype.draw = function() {
   this.appendRainbow();
   this.drawScoreboard();
   this.drawRainbow();
@@ -77,7 +85,7 @@ NyanCat.prototype.draw = function(){
  * @api private
  */
 
-NyanCat.prototype.drawScoreboard = function(){
+NyanCat.prototype.drawScoreboard = function() {
   var stats = this.stats;
 
   function draw(type, n) {
@@ -100,13 +108,15 @@ NyanCat.prototype.drawScoreboard = function(){
  * @api private
  */
 
-NyanCat.prototype.appendRainbow = function(){
+NyanCat.prototype.appendRainbow = function() {
   var segment = this.tick ? '_' : '-';
   var rainbowified = this.rainbowify(segment);
 
   for (var index = 0; index < this.numberOfLines; index++) {
     var trajectory = this.trajectories[index];
-    if (trajectory.length >= this.trajectoryWidthMax) trajectory.shift();
+    if (trajectory.length >= this.trajectoryWidthMax) {
+      trajectory.shift();
+    }
     trajectory.push(rainbowified);
   }
 };
@@ -117,10 +127,10 @@ NyanCat.prototype.appendRainbow = function(){
  * @api private
  */
 
-NyanCat.prototype.drawRainbow = function(){
+NyanCat.prototype.drawRainbow = function() {
   var self = this;
 
-  this.trajectories.forEach(function(line, index) {
+  this.trajectories.forEach(function(line) {
     write('\u001b[' + self.scoreboardWidth + 'C');
     write(line.join(''));
     write('\n');
@@ -134,7 +144,6 @@ NyanCat.prototype.drawRainbow = function(){
  *
  * @api private
  */
-
 NyanCat.prototype.drawNyanCat = function() {
   var self = this;
   var startWidth = this.scoreboardWidth + this.trajectories[0].length;
@@ -153,7 +162,6 @@ NyanCat.prototype.drawNyanCat = function() {
   write(dist);
   padding = self.tick ? '_' : '__';
   var tail = self.tick ? '~' : '^';
-  var face;
   write(tail + '|' + padding + this.face() + ' ');
   write('\n');
 
@@ -168,8 +176,8 @@ NyanCat.prototype.drawNyanCat = function() {
 /**
  * Draw nyan cat face.
  *
- * @return {String}
  * @api private
+ * @return {string}
  */
 
 NyanCat.prototype.face = function() {
@@ -178,18 +186,17 @@ NyanCat.prototype.face = function() {
     return '( x .x)';
   } else if (stats.pending) {
     return '( o .o)';
-  } else if(stats.passes) {
+  } else if (stats.passes) {
     return '( ^ .^)';
-  } else {
-    return '( - .-)';
   }
+  return '( - .-)';
 };
 
 /**
  * Move cursor up `n`.
  *
- * @param {Number} n
  * @api private
+ * @param {number} n
  */
 
 NyanCat.prototype.cursorUp = function(n) {
@@ -199,8 +206,8 @@ NyanCat.prototype.cursorUp = function(n) {
 /**
  * Move cursor down `n`.
  *
- * @param {Number} n
  * @api private
+ * @param {number} n
  */
 
 NyanCat.prototype.cursorDown = function(n) {
@@ -210,11 +217,10 @@ NyanCat.prototype.cursorDown = function(n) {
 /**
  * Generate rainbow colors.
  *
- * @return {Array}
  * @api private
+ * @return {Array}
  */
-
-NyanCat.prototype.generateColors = function(){
+NyanCat.prototype.generateColors = function() {
   var colors = [];
 
   for (var i = 0; i < (6 * 7); i++) {
@@ -232,14 +238,14 @@ NyanCat.prototype.generateColors = function(){
 /**
  * Apply rainbow to the given `str`.
  *
- * @param {String} str
- * @return {String}
  * @api private
+ * @param {string} str
+ * @return {string}
  */
-
-NyanCat.prototype.rainbowify = function(str){
-  if (!Base.useColors)
+NyanCat.prototype.rainbowify = function(str) {
+  if (!Base.useColors) {
     return str;
+  }
   var color = this.rainbowColors[this.colorIndex % this.rainbowColors.length];
   this.colorIndex += 1;
   return '\u001b[38;5;' + color + 'm' + str + '\u001b[0m';
@@ -247,14 +253,9 @@ NyanCat.prototype.rainbowify = function(str){
 
 /**
  * Stdout helper.
+ *
+ * @param {string} string A message to write to stdout.
  */
-
 function write(string) {
   process.stdout.write(string);
 }
-
-/**
- * Inherit from `Base.prototype`.
- */
-
-NyanCat.prototype.__proto__ = Base.prototype;