mocha 2.2.5 → 2.3.3

package/bin/.eslintrc

@@ -0,0 +1,3 @@
+---
+rules:
+  no-process-exit: 0

package/bin/_mocha

@@ -58,7 +58,7 @@ var images = {
 program
   .version(JSON.parse(fs.readFileSync(__dirname + '/../package.json', 'utf8')).version)
   .usage('[debug] [options] [files]')
-  .option('-A, --async-only', "force all tests to take a callback (async)")
+  .option('-A, --async-only', "force all tests to take a callback (async) or return a promise")
   .option('-c, --colors', 'force enabling of colors')
   .option('-C, --no-colors', 'force disabling of colors')
   .option('-G, --growl', 'enable growl notification support')
@@ -81,15 +81,8 @@ program
   .option('--compilers <ext>:<module>,...', 'use the given module(s) to compile files', list, [])
   .option('--debug-brk', "enable node's debugger breaking on the first line")
   .option('--globals <names>', 'allow the given comma-delimited global [names]', list, [])
-  .option('--harmony', 'enable all harmony features (except typeof)')
   .option('--es_staging', 'enable all staged features')
-  .option('--harmony-collections', 'enable harmony collections (sets, maps, and weak maps)')
-  .option('--harmony-generators', 'enable harmony generators')
-  .option('--harmony-proxies', 'enable harmony proxies')
-  .option('--harmony_shipping', 'enable all shipped harmony fetaures (iojs)')
-  .option('--harmony_arrow_functions', 'enable "harmony arrow functions" (iojs)')
-  .option('--harmony_proxies', 'enable "harmony proxies" (iojs)')
-  .option('--harmony_classes', 'enable "harmony classes" (iojs)')
+  .option('--harmony<_classes,_generators,...>', 'all node --harmony* flags are available')
   .option('--inline-diffs', 'display actual/expected differences inline within each string')
   .option('--interfaces', 'display available interfaces')
   .option('--no-deprecation', 'silence deprecation warnings')
@@ -194,10 +187,13 @@ var reporterOptions = {};
 if (program.reporterOptions !== undefined) {
     program.reporterOptions.split(",").forEach(function(opt) {
         var L = opt.split("=");
-        if (L.length != 2) {
+        if (L.length > 2 || L.length === 0) {
             throw new Error("invalid reporter option '" + opt + "'");
+        } else if (L.length === 2) {
+            reporterOptions[L[0]] = L[1];
+        } else {
+            reporterOptions[L[0]] = true;
         }
-        reporterOptions[L[0]] = L[1];
     });
 }
 
@@ -389,13 +385,14 @@ if (program.watch) {
     }
   });
 
