mocha 3.0.2 → 3.2.0

package/lib/reporters/base.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Module dependencies.
  */
@@ -101,7 +103,7 @@ if (process.platform === 'win32') {
  * @return {string}
  * @api private
  */
-var color = exports.color = function(type, str) {
+var color = exports.color = function (type, str) {
   if (!exports.useColors) {
     return String(str);
   }
@@ -127,23 +129,23 @@ if (isatty) {
  */
 
 exports.cursor = {
-  hide: function() {
+  hide: function () {
     isatty && process.stdout.write('\u001b[?25l');
   },
 
-  show: function() {
+  show: function () {
     isatty && process.stdout.write('\u001b[?25h');
   },
 
-  deleteLine: function() {
+  deleteLine: function () {
     isatty && process.stdout.write('\u001b[2K');
   },
 
-  beginningOfLine: function() {
+  beginningOfLine: function () {
     isatty && process.stdout.write('\u001b[0G');
   },
 
-  CR: function() {
+  CR: function () {
     if (isatty) {
       exports.cursor.deleteLine();
       exports.cursor.beginningOfLine();
@@ -160,13 +162,13 @@ exports.cursor = {
  * @api public
  */
 
-exports.list = function(failures) {
+exports.list = function (failures) {
   console.log();
-  failures.forEach(function(test, i) {
+  failures.forEach(function (test, i) {
     // format
-    var fmt = color('error title', '  %s) %s:\n')
-      + color('error message', '     %s')
-      + color('error stack', '\n%s\n');
+    var fmt = color('error title', '  %s) %s:\n') +
+      color('error message', '     %s') +
+      color('error stack', '\n%s\n');
 
     // msg
     var msg;
@@ -236,7 +238,7 @@ exports.list = function(failures) {
  * @api public
  */
 
-function Base(runner) {
+function Base (runner) {
   var stats = this.stats = { suites: 0, tests: 0, passes: 0, pending: 0, failures: 0 };
   var failures = this.failures = [];
 
@@ -247,21 +249,21 @@ function Base(runner) {
 
   runner.stats = stats;
 
-  runner.on('start', function() {
+  runner.on('start', function () {
     stats.start = new Date();
   });
 
-  runner.on('suite', function(suite) {
+  runner.on('suite', function (suite) {
     stats.suites = stats.suites || 0;
     suite.root || stats.suites++;
   });
 
-  runner.on('test end', function() {
+  runner.on('test end', function () {
     stats.tests = stats.tests || 0;
     stats.tests++;
   });
 
-  runner.on('pass', function(test) {
+  runner.on('pass', function (test) {
     stats.passes = stats.passes || 0;
 
     if (test.duration > test.slow()) {
@@ -275,19 +277,19 @@ function Base(runner) {
     stats.passes++;
   });
 
-  runner.on('fail', function(test, err) {
+  runner.on('fail', function (test, err) {
     stats.failures = stats.failures || 0;
     stats.failures++;
     test.err = err;
     failures.push(test);
   });
 
-  runner.on('end', function() {
+  runner.on('end', function () {
     stats.end = new Date();
     stats.duration = new Date() - stats.start;
   });
 
-  runner.on('pending', function() {
+  runner.on('pending', function () {
     stats.pending++;
   });
 }
@@ -298,16 +300,16 @@ function Base(runner) {
  *
  * @api public
  */
-Base.prototype.epilogue = function() {
+Base.prototype.epilogue = function () {
   var stats = this.stats;
   var fmt;
 
   console.log();
 
   // passes
-  fmt = color('bright pass', ' ')
-    + color('green', ' %d passing')
-    + color('light', ' (%s)');
+  fmt = color('bright pass', ' ') +
+    color('green', ' %d passing') +
+    color('light', ' (%s)');
 
   console.log(fmt,
     stats.passes || 0,
@@ -315,8 +317,8 @@ Base.prototype.epilogue = function() {
 
   // pending
   if (stats.pending) {
-    fmt = color('pending', ' ')
-      + color('pending', ' %d pending');
+    fmt = color('pending', ' ') +
+      color('pending', ' %d pending');
 
     console.log(fmt, stats.pending);
   }
@@ -342,7 +344,7 @@ Base.prototype.epilogue = function() {
  * @param {string} len
  * @return {string}
  */
-function pad(str, len) {
+function pad (str, len) {
   str = String(str);
   return Array(len - str.length + 1).join(' ') + str;
 }
@@ -355,26 +357,26 @@ function pad(str, len) {
  * @param {boolean} escape
  * @return {string} Diff
  */
-function inlineDiff(err, escape) {
+function inlineDiff (err, escape) {
   var msg = errorDiff(err, 'WordsWithSpace', escape);
 
   // linenos
   var lines = msg.split('\n');
   if (lines.length > 4) {
     var width = String(lines.length).length;
-    msg = lines.map(function(str, i) {
+    msg = lines.map(function (str, i) {
       return pad(++i, width) + ' |' + ' ' + str;
     }).join('\n');
   }
 
   // legend
-  msg = '\n'
-    + color('diff removed', 'actual')
-    + ' '
-    + color('diff added', 'expected')
-    + '\n\n'
-    + msg
-    + '\n';
+  msg = '\n' +
+    color('diff removed', 'actual') +
+    ' ' +
+    color('diff added', 'expected') +
+    '\n\n' +
+    msg +
+    '\n';
 
   // indent
   msg = msg.replace(/^/gm, '      ');
@@ -389,9 +391,9 @@ function inlineDiff(err, escape) {
  * @param {boolean} escape
  * @return {string} The diff.
  */
-function unifiedDiff(err, escape) {
+function unifiedDiff (err, escape) {
   var indent = '      ';
-  function cleanUp(line) {
+  function cleanUp (line) {
     if (escape) {
       line = escapeInvisibles(line);
     }
@@ -401,7 +403,7 @@ function unifiedDiff(err, escape) {
     if (line[0] === '-') {
       return indent + colorLines('diff removed', line);
     }
-    if (line.match(/\@\@/)) {
+    if (line.match(/@@/)) {
       return null;
     }
     if (line.match(/\\ No newline/)) {
@@ -409,16 +411,16 @@ function unifiedDiff(err, escape) {
     }
     return indent + line;
   }
-  function notBlank(line) {
+  function notBlank (line) {
     return typeof line !== 'undefined' && line !== null;
   }
   var msg = diff.createPatch('string', err.actual, err.expected);
   var lines = msg.split('\n').splice(4);
-  return '\n      '
-    + colorLines('diff added', '+ expected') + ' '
-    + colorLines('diff removed', '- actual')
-    + '\n\n'
-    + lines.map(cleanUp).filter(notBlank).join('\n');
+  return '\n      ' +
+    colorLines('diff added', '+ expected') + ' ' +
+    colorLines('diff removed', '- actual') +
+    '\n\n' +
+    lines.map(cleanUp).filter(notBlank).join('\n');
 }
 
 /**
@@ -430,10 +432,10 @@ function unifiedDiff(err, escape) {
  * @param {boolean} escape
  * @return {string}
  */
-function errorDiff(err, type, escape) {
+function errorDiff (err, type, escape) {
   var actual = escape ? escapeInvisibles(err.actual) : err.actual;
   var expected = escape ? escapeInvisibles(err.expected) : err.expected;
-  return diff['diff' + type](actual, expected).map(function(str) {
+  return diff['diff' + type](actual, expected).map(function (str) {
     if (str.added) {
       return colorLines('diff added', str.value);
     }
@@ -451,7 +453,7 @@ function errorDiff(err, type, escape) {
  * @param {string} line
  * @return {string}
  */
-function escapeInvisibles(line) {
+function escapeInvisibles (line) {
   return line.replace(/\t/g, '<tab>')
     .replace(/\r/g, '<CR>')
     .replace(/\n/g, '<LF>\n');
@@ -465,8 +467,8 @@ function escapeInvisibles(line) {
  * @param {string} str
  * @return {string}
  */
-function colorLines(name, str) {
-  return str.split('\n').map(function(str) {
+function colorLines (name, str) {
+  return str.split('\n').map(function (str) {
     return color(name, str);
   }).join('\n');
 }
@@ -484,6 +486,6 @@ var objToString = Object.prototype.toString;
  * @param {Object} b
  * @return {boolean}
  */
-function sameType(a, b) {
+function sameType (a, b) {
   return objToString.call(a) === objToString.call(b);
 }

package/lib/reporters/doc.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Module dependencies.
  */
@@ -17,16 +19,16 @@ exports = module.exports = Doc;
  * @param {Runner} runner
  * @api public
  */
-function Doc(runner) {
+function Doc (runner) {
   Base.call(this, runner);
 
   var indents = 2;
 
-  function indent() {
+  function indent () {
     return Array(indents).join('  ');
   }
 
-  runner.on('suite', function(suite) {
+  runner.on('suite', function (suite) {
     if (suite.root) {
       return;
     }
@@ -37,7 +39,7 @@ function Doc(runner) {
     console.log('%s<dl>', indent());
   });
 
-  runner.on('suite end', function(suite) {
+  runner.on('suite end', function (suite) {
     if (suite.root) {
       return;
     }
@@ -47,13 +49,13 @@ function Doc(runner) {
     --indents;
   });
 
-  runner.on('pass', function(test) {
+  runner.on('pass', function (test) {
     console.log('%s  <dt>%s</dt>', indent(), utils.escape(test.title));
     var code = utils.escape(utils.clean(test.body));
     console.log('%s  <dd><pre><code>%s</code></pre></dd>', indent(), code);
   });
 
-  runner.on('fail', function(test, err) {
+  runner.on('fail', function (test, err) {
     console.log('%s  <dt class="error">%s</dt>', indent(), utils.escape(test.title));
     var code = utils.escape(utils.clean(test.body));
     console.log('%s  <dd class="error"><pre><code>%s</code></pre></dd>', indent(), code);

package/lib/reporters/dot.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Module dependencies.
  */
@@ -18,25 +20,25 @@ exports = module.exports = Dot;
  * @api public
  * @param {Runner} runner
  */
-function Dot(runner) {
+function Dot (runner) {
   Base.call(this, runner);
 
   var self = this;
-  var width = Base.window.width * .75 | 0;
+  var width = Base.window.width * 0.75 | 0;
   var n = -1;
 
-  runner.on('start', function() {
+  runner.on('start', function () {
     process.stdout.write('\n');
   });
 
-  runner.on('pending', function() {
+  runner.on('pending', function () {
     if (++n % width === 0) {
       process.stdout.write('\n  ');
     }
     process.stdout.write(color('pending', Base.symbols.comma));
   });
 
-  runner.on('pass', function(test) {
+  runner.on('pass', function (test) {
     if (++n % width === 0) {
       process.stdout.write('\n  ');
     }
@@ -47,14 +49,14 @@ function Dot(runner) {
     }
   });
 
-  runner.on('fail', function() {
+  runner.on('fail', function () {
     if (++n % width === 0) {
       process.stdout.write('\n  ');
     }
     process.stdout.write(color('fail', Base.symbols.bang));
   });
 
-  runner.on('end', function() {
+  runner.on('end', function () {
     console.log();
     self.epilogue();
   });

package/lib/reporters/html.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /* eslint-env browser */
 
 /**
@@ -32,12 +34,12 @@ exports = module.exports = HTML;
  * Stats template.
  */
 
-var statsTemplate = '<ul id="mocha-stats">'
-  + '<li class="progress"><canvas width="40" height="40"></canvas></li>'
-  + '<li class="passes"><a href="javascript:void(0);">passes:</a> <em>0</em></li>'
-  + '<li class="failures"><a href="javascript:void(0);">failures:</a> <em>0</em></li>'
-  + '<li class="duration">duration: <em>0</em>s</li>'
-  + '</ul>';
+var statsTemplate = '<ul id="mocha-stats">' +
+  '<li class="progress"><canvas width="40" height="40"></canvas></li>' +
+  '<li class="passes"><a href="javascript:void(0);">passes:</a> <em>0</em></li>' +
+  '<li class="failures"><a href="javascript:void(0);">failures:</a> <em>0</em></li>' +
+  '<li class="duration">duration: <em>0</em>s</li>' +
+  '</ul>';
 
 /**
  * Initialize a new `HTML` reporter.
@@ -45,7 +47,7 @@ var statsTemplate = '<ul id="mocha-stats">'
  * @api public
  * @param {Runner} runner
  */
-function HTML(runner) {
+function HTML (runner) {
   Base.call(this, runner);
 
   var self = this;
@@ -80,7 +82,7 @@ function HTML(runner) {
   }
 
   // pass toggle
-  on(passesLink, 'click', function(evt) {
+  on(passesLink, 'click', function (evt) {
     evt.preventDefault();
     unhide();
     var name = (/pass/).test(report.className) ? '' : ' pass';
@@ -91,7 +93,7 @@ function HTML(runner) {
   });
 
   // failure toggle
-  on(failuresLink, 'click', function(evt) {
+  on(failuresLink, 'click', function (evt) {
     evt.preventDefault();
     unhide();
     var name = (/fail/).test(report.className) ? '' : ' fail';
@@ -108,7 +110,7 @@ function HTML(runner) {
     progress.size(40);
   }
 
-  runner.on('suite', function(suite) {
+  runner.on('suite', function (suite) {
     if (suite.root) {
       return;
     }
@@ -123,7 +125,7 @@ function HTML(runner) {
     el.appendChild(stack[0]);
   });
 
-  runner.on('suite end', function(suite) {
+  runner.on('suite end', function (suite) {
     if (suite.root) {
       updateStats();
       return;
@@ -131,17 +133,17 @@ function HTML(runner) {
     stack.shift();
   });
 
-  runner.on('pass', function(test) {
+  runner.on('pass', function (test) {
     var url = self.testURL(test);
-    var markup = '<li class="test pass %e"><h2>%e<span class="duration">%ems</span> '
-      + '<a href="%s" class="replay">‣</a></h2></li>';
+    var markup = '<li class="test pass %e"><h2>%e<span class="duration">%ems</span> ' +
+      '<a href="%s" class="replay">‣</a></h2></li>';
     var el = fragment(markup, test.speed, test.title, test.duration, url);
     self.addCodeToggle(el, test.body);
     appendToStack(el);
     updateStats();
   });
 
-  runner.on('fail', function(test) {
+  runner.on('fail', function (test) {
     var el = fragment('<li class="test fail"><h2>%e <a href="%e" class="replay">‣</a></h2></li>',
       test.title, self.testURL(test));
     var stackString; // Note: Includes leading newline
@@ -181,20 +183,20 @@ function HTML(runner) {
     updateStats();
   });
 
-  runner.on('pending', function(test) {
+  runner.on('pending', function (test) {
     var el = fragment('<li class="test pass pending"><h2>%e</h2></li>', test.title);
     appendToStack(el);
     updateStats();
   });
 
-  function appendToStack(el) {
+  function appendToStack (el) {
     // Don't call .appendChild if #mocha-report was already .shift()'ed off the stack.
     if (stack[0]) {
       stack[0].appendChild(el);
     }
   }
 
-  function updateStats() {
+  function updateStats () {
     // TODO: add to stats
     var percent = stats.tests / runner.total * 100 | 0;
     if (progress) {
@@ -215,7 +217,7 @@ function HTML(runner) {
  * @param {string} s
  * @return {string} A new URL.
  */
-function makeUrl(s) {
+function makeUrl (s) {
   var search = window.location.search;
 
   // Remove previous grep query parameter if present
@@ -231,7 +233,7 @@ function makeUrl(s) {
  *
  * @param {Object} [suite]
  */
-HTML.prototype.suiteURL = function(suite) {
+HTML.prototype.suiteURL = function (suite) {
   return makeUrl(suite.fullTitle());
 };
 
@@ -240,7 +242,7 @@ HTML.prototype.suiteURL = function(suite) {
  *
  * @param {Object} [test]
  */
-HTML.prototype.testURL = function(test) {
+HTML.prototype.testURL = function (test) {
   return makeUrl(test.fullTitle());
 };
 
@@ -250,10 +252,10 @@ HTML.prototype.testURL = function(test) {
  * @param {HTMLLIElement} el
  * @param {string} contents
  */
-HTML.prototype.addCodeToggle = function(el, contents) {
+HTML.prototype.addCodeToggle = function (el, contents) {
   var h2 = el.getElementsByTagName('h2')[0];
 
-  on(h2, 'click', function() {
+  on(h2, 'click', function () {
     pre.style.display = pre.style.display === 'none' ? 'block' : 'none';
   });
 
@@ -267,7 +269,7 @@ HTML.prototype.addCodeToggle = function(el, contents) {
  *
  * @param {string} msg
  */
-function error(msg) {
+function error (msg) {
   document.body.appendChild(fragment('<div id="mocha-error">%s</div>', msg));
 }
 
@@ -276,12 +278,12 @@ function error(msg) {
  *
  * @param {string} html
  */
-function fragment(html) {
+function fragment (html) {
   var args = arguments;
   var div = document.createElement('div');
   var i = 1;
 
-  div.innerHTML = html.replace(/%([se])/g, function(_, type) {
+  div.innerHTML = html.replace(/%([se])/g, function (_, type) {
     switch (type) {
       case 's': return String(args[i++]);
       case 'e': return escape(args[i++]);
@@ -298,7 +300,7 @@ function fragment(html) {
  *
  * @param {text} classname
  */
-function hideSuitesWithout(classname) {
+function hideSuitesWithout (classname) {
   var suites = document.getElementsByClassName('suite');
   for (var i = 0; i < suites.length; i++) {
     var els = suites[i].getElementsByClassName(classname);
@@ -311,7 +313,7 @@ function hideSuitesWithout(classname) {
 /**
  * Unhide .hidden suites.
  */
-function unhide() {
+function unhide () {
   var els = document.getElementsByClassName('suite hidden');
   for (var i = 0; i < els.length; ++i) {
     els[i].className = els[i].className.replace('suite hidden', 'suite');
@@ -324,7 +326,7 @@ function unhide() {
  * @param {HTMLElement} el
  * @param {string} contents
  */
-function text(el, contents) {
+function text (el, contents) {
   if (el.textContent) {
     el.textContent = contents;
   } else {
@@ -335,7 +337,7 @@ function text(el, contents) {
 /**
  * Listen on `event` with callback `fn`.
  */
-function on(el, event, fn) {
+function on (el, event, fn) {
   if (el.addEventListener) {
     el.addEventListener(event, fn, false);
   } else {

package/lib/reporters/index.js

@@ -1,3 +1,5 @@
+'use strict';
+
 // Alias exports to a their normalized format Mocha#reporter to prevent a need
 // for dynamic (try/catch) requires, which Browserify doesn't handle.
 exports.Base = exports.base = require('./base');

package/lib/reporters/json-stream.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Module dependencies.
  */
@@ -17,28 +19,28 @@ exports = module.exports = List;
  * @api public
  * @param {Runner} runner
  */
-function List(runner) {
+function List (runner) {
   Base.call(this, runner);
 
   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]));
   });
 }
@@ -51,7 +53,7 @@ function List(runner) {
  * @param {Object} test
  * @return {Object}
  */
-function clean(test) {
+function clean (test) {
   return {
     title: test.title,
     fullTitle: test.fullTitle(),