mocha 3.0.2 → 3.2.0

package/bin/mocha

@@ -1,21 +1,22 @@
 #!/usr/bin/env node
 
+'use strict';
+
 /**
  * This tiny wrapper file checks for known node flags and appends them
  * when found, before invoking the "real" _mocha(1) executable.
  */
 
-var spawn = require('child_process').spawn,
-  path = require('path'),
-  fs = require('fs'),
-  getOptions = require('./options'),
-  args = [path.join(__dirname, '_mocha')];
+var spawn = require('child_process').spawn;
+var path = require('path');
+var getOptions = require('./options');
+var args = [path.join(__dirname, '_mocha')];
 
 // Load mocha.opts into process.argv
 // Must be loaded here to handle node-specific options
 getOptions();
 
-process.argv.slice(2).forEach(function(arg){
+process.argv.slice(2).forEach(function (arg) {
   var flag = arg.split('=')[0];
 
   switch (flag) {
@@ -26,6 +27,7 @@ process.argv.slice(2).forEach(function(arg){
     case 'debug':
     case '--debug':
     case '--debug-brk':
+    case '--inspect':
       args.unshift(arg);
       args.push('--no-timeouts');
       break;
@@ -46,19 +48,26 @@ process.argv.slice(2).forEach(function(arg){
       args.unshift(arg);
       break;
     default:
-      if (0 == arg.indexOf('--harmony')) args.unshift(arg);
-      else if (0 == arg.indexOf('--trace')) args.unshift(arg);
-      else if (0 == arg.indexOf('--icu-data-dir')) args.unshift(arg);
-      else if (0 == arg.indexOf('--max-old-space-size')) args.unshift(arg);
-      else if (0 == arg.indexOf('--preserve-symlinks')) args.unshift(arg);
-      else args.push(arg);
+      if (arg.indexOf('--harmony') === 0) {
+        args.unshift(arg);
+      } else if (arg.indexOf('--trace') === 0) {
+        args.unshift(arg);
+      } else if (arg.indexOf('--icu-data-dir') === 0) {
+        args.unshift(arg);
+      } else if (arg.indexOf('--max-old-space-size') === 0) {
+        args.unshift(arg);
+      } else if (arg.indexOf('--preserve-symlinks') === 0) {
+        args.unshift(arg);
+      } else {
+        args.push(arg);
+      }
       break;
   }
 });
 
 var proc = spawn(process.execPath, args, { stdio: 'inherit' });
 proc.on('exit', function (code, signal) {
-  process.on('exit', function(){
+  process.on('exit', function () {
     if (signal) {
       process.kill(process.pid, signal);
     } else {

package/bin/options.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Dependencies.
  */
@@ -14,17 +16,17 @@ module.exports = getOptions;
  * Get options.
  */
 
-function getOptions() {
-  var optsPath = process.argv.indexOf('--opts') !== -1
-        ? process.argv[process.argv.indexOf('--opts') + 1]
-        : 'test/mocha.opts';
+function getOptions () {
+  var optsPath = process.argv.indexOf('--opts') === -1
+    ? 'test/mocha.opts'
+    : process.argv[process.argv.indexOf('--opts') + 1];
 
   try {
     var opts = fs.readFileSync(optsPath, 'utf8')
       .replace(/\\\s/g, '%20')
       .split(/\s/)
       .filter(Boolean)
-      .map(function(value) {
+      .map(function (value) {
         return value.replace(/%20/g, ' ');
       });
 

package/browser-entry.js

@@ -1,3 +1,8 @@
+'use strict';
+
+/* eslint no-unused-vars: off */
+/* eslint-env commonjs */
+
 /**
  * Shim process.stdout.
  */
@@ -33,15 +38,17 @@ var originalOnerrorHandler = global.onerror;
  * Revert to original onerror handler if previously defined.
  */
 
-process.removeListener = function(e, fn){
-  if ('uncaughtException' == e) {
+process.removeListener = function (e, fn) {
+  if (e === 'uncaughtException') {
     if (originalOnerrorHandler) {
       global.onerror = originalOnerrorHandler;
     } else {
-      global.onerror = function() {};
+      global.onerror = function () {};
     }
     var i = Mocha.utils.indexOf(uncaughtExceptionHandlers, fn);
-    if (i != -1) { uncaughtExceptionHandlers.splice(i, 1); }
+    if (i !== -1) {
+      uncaughtExceptionHandlers.splice(i, 1);
+    }
   }
 };
 
@@ -49,9 +56,9 @@ process.removeListener = function(e, fn){
  * Implements uncaughtException listener.
  */
 
-process.on = function(e, fn){
-  if ('uncaughtException' == e) {
-    global.onerror = function(err, url, line){
+process.on = function (e, fn) {
+  if (e === 'uncaughtException') {
+    global.onerror = function (err, url, line) {
       fn(new Error(err + ' (' + url + ':' + line + ')'));
       return !mocha.allowUncaught;
     };
@@ -64,10 +71,10 @@ process.on = function(e, fn){
 // Ensure that this default UI does not expose its methods to the global scope.
 mocha.suite.removeAllListeners('pre-require');
 
-var immediateQueue = []
-  , immediateTimeout;
+var immediateQueue = [];
+var immediateTimeout;
 
-function timeslice() {
+function timeslice () {
   var immediateStart = new Date().getTime();
   while (immediateQueue.length && (new Date().getTime() - immediateStart) < 100) {
     immediateQueue.shift()();
@@ -83,7 +90,7 @@ function timeslice() {
  * High-performance override of Runner.immediately.
  */
 
-Mocha.Runner.immediately = function(callback) {
+Mocha.Runner.immediately = function (callback) {
   immediateQueue.push(callback);
   if (!immediateTimeout) {
     immediateTimeout = setTimeout(timeslice, 0);
@@ -95,7 +102,7 @@ Mocha.Runner.immediately = function(callback) {
  * This is useful when running tests in a browser because window.onerror will
  * only receive the 'message' attribute of the Error.
  */
-mocha.throwError = function(err) {
+mocha.throwError = function (err) {
   Mocha.utils.forEach(uncaughtExceptionHandlers, function (fn) {
     fn(err);
   });
@@ -107,7 +114,7 @@ mocha.throwError = function(err) {
  * Normally this would happen in Mocha.prototype.loadFiles.
  */
 
-mocha.ui = function(ui){
+mocha.ui = function (ui) {
   Mocha.prototype.ui.call(this, ui);
   this.suite.emit('pre-require', global, null, this);
   return this;
@@ -117,9 +124,15 @@ mocha.ui = function(ui){
  * Setup mocha with the given setting options.
  */
 
-mocha.setup = function(opts){
-  if ('string' == typeof opts) opts = { ui: opts };
-  for (var opt in opts) this[opt](opts[opt]);
+mocha.setup = function (opts) {
+  if (typeof opts === 'string') {
+    opts = { ui: opts };
+  }
+  for (var opt in opts) {
+    if (opts.hasOwnProperty(opt)) {
+      this[opt](opts[opt]);
+    }
+  }
   return this;
 };
 
@@ -127,22 +140,30 @@ mocha.setup = function(opts){
  * Run mocha, returning the Runner.
  */
 
-mocha.run = function(fn){
+mocha.run = function (fn) {
   var options = mocha.options;
   mocha.globals('location');
 
   var query = Mocha.utils.parseQuery(global.location.search || '');
-  if (query.grep) mocha.grep(query.grep);
-  if (query.fgrep) mocha.fgrep(query.fgrep);
-  if (query.invert) mocha.invert();
+  if (query.grep) {
+    mocha.grep(query.grep);
+  }
+  if (query.fgrep) {
+    mocha.fgrep(query.fgrep);
+  }
+  if (query.invert) {
+    mocha.invert();
+  }
 
-  return Mocha.prototype.run.call(mocha, function(err){
+  return Mocha.prototype.run.call(mocha, function (err) {
     // The DOM Document is not available in Web Workers.
     var document = global.document;
     if (document && document.getElementById('mocha') && options.noHighlighting !== true) {
       Mocha.utils.highlightTags('code');
     }
-    if (fn) fn(err);
+    if (fn) {
+      fn(err);
+    }
   });
 };
 

package/lib/browser/.eslintrc.yaml

@@ -0,0 +1,4 @@
+env:
+  node: false
+  browser: false
+  commonjs: true

package/lib/browser/debug.js

@@ -1,4 +1,7 @@
-/* eslint-disable no-unused-vars */
-module.exports = function(type) {
-  return function() {};
+'use strict';
+
+function noop () {}
+
+module.exports = function () {
+  return noop;
 };

package/lib/browser/events.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Module exports.
  */
@@ -16,7 +18,7 @@ var objToString = Object.prototype.toString;
  * @param {*} val The value to test.
  * @return {boolean} true if the value is an array, otherwise false.
  */
-function isArray(val) {
+function isArray (val) {
   return objToString.call(val) === '[object Array]';
 }
 
@@ -25,7 +27,7 @@ function isArray(val) {
  *
  * @api public
  */
-function EventEmitter() {}
+function EventEmitter () {}
 
 /**
  * Add a listener.
@@ -35,7 +37,7 @@ function EventEmitter() {}
  * @param {Function} fn Event handler.
  * @return {EventEmitter} Emitter instance.
  */
-EventEmitter.prototype.on = function(name, fn) {
+EventEmitter.prototype.on = function (name, fn) {
   if (!this.$events) {
     this.$events = {};
   }
@@ -61,10 +63,10 @@ EventEmitter.prototype.addListener = EventEmitter.prototype.on;
  * @param {Function} fn Event handler.
  * @return {EventEmitter} Emitter instance.
  */
-EventEmitter.prototype.once = function(name, fn) {
+EventEmitter.prototype.once = function (name, fn) {
   var self = this;
 
-  function on() {
+  function on () {
     self.removeListener(name, on);
     fn.apply(this, arguments);
   }
@@ -83,7 +85,7 @@ EventEmitter.prototype.once = function(name, fn) {
  * @param {Function} fn Event handler.
  * @return {EventEmitter} Emitter instance.
  */
-EventEmitter.prototype.removeListener = function(name, fn) {
+EventEmitter.prototype.removeListener = function (name, fn) {
   if (this.$events && this.$events[name]) {
     var list = this.$events[name];
 
@@ -121,7 +123,7 @@ EventEmitter.prototype.removeListener = function(name, fn) {
  * @param {string} name Event name.
  * @return {EventEmitter} Emitter instance.
  */
-EventEmitter.prototype.removeAllListeners = function(name) {
+EventEmitter.prototype.removeAllListeners = function (name) {
   if (name === undefined) {
     this.$events = {};
     return this;
@@ -141,7 +143,7 @@ EventEmitter.prototype.removeAllListeners = function(name) {
  * @param {string} name Event name.
  * @return {EventEmitter} Emitter instance.
  */
-EventEmitter.prototype.listeners = function(name) {
+EventEmitter.prototype.listeners = function (name) {
   if (!this.$events) {
     this.$events = {};
   }
@@ -164,7 +166,7 @@ EventEmitter.prototype.listeners = function(name) {
  * @param {string} name Event name.
  * @return {boolean} true if at least one handler was invoked, else false.
  */
-EventEmitter.prototype.emit = function(name) {
+EventEmitter.prototype.emit = function (name) {
   if (!this.$events) {
     return false;
   }

package/lib/browser/progress.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Expose `Progress`.
  */
@@ -7,7 +9,7 @@ module.exports = Progress;
 /**
  * Initialize a new `Progress` indicator.
  */
-function Progress() {
+function Progress () {
   this.percent = 0;
   this.size(0);
   this.fontSize(11);
@@ -21,7 +23,7 @@ function Progress() {
  * @param {number} size
  * @return {Progress} Progress instance.
  */
-Progress.prototype.size = function(size) {
+Progress.prototype.size = function (size) {
   this._size = size;
   return this;
 };
@@ -33,7 +35,7 @@ Progress.prototype.size = function(size) {
  * @param {string} text
  * @return {Progress} Progress instance.
  */
-Progress.prototype.text = function(text) {
+Progress.prototype.text = function (text) {
   this._text = text;
   return this;
 };
@@ -45,7 +47,7 @@ Progress.prototype.text = function(text) {
  * @param {number} size
  * @return {Progress} Progress instance.
  */
-Progress.prototype.fontSize = function(size) {
+Progress.prototype.fontSize = function (size) {
   this._fontSize = size;
   return this;
 };
@@ -56,7 +58,7 @@ Progress.prototype.fontSize = function(size) {
  * @param {string} family
  * @return {Progress} Progress instance.
  */
-Progress.prototype.font = function(family) {
+Progress.prototype.font = function (family) {
   this._font = family;
   return this;
 };
@@ -67,7 +69,7 @@ Progress.prototype.font = function(family) {
  * @param {number} n
  * @return {Progress} Progress instance.
  */
-Progress.prototype.update = function(n) {
+Progress.prototype.update = function (n) {
   this.percent = n;
   return this;
 };
@@ -78,7 +80,7 @@ Progress.prototype.update = function(n) {
  * @param {CanvasRenderingContext2d} ctx
  * @return {Progress} Progress instance.
  */
-Progress.prototype.draw = function(ctx) {
+Progress.prototype.draw = function (ctx) {
   try {
     var percent = Math.min(this.percent, 100);
     var size = this._size;

package/lib/browser/tty.js

@@ -1,8 +1,10 @@
-exports.isatty = function isatty() {
+'use strict';
+
+exports.isatty = function isatty () {
   return true;
 };
 
-exports.getWindowSize = function getWindowSize() {
+exports.getWindowSize = function getWindowSize () {
   if ('innerHeight' in global) {
     return [global.innerHeight, global.innerWidth];
   }

package/lib/context.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Module dependencies.
  */
@@ -15,7 +17,7 @@ module.exports = Context;
  *
  * @api private
  */
-function Context() {}
+function Context () {}
 
 /**
  * Set or get the context `Runnable` to `runnable`.
@@ -24,7 +26,7 @@ function Context() {}
  * @param {Runnable} runnable
  * @return {Context}
  */
-Context.prototype.runnable = function(runnable) {
+Context.prototype.runnable = function (runnable) {
   if (!arguments.length) {
     return this._runnable;
   }
@@ -39,7 +41,7 @@ Context.prototype.runnable = function(runnable) {
  * @param {number} ms
  * @return {Context} self
  */
-Context.prototype.timeout = function(ms) {
+Context.prototype.timeout = function (ms) {
   if (!arguments.length) {
     return this.runnable().timeout();
   }
@@ -54,7 +56,7 @@ Context.prototype.timeout = function(ms) {
  * @param {boolean} enabled
  * @return {Context} self
  */
-Context.prototype.enableTimeouts = function(enabled) {
+Context.prototype.enableTimeouts = function (enabled) {
   this.runnable().enableTimeouts(enabled);
   return this;
 };
@@ -66,7 +68,7 @@ Context.prototype.enableTimeouts = function(enabled) {
  * @param {number} ms
  * @return {Context} self
  */
-Context.prototype.slow = function(ms) {
+Context.prototype.slow = function (ms) {
   this.runnable().slow(ms);
   return this;
 };
@@ -77,7 +79,7 @@ Context.prototype.slow = function(ms) {
  * @api private
  * @return {Context} self
  */
-Context.prototype.skip = function() {
+Context.prototype.skip = function () {
   this.runnable().skip();
   return this;
 };
@@ -89,7 +91,7 @@ Context.prototype.skip = function() {
  * @param {number} n
  * @return {Context} self
  */
-Context.prototype.retries = function(n) {
+Context.prototype.retries = function (n) {
   if (!arguments.length) {
     return this.runnable().retries();
   }
@@ -103,8 +105,8 @@ Context.prototype.retries = function(n) {
  * @api private
  * @return {string}
  */
-Context.prototype.inspect = function() {
-  return JSON.stringify(this, function(key, val) {
+Context.prototype.inspect = function () {
+  return JSON.stringify(this, function (key, val) {
     return key === 'runnable' || key === 'test' ? undefined : val;
   }, 2);
 };

package/lib/hook.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Module dependencies.
  */
@@ -18,7 +20,7 @@ module.exports = Hook;
  * @param {Function} fn
  * @api private
  */
-function Hook(title, fn) {
+function Hook (title, fn) {
   Runnable.call(this, title, fn);
   this.type = 'hook';
 }
@@ -35,7 +37,7 @@ inherits(Hook, Runnable);
  * @return {Error}
  * @api public
  */
-Hook.prototype.error = function(err) {
+Hook.prototype.error = function (err) {
   if (!arguments.length) {
     err = this._error;
     this._error = null;

package/lib/interfaces/bdd.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Module dependencies.
  */
@@ -21,10 +23,10 @@ var Test = require('../test');
  *
  * @param {Suite} suite Root suite.
  */
-module.exports = function(suite) {
+module.exports = function (suite) {
   var suites = [suite];
 
-  suite.on('pre-require', function(context, file, mocha) {
+  suite.on('pre-require', function (context, file, mocha) {
     var common = require('./common')(suites, context, mocha);
 
     context.before = common.before;
@@ -38,7 +40,7 @@ module.exports = function(suite) {
      * and/or tests.
      */
 
-    context.describe = context.context = function(title, fn) {
+    context.describe = context.context = function (title, fn) {
       return common.suite.create({
         title: title,
         file: file,
@@ -50,7 +52,7 @@ module.exports = function(suite) {
      * Pending describe.
      */
 
-    context.xdescribe = context.xcontext = context.describe.skip = function(title, fn) {
+    context.xdescribe = context.xcontext = context.describe.skip = function (title, fn) {
       return common.suite.skip({
         title: title,
         file: file,
@@ -62,7 +64,7 @@ module.exports = function(suite) {
      * Exclusive suite.
      */
 
-    context.describe.only = function(title, fn) {
+    context.describe.only = function (title, fn) {
       return common.suite.only({
         title: title,
         file: file,
@@ -76,7 +78,7 @@ module.exports = function(suite) {
      * acting as a thunk.
      */
 
-    context.it = context.specify = function(title, fn) {
+    context.it = context.specify = function (title, fn) {
       var suite = suites[0];
       if (suite.isPending()) {
         fn = null;
@@ -91,7 +93,7 @@ module.exports = function(suite) {
      * Exclusive test-case.
      */
 
-    context.it.only = function(title, fn) {
+    context.it.only = function (title, fn) {
       return common.test.only(mocha, context.it(title, fn));
     };
 
@@ -99,14 +101,14 @@ module.exports = function(suite) {
      * Pending test case.
      */
 
-    context.xit = context.xspecify = context.it.skip = function(title) {
+    context.xit = context.xspecify = context.it.skip = function (title) {
       context.it(title);
     };
 
     /**
      * Number of attempts to retry.
      */
-    context.it.retries = function(n) {
+    context.it.retries = function (n) {
       context.retries(n);
     };
   });