-  return;
-}
+} else {
 
 // load
 
-mocha.files = files;
-runner = mocha.run(program.exit ? exit : exitLater);
+  mocha.files = files;
+  runner = mocha.run(program.exit ? exit : exitLater);
+
+}
 
 function exitLater(code) {
   process.on('exit', function() { process.exit(code) })

package/bin/mocha

@@ -34,15 +34,7 @@ process.argv.slice(2).forEach(function(arg){
       args.unshift('--expose-gc');
       break;
     case '--gc-global':
-    case '--harmony':
     case '--es_staging':
-    case '--harmony-proxies':
-    case '--harmony-collections':
-    case '--harmony-generators':
-    case '--harmony_shipping':
-    case '--harmony_arrow_functions':
-    case '--harmony_proxies':
-    case '--harmony_classes':
     case '--no-deprecation':
     case '--prof':
     case '--throw-deprecation':
@@ -51,7 +43,9 @@ process.argv.slice(2).forEach(function(arg){
       args.unshift(arg);
       break;
     default:
-      if (0 == arg.indexOf('--trace')) args.unshift(arg);
+      if (0 == arg.indexOf('--harmony')) args.unshift(arg);
+      else if (0 == arg.indexOf('--trace')) args.unshift(arg);
+      else if (0 == arg.indexOf('--max-old-space-size')) args.unshift(arg);
       else args.push(arg);
       break;
   }
@@ -72,5 +66,4 @@ proc.on('exit', function (code, signal) {
 process.on('SIGINT', function () {
   proc.kill('SIGINT'); // calls runner.abort()
   proc.kill('SIGTERM'); // if that didn't work, we're probably in an infinite loop, so make it die.
-  process.kill(process.pid, 'SIGINT');
 });

package/bin/options.js

@@ -21,11 +21,12 @@ function getOptions() {
 
   try {
     var opts = fs.readFileSync(optsPath, 'utf8')
-          .trim()
-          .split(/\s+/)
-          .filter(function(value) {
-            return value ? true : false;
-          });
+      .replace(/\\\s/g, '%20')
+      .split(/\s/)
+      .filter(Boolean)
+      .map(function(value) {
+        return value.replace(/%20/g, ' ');
+      });
 
     process.argv = process.argv
       .slice(0, 2)

package/lib/browser/debug.js

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

package/lib/browser/events.js

@@ -5,11 +5,19 @@
 exports.EventEmitter = EventEmitter;
 
 /**
- * Check if `obj` is an array.
+ * Object#hasOwnProperty reference.
  */
+var objToString = Object.prototype.toString;
 
-function isArray(obj) {
-  return '[object Array]' == {}.toString.call(obj);
+/**
+ * Check if a value is an array.
+ *
+ * @api private
+ * @param {*} val The value to test.
+ * @return {boolean} true if the value is a boolean, otherwise false.
+ */
+function isArray(val) {
+  return objToString.call(val) === '[object Array]';
 }
 
 /**
@@ -17,16 +25,17 @@ function isArray(obj) {
  *
  * @api public
  */
-
-function EventEmitter(){};
+function EventEmitter() {}
 
 /**
- * Adds a listener.
+ * Add a listener.
  *
  * @api public
+ * @param {string} name Event name.
+ * @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 = {};
   }
@@ -48,15 +57,17 @@ EventEmitter.prototype.addListener = EventEmitter.prototype.on;
  * Adds a volatile listener.
  *
  * @api public
+ * @param {string} name Event name.
+ * @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);
-  };
+  }
 
   on.listener = fn;
   this.on(name, on);
@@ -65,12 +76,14 @@ EventEmitter.prototype.once = function (name, fn) {
 };
 
 /**
- * Removes a listener.
+ * Remove a listener.
  *
  * @api public
+ * @param {string} name Event name.
+ * @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];
 
@@ -102,12 +115,13 @@ EventEmitter.prototype.removeListener = function (name, fn) {
 };
 
 /**
- * Removes all listeners for an event.
+ * Remove all listeners for an event.
  *
  * @api public
+ * @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;
@@ -121,12 +135,13 @@ EventEmitter.prototype.removeAllListeners = function (name) {
 };
 
 /**
- * Gets all listeners for a certain event.
+ * Get all listeners for a given event.
  *
  * @api public
+ * @param {string} name Event name.
+ * @return {EventEmitter} Emitter instance.
  */
-
-EventEmitter.prototype.listeners = function (name) {
+EventEmitter.prototype.listeners = function(name) {
   if (!this.$events) {
     this.$events = {};
   }
@@ -143,12 +158,13 @@ EventEmitter.prototype.listeners = function (name) {
 };
 
 /**
- * Emits an event.
+ * Emit an event.
  *
  * @api public
+ * @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;
   }
@@ -159,9 +175,9 @@ EventEmitter.prototype.emit = function (name) {
     return false;
   }
 
-  var args = [].slice.call(arguments, 1);
+  var args = Array.prototype.slice.call(arguments, 1);
 
-  if ('function' == typeof handler) {
+  if (typeof handler === 'function') {
     handler.apply(this, args);
   } else if (isArray(handler)) {
     var listeners = handler.slice();

package/lib/browser/progress.js

@@ -7,7 +7,6 @@ module.exports = Progress;
 /**
  * Initialize a new `Progress` indicator.
  */
-
 function Progress() {
   this.percent = 0;
   this.size(0);
@@ -16,52 +15,48 @@ function Progress() {
 }
 
 /**
- * Set progress size to `n`.
+ * Set progress size to `size`.
  *
- * @param {Number} n
- * @return {Progress} for chaining
  * @api public
+ * @param {number} size
+ * @return {Progress} Progress instance.
  */
-
-Progress.prototype.size = function(n){
-  this._size = n;
+Progress.prototype.size = function(size) {
+  this._size = size;
   return this;
 };
 
 /**
- * Set text to `str`.
+ * Set text to `text`.
  *
- * @param {String} str
- * @return {Progress} for chaining
  * @api public
+ * @param {string} text
+ * @return {Progress} Progress instance.
  */
-
-Progress.prototype.text = function(str){
-  this._text = str;
+Progress.prototype.text = function(text) {
+  this._text = text;
   return this;
 };
 
 /**
- * Set font size to `n`.
+ * Set font size to `size`.
  *
- * @param {Number} n
- * @return {Progress} for chaining
  * @api public
+ * @param {number} size
+ * @return {Progress} Progress instance.
  */
-
-Progress.prototype.fontSize = function(n){
-  this._fontSize = n;
+Progress.prototype.fontSize = function(size) {
+  this._fontSize = size;
   return this;
 };
 
 /**
- * Set font `family`.
+ * Set font to `family`.
  *
- * @param {String} family
- * @return {Progress} for chaining
+ * @param {string} family
+ * @return {Progress} Progress instance.
  */
-
-Progress.prototype.font = function(family){
+Progress.prototype.font = function(family) {
   this._font = family;
   return this;
 };
@@ -69,11 +64,10 @@ Progress.prototype.font = function(family){
 /**
  * Update percentage to `n`.
  *
- * @param {Number} n
- * @return {Progress} for chaining
+ * @param {number} n
+ * @return {Progress} Progress instance.
  */
-
-Progress.prototype.update = function(n){
+Progress.prototype.update = function(n) {
   this.percent = n;
   return this;
 };
@@ -82,18 +76,17 @@ Progress.prototype.update = function(n){
  * Draw on `ctx`.
  *
  * @param {CanvasRenderingContext2d} ctx
- * @return {Progress} for chaining
+ * @return {Progress} Progress instance.
  */
-
-Progress.prototype.draw = function(ctx){
+Progress.prototype.draw = function(ctx) {
   try {
-    var percent = Math.min(this.percent, 100)
-      , size = this._size
-      , half = size / 2
-      , x = half
-      , y = half
-      , rad = half - 1
-      , fontSize = this._fontSize;
+    var percent = Math.min(this.percent, 100);
+    var size = this._size;
+    var half = size / 2;
+    var x = half;
+    var y = half;
+    var rad = half - 1;
+    var fontSize = this._fontSize;
 
     ctx.font = fontSize + 'px ' + this._font;
 
@@ -113,13 +106,12 @@ Progress.prototype.draw = function(ctx){
     ctx.stroke();
 
     // text
-    var text = this._text || (percent | 0) + '%'
-      , w = ctx.measureText(text).width;
+    var text = this._text || (percent | 0) + '%';
+    var w = ctx.measureText(text).width;
 
-    ctx.fillText(
-        text
-      , x - w / 2 + 1
-      , y + fontSize / 2 - 1);
-  } catch (ex) {} //don't fail if we can't render progress
+    ctx.fillText(text, x - w / 2 + 1, y + fontSize / 2 - 1);
+  } catch (err) {
+    // don't fail if we can't render progress
+  }
   return this;
 };

package/lib/browser/tty.js

@@ -1,12 +1,11 @@
-exports.isatty = function(){
+exports.isatty = function isatty() {
   return true;
 };
 
-exports.getWindowSize = function(){
+exports.getWindowSize = function getWindowSize() {
   if ('innerHeight' in global) {
     return [global.innerHeight, global.innerWidth];
-  } else {
-    // In a Web Worker, the DOM Window is not available.
-    return [640, 480];
   }
+  // In a Web Worker, the DOM Window is not available.
+  return [640, 480];
 };

package/lib/context.js

@@ -9,19 +9,19 @@ module.exports = Context;
  *
  * @api private
  */
-
-function Context(){}
+function Context() {}
 
 /**
  * Set or get the context `Runnable` to `runnable`.
  *
+ * @api private
  * @param {Runnable} runnable
  * @return {Context}
- * @api private
  */
-
-Context.prototype.runnable = function(runnable){
-  if (0 == arguments.length) return this._runnable;
+Context.prototype.runnable = function(runnable) {
+  if (!arguments.length) {
+    return this._runnable;
+  }
   this.test = this._runnable = runnable;
   return this;
 };
@@ -29,13 +29,14 @@ Context.prototype.runnable = function(runnable){
 /**
  * Set test timeout `ms`.
  *
- * @param {Number} ms
- * @return {Context} self
  * @api private
+ * @param {number} ms
+ * @return {Context} self
  */
-
-Context.prototype.timeout = function(ms){
-  if (arguments.length === 0) return this.runnable().timeout();
+Context.prototype.timeout = function(ms) {
+  if (!arguments.length) {
+    return this.runnable().timeout();
+  }
   this.runnable().timeout(ms);
   return this;
 };
@@ -43,26 +44,23 @@ Context.prototype.timeout = function(ms){
 /**
  * Set test timeout `enabled`.
  *
- * @param {Boolean} enabled
- * @return {Context} self
  * @api private
+ * @param {boolean} enabled
+ * @return {Context} self
  */
-
-Context.prototype.enableTimeouts = function (enabled) {
+Context.prototype.enableTimeouts = function(enabled) {
   this.runnable().enableTimeouts(enabled);
   return this;
 };
 
-
 /**
  * Set test slowness threshold `ms`.
  *
- * @param {Number} ms
- * @return {Context} self
  * @api private
+ * @param {number} ms
+ * @return {Context} self
  */
-
-Context.prototype.slow = function(ms){
+Context.prototype.slow = function(ms) {
   this.runnable().slow(ms);
   return this;
 };
@@ -70,26 +68,22 @@ Context.prototype.slow = function(ms){
 /**
  * Mark a test as skipped.
  *
- * @return {Context} self
  * @api private
+ * @return {Context} self
  */
-
-Context.prototype.skip = function(){
-    this.runnable().skip();
-    return this;
+Context.prototype.skip = function() {
+  this.runnable().skip();
+  return this;
 };
 
 /**
  * Inspect the context void of `._runnable`.
  *
- * @return {String}
  * @api private
+ * @return {string}
  */
-
-Context.prototype.inspect = function(){
-  return JSON.stringify(this, function(key, val){
-    if ('_runnable' == key) return;
-    if ('test' == key) return;
-    return val;
+Context.prototype.inspect = function() {
+  return JSON.stringify(this, function(key, val) {
+    return key === 'runnable' || key === 'test' ? undefined : val;
   }, 2);
 };

package/lib/hook.js

@@ -3,6 +3,7 @@
  */
 
 var Runnable = require('./runnable');
+var inherits = require('./utils').inherits;
 
 /**
  * Expose `Hook`.
@@ -17,7 +18,6 @@ module.exports = Hook;
  * @param {Function} fn
  * @api private
  */
-
 function Hook(title, fn) {
   Runnable.call(this, title, fn);
   this.type = 'hook';
@@ -26,8 +26,7 @@ function Hook(title, fn) {
 /**
  * Inherit from `Runnable.prototype`.
  */
-
-Hook.prototype.__proto__ = Runnable.prototype;
+inherits(Hook, Runnable);
 
 /**
  * Get or set the test `err`.
@@ -36,10 +35,9 @@ Hook.prototype.__proto__ = Runnable.prototype;
  * @return {Error}
  * @api public
  */
-
-Hook.prototype.error = function(err){
-  if (0 == arguments.length) {
-    var err = this._error;
+Hook.prototype.error = function(err) {
+  if (!arguments.length) {
+    err = this._error;
     this._error = null;
     return err;
   }