mocha 1.16.0 → 1.17.1

package/Readme.md

@@ -9,112 +9,160 @@
 ```
 
  project  : mocha
- repo age : 1 year, 7 months
- active   : 272 days
- commits  : 1116
- files    : 123
+ repo age : 2 years, 4 months ago
+ commits  : 1314
+ active   : 372 days
+ files    : 141
  authors  :
-   504  TJ Holowaychuk          45.2%
-   389  Tj Holowaychuk          34.9%
-    31  Guillermo Rauch         2.8%
-    13  Attila Domokos          1.2%
-     9  John Firebaugh          0.8%
-     8  Jo Liss                 0.7%
-     7  Nathan Rajlich          0.6%
-     6  James Carr              0.5%
-     6  Brendan Nee             0.5%
-     5  Aaron Heckmann          0.4%
-     4  hokaccha                0.4%
-     4  Xavier Antoviaque       0.4%
-     4  Joshua Krall            0.4%
-     3  Wil Moore III           0.3%
-     3  Jesse Dailey            0.3%
-     3  Nathan Bowser           0.3%
-     3  Tyson Tate              0.3%
-     3  Cory Thomas             0.3%
-     3  Ryunosuke SATO          0.3%
-     3  Paul Miller             0.3%
-     3  Ben Lindsey             0.3%
-     2  Forbes Lindesay         0.2%
-     2  Konstantin Käfer        0.2%
-     2  Brian Beck              0.2%
-     2  Merrick Christensen     0.2%
-     2  Michael Riley           0.2%
-     2  David Henderson         0.2%
-     2  Nathan Alderson         0.2%
-     2  Paul Armstrong          0.2%
-     2  Pete Hawkins            0.2%
-     2  Quang Van               0.2%
-     2  Raynos                  0.2%
-     2  Jonas Westerlund        0.2%
-     2  Domenic Denicola        0.2%
-     2  Shawn Krisman           0.2%
-     2  Simon Gaeremynck        0.2%
-     2  FARKAS Máté             0.2%
-     2  Timo Tijhof             0.2%
-     2  Justin DuJardin         0.2%
-     2  Juzer Ali               0.2%
-     2  Ian Storm Taylor        0.2%
-     2  Arian Stolwijk          0.2%
-     2  domenic                 0.2%
-     1  Richard Dingwall        0.1%
-     1  Russ Bradberry          0.1%
-     1  Sasha Koss              0.1%
-     1  Seiya Konno             0.1%
-     1  Standa Opichal          0.1%
-     1  Steve Mason             0.1%
-     1  Will Langstroth         0.1%
-     1  Yanis Wang              0.1%
-     1  Yuest Wang              0.1%
-     1  abrkn                   0.1%
-     1  airportyh               0.1%
-     1  fengmk2                 0.1%
-     1  tgautier@yahoo.com      0.1%
-     1  traleig1                0.1%
-     1  vlad                    0.1%
-     1  yuitest                 0.1%
-     1  Adam Crabtree           0.1%
-     1  Andreas Brekken         0.1%
-     1  Atsuya Takagi           0.1%
-     1  Austin Birch            0.1%
-     1  Bjørge Næss             0.1%
-     1  Brian Moore             0.1%
-     1  Bryan Donovan           0.1%
-     1  Casey Foster            0.1%
-     1  Corey Butler            0.1%
-     1  Dave McKenna            0.1%
-     1  Fedor Indutny           0.1%
-     1  Florian Margaine        0.1%
-     1  Frederico Silva         0.1%
-     1  Fredrik Lindin          0.1%
-     1  Gareth Murphy           0.1%
-     1  Gavin Mogan             0.1%
-     1  Greg Perkins            0.1%
-     1  Harry Brundage          0.1%
-     1  Herman Junge            0.1%
-     1  Ian Young               0.1%
-     1  Ivan                    0.1%
-     1  Jaakko Salonen          0.1%
-     1  Jakub Nešetřil          0.1%
-     1  James Bowes             0.1%
-     1  James Lal               0.1%
-     1  Jason Barry             0.1%
-     1  Javier Aranda           0.1%
-     1  Jeff Kunkle             0.1%
-     1  Jonathan Creamer        0.1%
-     1  Jussi Virtanen          0.1%
-     1  Katie Gengler           0.1%
-     1  Kazuhito Hokamura       0.1%
-     1  Koen Punt               0.1%
-     1  Laszlo Bacsi            0.1%
-     1  László Bácsi            0.1%
-     1  Maciej Małecki          0.1%
-     1  Matt Robenolt           0.1%
-     1  Matt Smith              0.1%
-     1  Matthew Shanley         0.1%
-     1  Michael Schoonmaker     0.1%
-     1  Phil Sung               0.1%
-     1  R56                     0.1%
+   582    TJ Holowaychuk          44.3%
+   389    Tj Holowaychuk          29.6%
+    46    Travis Jeffery          3.5%
+    31    Guillermo Rauch         2.4%
+    13    Attila Domokos          1.0%
+    10    John Firebaugh          0.8%
+     8    Jo Liss                 0.6%
+     7    Nathan Rajlich          0.5%
+     6    Mike Pennisi            0.5%
+     6    James Carr              0.5%
+     6    Brendan Nee             0.5%
+     5    Aaron Heckmann          0.4%
+     5    Ryunosuke SATO          0.4%
+     4    hokaccha                0.3%
+     4    Joshua Krall            0.3%
+     4    Xavier Antoviaque       0.3%
+     3    Jesse Dailey            0.2%
+     3    Forbes Lindesay         0.2%
+     3    Sindre Sorhus           0.2%
+     3    Cory Thomas             0.2%
+     3    Fredrik Enestad         0.2%
+     3    Ben Lindsey             0.2%
+     3    Tyson Tate              0.2%
+     3    Mathieu Desvé          0.2%
+     3    Valentin Agachi         0.2%
+     3    Wil Moore III           0.2%
+     3    Merrick Christensen     0.2%
+     3    eiji.ienaga             0.2%
+     3    fool2fish               0.2%
+     3    Nathan Bowser           0.2%
+     3    Paul Miller             0.2%
+     2    Juzer Ali               0.2%
+     2    Pete Hawkins            0.2%
+     2    Jonas Westerlund        0.2%
+     2    Arian Stolwijk          0.2%
+     2    Quang Van               0.2%
+     2    Glen Mailer             0.2%
+     2    Justin DuJardin         0.2%
+     2    FARKAS Máté           0.2%
+     2    Raynos                  0.2%
+     2    Michael Riley           0.2%
+     2    Michael Schoonmaker     0.2%
+     2    Domenic Denicola        0.2%
+     2    Simon Gaeremynck        0.2%
+     2    Konstantin Käfer      0.2%
+     2    domenic                 0.2%
+     2    Paul Armstrong          0.2%
+     2    fcrisci                 0.2%
+     2    Alexander Early         0.2%
+     2    Shawn Krisman           0.2%
+     2    Brian Beck              0.2%
+     2    Nathan Alderson         0.2%
+     2    David Henderson         0.2%
+     2    Timo Tijhof             0.2%
+     2    Ian Storm Taylor        0.2%
+     2    travis jeffery          0.2%
+     1    Matt Smith              0.1%
+     1    Matthew Shanley         0.1%
+     1    Nathan Black            0.1%
+     1    Phil Sung               0.1%
+     1    R56                     0.1%
+     1    Refael Ackermann        0.1%
+     1    Richard Dingwall        0.1%
+     1    Romain Prieto           0.1%
+     1    Roman Neuhauser         0.1%
+     1    Roman Shtylman          0.1%
+     1    Russ Bradberry          0.1%
+     1    Russell Munson          0.1%
+     1    Rustem Mustafin         0.1%
+     1    Salehen Shovon Rahman   0.1%
+     1    Sasha Koss              0.1%
+     1    Seiya Konno             0.1%
+     1    Simon Goumaz            0.1%
+     1    Standa Opichal          0.1%
+     1    Stephen Mathieson       0.1%
+     1    Steve Mason             0.1%
+     1    Tapiwa Kelvin           0.1%
+     1    Teddy Zeenny            0.1%
+     1    Tim Ehat                0.1%
+     1    Vadim Nikitin           0.1%
+     1    Victor Costan           0.1%
+     1    Will Langstroth         0.1%
+     1    Yanis Wang              0.1%
+     1    Yuest Wang              0.1%
+     1    abrkn                   0.1%
+     1    airportyh               0.1%
+     1    badunk                  0.1%
+     1    fengmk2                 0.1%
+     1    grasGendarme            0.1%
+     1    lodr                    0.1%
+     1    tgautier@yahoo.com      0.1%
+     1    traleig1                0.1%
+     1    vlad                    0.1%
+     1    yuitest                 0.1%
+     1    Adam Crabtree           0.1%
+     1    Andreas Brekken         0.1%
+     1    Andreas Lind Petersen   0.1%
+     1    Andrew Nesbitt          0.1%
+     1    Andrey Popp             0.1%
+     1    Arnaud Brousseau        0.1%
+     1    Atsuya Takagi           0.1%
+     1    Austin Birch            0.1%
+     1    Bjørge Næss           0.1%
+     1    Brian Lalor             0.1%
+     1    Brian M. Carlson        0.1%
+     1    Brian Moore             0.1%
+     1    Bryan Donovan           0.1%
+     1    Casey Foster            0.1%
+     1    ChrisWren               0.1%
+     1    Corey Butler            0.1%
+     1    Daniel Stockman         0.1%
+     1    Dave McKenna            0.1%
+     1    Di Wu                   0.1%
+     1    Dmitry Shirokov         0.1%
+     1    Fedor Indutny           0.1%
+     1    Florian Margaine        0.1%
+     1    Frederico Silva         0.1%
+     1    Fredrik Lindin          0.1%
+     1    Gareth Murphy           0.1%
+     1    Gavin Mogan             0.1%
+     1    Glen Huang              0.1%
+     1    Greg Perkins            0.1%
+     1    Harry Brundage          0.1%
+     1    Herman Junge            0.1%
+     1    Ian Young               0.1%
+     1    Ivan                    0.1%
+     1    JP Bochi                0.1%
+     1    Jaakko Salonen          0.1%
+     1    Jakub Nešetřil      0.1%
+     1    James Bowes             0.1%
+     1    James Lal               0.1%
+     1    Jason Barry             0.1%
+     1    Javier Aranda           0.1%
+     1    Jeff Kunkle             0.1%
+     1    Jeremy Martin           0.1%
+     1    Jimmy Cuadra            0.1%
+     1    Jonathan Creamer        0.1%
+     1    Jussi Virtanen          0.1%
+     1    Katie Gengler           0.1%
+     1    Kazuhito Hokamura       0.1%
+     1    Kirill Korolyov         0.1%
+     1    Koen Punt               0.1%
+     1    Laszlo Bacsi            0.1%
+     1    Liam Newman             0.1%
+     1    László Bácsi         0.1%
+     1    Maciej Małecki         0.1%
+     1    Mal Graty               0.1%
+     1    Marc Kuo                0.1%
+     1    Matt Robenolt           0.1%
 ```
 
 ## Links

package/bin/_mocha

@@ -296,6 +296,7 @@ if (program.sort) {
 
 // --watch
 
+var runner;
 if (program.watch) {
   console.log();
   hideCursor();
@@ -306,11 +307,18 @@ if (program.watch) {
   });
 
   var watchFiles = utils.files(cwd);
+  var runAgain = false;
 
   function loadAndRun() {
     try {
       mocha.files = files;
-      mocha.run(function(){});
+      runAgain = false;
+      runner = mocha.run(function(){
+        runner = null;
+        if (runAgain) {
+          rerun();
+        }
+      });
     } catch(e) {
       console.log(e.stack);
     }
@@ -324,12 +332,22 @@ if (program.watch) {
 
   loadAndRun();
 
-  utils.watch(watchFiles, function(){
+  function rerun() {
     purge();
     stop()
     mocha.suite = mocha.suite.clone();
+    mocha.suite.ctx = new Mocha.Context;
     mocha.ui(program.ui);
     loadAndRun();
+  }
+
+  utils.watch(watchFiles, function(){
+    runAgain = true;
+    if (runner) {
+      runner.abort();
+    } else {
+      rerun();
+    }
   });
 
   return;
@@ -338,7 +356,7 @@ if (program.watch) {
 // load
 
 mocha.files = files;
-var runner = mocha.run(program.exit ? process.exit : exitLater);
+runner = mocha.run(program.exit ? process.exit : exitLater);
 
 function exitLater(code) {
   process.on('exit', function() { process.exit(code) })
@@ -410,7 +428,9 @@ function lookupFiles(path, recursive) {
     if (exists(path + '.js')) {
       path += '.js'
     } else {
-      return glob.sync(path);
+      files = glob.sync(path);
+      if (!files.length) throw new Error("cannot resolve path (or pattern) '" + path + "'");
+      return files;
     }
   }
 

package/lib/browser/progress.js

@@ -1,4 +1,3 @@
-
 /**
  * Expose `Progress`.
  */
@@ -87,39 +86,40 @@ Progress.prototype.update = function(n){
  */
 
 Progress.prototype.draw = function(ctx){
-  var percent = Math.min(this.percent, 100)
-    , size = this._size
-    , half = size / 2
-    , x = half
-    , y = half
-    , rad = half - 1
-    , fontSize = this._fontSize;
-
-  ctx.font = fontSize + 'px ' + this._font;
-
-  var angle = Math.PI * 2 * (percent / 100);
-  ctx.clearRect(0, 0, size, size);
-
-  // outer circle
-  ctx.strokeStyle = '#9f9f9f';
-  ctx.beginPath();
-  ctx.arc(x, y, rad, 0, angle, false);
-  ctx.stroke();
-
-  // inner circle
-  ctx.strokeStyle = '#eee';
-  ctx.beginPath();
-  ctx.arc(x, y, rad - 1, 0, angle, true);
-  ctx.stroke();
-
-  // text
-  var text = this._text || (percent | 0) + '%'
-    , w = ctx.measureText(text).width;
-
-  ctx.fillText(
-      text
-    , x - w / 2 + 1
-    , y + fontSize / 2 - 1);
-
+  try {
+    var percent = Math.min(this.percent, 100)
+      , size = this._size
+      , half = size / 2
+      , x = half
+      , y = half
+      , rad = half - 1
+      , fontSize = this._fontSize;
+  
+    ctx.font = fontSize + 'px ' + this._font;
+  
+    var angle = Math.PI * 2 * (percent / 100);
+    ctx.clearRect(0, 0, size, size);
+  
+    // outer circle
+    ctx.strokeStyle = '#9f9f9f';
+    ctx.beginPath();
+    ctx.arc(x, y, rad, 0, angle, false);
+    ctx.stroke();
+  
+    // inner circle
+    ctx.strokeStyle = '#eee';
+    ctx.beginPath();
+    ctx.arc(x, y, rad - 1, 0, angle, true);
+    ctx.stroke();
+  
+    // text
+    var text = this._text || (percent | 0) + '%'
+      , 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
   return this;
 };

package/lib/mocha.js

@@ -73,6 +73,21 @@ function Mocha(options) {
   if (null != options.timeout) this.timeout(options.timeout);
   this.useColors(options.useColors)
   if (options.slow) this.slow(options.slow);
+
+  this.suite.on('pre-require', function (context) {
+    exports.afterEach = context.afterEach || context.teardown;
+    exports.after = context.after || context.suiteTeardown;
+    exports.beforeEach = context.beforeEach || context.setup;
+    exports.before = context.before || context.suiteSetup;
+    exports.describe = context.describe || context.suite;
+    exports.it = context.it || context.test;
+    exports.setup = context.setup || context.beforeEach;
+    exports.suiteSetup = context.suiteSetup || context.before;
+    exports.suiteTeardown = context.suiteTeardown || context.after;
+    exports.suite = context.suite || context.describe;
+    exports.teardown = context.teardown || context.afterEach;
+    exports.test = context.test || context.it;
+  });
 }
 
 /**

package/lib/reporters/base.js

@@ -5,7 +5,8 @@
 
 var tty = require('tty')
   , diff = require('diff')
-  , ms = require('../ms');
+  , ms = require('../ms')
+  , utils = require('../utils');
 
 /**
  * Save timer references to avoid Sinon interfering (see GH-237).
@@ -141,7 +142,7 @@ exports.cursor = {
       exports.cursor.deleteLine();
       exports.cursor.beginningOfLine();
     } else {
-      process.stdout.write('\n');
+      process.stdout.write('\r');
     }
   }
 };
@@ -179,15 +180,15 @@ exports.list = function(failures){
     // explicitly show diff
     if (err.showDiff && sameType(actual, expected)) {
       escape = false;
-      err.actual = actual = stringify(actual);
-      err.expected = expected = stringify(expected);
+      err.actual = actual = stringify(canonicalize(actual));
+      err.expected = expected = stringify(canonicalize(expected));
     }
 
     // actual / expected diff
     if ('string' == typeof actual && 'string' == typeof expected) {
       fmt = color('error title', '  %s) %s:\n%s') + color('error stack', '\n%s\n');
       var match = message.match(/^([^:]+): expected/);
-      msg = match ? '\n      ' + color('error message', match[1]) : '';
+      msg = '\n      ' + color('error message', match ? match[1] : msg);
 
       if (exports.inlineDiffs) {
         msg += inlineDiff(err, escape);
@@ -445,7 +446,7 @@ function colorLines(name, str) {
 /**
  * Stringify `obj`.
  *
- * @param {Mixed} obj
+ * @param {Object} obj
  * @return {String}
  * @api private
  */
@@ -455,6 +456,40 @@ function stringify(obj) {
   return JSON.stringify(obj, null, 2);
 }
 
+/**
+ * Return a new object that has the keys in sorted order.
+ * @param {Object} obj
+ * @return {Object}
+ * @api private
+ */
+
+ function canonicalize(obj, stack) {
+   stack = stack || [];
+
+   if (utils.indexOf(stack, obj) !== -1) return obj;
+
+   var canonicalizedObj;
+
+   if ('[object Array]' == {}.toString.call(obj)) {
+     stack.push(obj);
+     canonicalizedObj = utils.map(obj, function(item) {
+       return canonicalize(item, stack);
+     });
+     stack.pop();
+   } else if (typeof obj === 'object' && obj !== null) {
+     stack.push(obj);
+     canonicalizedObj = {};
+     utils.forEach(utils.keys(obj).sort(), function(key) {
+       canonicalizedObj[key] = canonicalize(obj[key], stack);
+     });
+     stack.pop();
+   } else {
+     canonicalizedObj = obj;
+   }
+
+   return canonicalizedObj;
+ }
+
 /**
  * Check that a / b have the same type.
  *
@@ -470,4 +505,3 @@ function sameType(a, b) {
   return a == b;
 }
 
-

package/lib/reporters/xunit.js

@@ -49,7 +49,7 @@ function XUnit(runner) {
   });
 
   runner.on('end', function(){
-    process.stdout.write(tag('testsuite', {
+    console.log(tag('testsuite', {
         name: 'Mocha Tests'
       , tests: stats.tests
       , failures: stats.failures
@@ -60,7 +60,7 @@ function XUnit(runner) {
     }, false));
 
     tests.forEach(test);
-    process.stdout.write('</testsuite>');
+    console.log('</testsuite>');
   });
 }
 
@@ -84,11 +84,11 @@ function test(test) {
   if ('failed' == test.state) {
     var err = test.err;
     attrs.message = escape(err.message);
-    process.stdout.write(tag('testcase', attrs, false, tag('failure', attrs, false, cdata(err.stack))));
+    console.log(tag('testcase', attrs, false, tag('failure', attrs, false, cdata(err.stack))));
   } else if (test.pending) {
-    process.stdout.write(tag('testcase', attrs, false, tag('skipped', {}, true)));
+    console.log(tag('testcase', attrs, false, tag('skipped', {}, true)));
   } else {
-    process.stdout.write(tag('testcase', attrs, true) );
+    console.log(tag('testcase', attrs, true) );
   }
 }
 

package/lib/runner.js

@@ -58,7 +58,7 @@ function Runner(suite) {
   this.on('test end', function(test){ self.checkGlobals(test); });
   this.on('hook end', function(hook){ self.checkGlobals(hook); });
   this.grep(/.*/);
-  this.globals(this.globalProps().concat(['errno']));
+  this.globals(this.globalProps().concat(extraGlobals()));
 }
 
 /**
@@ -168,10 +168,6 @@ Runner.prototype.checkGlobals = function(test){
     ok = ok.concat(test._allowedGlobals || []);
   }
 
-  // check length - 2 ('errno' and 'location' globals)
-  if (isNode && 1 == ok.length - globals.length) return;
-  else if (2 == ok.length - globals.length) return;
-
   if(this.prevGlobalsLength == globals.length) return;
   this.prevGlobalsLength = globals.length;
 
@@ -638,3 +634,28 @@ function filterLeaks(ok, globals) {
     return matched.length == 0 && (!global.navigator || 'onerror' !== key);
   });
 }
+
+/**
+ * Array of globals dependent on the environment.
+ *
+ * @return {Array}
+ * @api private
+ */
+
+ function extraGlobals() {
+  if (typeof(process) === 'object' &&
+      typeof(process.version) === 'string') {
+
+    var nodeVersion = process.version.split('.').reduce(function(a, v) {
+      return a << 8 | v;
+    });
+
+    // 'errno' was renamed to process._errno in v0.9.11.
+
+    if (nodeVersion < 0x00090B) {
+      return ['errno'];
+    }
+  }
+
+  return [];
+ }

package/lib/utils.js

@@ -43,6 +43,22 @@ exports.forEach = function(arr, fn, scope){
     fn.call(scope, arr[i], i);
 };
 
+/**
+ * Array#map (<=IE8)
+ *
+ * @param {Array} array
+ * @param {Function} fn
+ * @param {Object} scope
+ * @api private
+ */
+
+exports.map = function(arr, fn, scope){
+  var result = [];
+  for (var i = 0, l = arr.length; i < l; i++)
+    result.push(fn.call(scope, arr[i], i));
+  return result;
+};
+
 /**
  * Array#indexOf (<=IE8)
  *

package/mocha.js

@@ -604,7 +604,6 @@ require.register("browser/path.js", function(module, exports, require){
 }); // module: browser/path.js
 
 require.register("browser/progress.js", function(module, exports, require){
-
 /**
  * Expose `Progress`.
  */
@@ -693,40 +692,41 @@ Progress.prototype.update = function(n){
  */
 
 Progress.prototype.draw = function(ctx){
-  var percent = Math.min(this.percent, 100)
-    , size = this._size
-    , half = size / 2
-    , x = half
-    , y = half
-    , rad = half - 1
-    , fontSize = this._fontSize;
-
-  ctx.font = fontSize + 'px ' + this._font;
-
-  var angle = Math.PI * 2 * (percent / 100);
-  ctx.clearRect(0, 0, size, size);
-
-  // outer circle
-  ctx.strokeStyle = '#9f9f9f';
-  ctx.beginPath();
-  ctx.arc(x, y, rad, 0, angle, false);
-  ctx.stroke();
-
-  // inner circle
-  ctx.strokeStyle = '#eee';
-  ctx.beginPath();
-  ctx.arc(x, y, rad - 1, 0, angle, true);
-  ctx.stroke();
-
-  // text
-  var text = this._text || (percent | 0) + '%'
-    , w = ctx.measureText(text).width;
-
-  ctx.fillText(
-      text
-    , x - w / 2 + 1
-    , y + fontSize / 2 - 1);
-
+  try {
+    var percent = Math.min(this.percent, 100)
+      , size = this._size
+      , half = size / 2
+      , x = half
+      , y = half
+      , rad = half - 1
+      , fontSize = this._fontSize;
+  
+    ctx.font = fontSize + 'px ' + this._font;
+  
+    var angle = Math.PI * 2 * (percent / 100);
+    ctx.clearRect(0, 0, size, size);
+  
+    // outer circle
+    ctx.strokeStyle = '#9f9f9f';
+    ctx.beginPath();
+    ctx.arc(x, y, rad, 0, angle, false);
+    ctx.stroke();
+  
+    // inner circle
+    ctx.strokeStyle = '#eee';
+    ctx.beginPath();
+    ctx.arc(x, y, rad - 1, 0, angle, true);
+    ctx.stroke();
+  
+    // text
+    var text = this._text || (percent | 0) + '%'
+      , 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
   return this;
 };
 
@@ -1437,6 +1437,21 @@ function Mocha(options) {
   if (null != options.timeout) this.timeout(options.timeout);
   this.useColors(options.useColors)
   if (options.slow) this.slow(options.slow);
+
+  this.suite.on('pre-require', function (context) {
+    exports.afterEach = context.afterEach || context.teardown;
+    exports.after = context.after || context.suiteTeardown;
+    exports.beforeEach = context.beforeEach || context.setup;
+    exports.before = context.before || context.suiteSetup;
+    exports.describe = context.describe || context.suite;
+    exports.it = context.it || context.test;
+    exports.setup = context.setup || context.beforeEach;
+    exports.suiteSetup = context.suiteSetup || context.before;
+    exports.suiteTeardown = context.suiteTeardown || context.after;
+    exports.suite = context.suite || context.describe;
+    exports.teardown = context.teardown || context.afterEach;
+    exports.test = context.test || context.it;
+  });
 }
 
 /**
@@ -1840,7 +1855,8 @@ require.register("reporters/base.js", function(module, exports, require){
 
 var tty = require('browser/tty')
   , diff = require('browser/diff')
-  , ms = require('../ms');
+  , ms = require('../ms')
+  , utils = require('../utils');
 
 /**
  * Save timer references to avoid Sinon interfering (see GH-237).
@@ -1976,7 +1992,7 @@ exports.cursor = {
       exports.cursor.deleteLine();
       exports.cursor.beginningOfLine();
     } else {
-      process.stdout.write('\n');
+      process.stdout.write('\r');
     }
   }
 };
@@ -2014,15 +2030,15 @@ exports.list = function(failures){
     // explicitly show diff
     if (err.showDiff && sameType(actual, expected)) {
       escape = false;
-      err.actual = actual = stringify(actual);
-      err.expected = expected = stringify(expected);
+      err.actual = actual = stringify(canonicalize(actual));
+      err.expected = expected = stringify(canonicalize(expected));
     }
 
     // actual / expected diff
     if ('string' == typeof actual && 'string' == typeof expected) {
       fmt = color('error title', '  %s) %s:\n%s') + color('error stack', '\n%s\n');
       var match = message.match(/^([^:]+): expected/);
-      msg = match ? '\n      ' + color('error message', match[1]) : '';
+      msg = '\n      ' + color('error message', match ? match[1] : msg);
 
       if (exports.inlineDiffs) {
         msg += inlineDiff(err, escape);
@@ -2280,7 +2296,7 @@ function colorLines(name, str) {
 /**
  * Stringify `obj`.
  *
- * @param {Mixed} obj
+ * @param {Object} obj
  * @return {String}
  * @api private
  */
@@ -2290,6 +2306,40 @@ function stringify(obj) {
   return JSON.stringify(obj, null, 2);
 }
 
+/**
+ * Return a new object that has the keys in sorted order.
+ * @param {Object} obj
+ * @return {Object}
+ * @api private
+ */
+
+ function canonicalize(obj, stack) {
+   stack = stack || [];
+
+   if (utils.indexOf(stack, obj) !== -1) return obj;
+
+   var canonicalizedObj;
+
+   if ('[object Array]' == {}.toString.call(obj)) {
+     stack.push(obj);
+     canonicalizedObj = utils.map(obj, function(item) {
+       return canonicalize(item, stack);
+     });
+     stack.pop();
+   } else if (typeof obj === 'object' && obj !== null) {
+     stack.push(obj);
+     canonicalizedObj = {};
+     utils.forEach(utils.keys(obj).sort(), function(key) {
+       canonicalizedObj[key] = canonicalize(obj[key], stack);
+     });
+     stack.pop();
+   } else {
+     canonicalizedObj = obj;
+   }
+
+   return canonicalizedObj;
+ }
+
 /**
  * Check that a / b have the same type.
  *
@@ -2306,7 +2356,6 @@ function sameType(a, b) {
 }
 
 
-
 }); // module: reporters/base.js
 
 require.register("reporters/doc.js", function(module, exports, require){
@@ -3813,10 +3862,6 @@ function Spec(runner) {
     if (1 == indents) console.log();
   });
 
-  runner.on('test', function(test){
-    process.stdout.write(indent() + color('pass', '  ◦ ' + test.title + ': '));
-  });
-
   runner.on('pending', function(test){
     var fmt = indent() + color('pending', '  - %s');
     console.log(fmt, test.title);
@@ -4021,7 +4066,7 @@ function test(test) {
   var attrs = {
       classname: test.parent.fullTitle()
     , name: test.title
-    , time: test.duration / 1000
+    , time: (test.duration / 1000) || 0
   };
 
   if ('failed' == test.state) {
@@ -4211,6 +4256,16 @@ Runnable.prototype.resetTimeout = function(){
   }, ms);
 };
 
+/**
+ * Whitelist these globals for this test run
+ *
+ * @api private
+ */
+Runnable.prototype.globals = function(arr){
+  var self = this;
+  this._allowedGlobals = arr;
+};
+
 /**
  * Run the test and invoke `fn(err)`.
  *
@@ -4342,13 +4397,14 @@ module.exports = Runner;
 function Runner(suite) {
   var self = this;
   this._globals = [];
+  this._abort = false;
   this.suite = suite;
   this.total = suite.total();
   this.failures = 0;
   this.on('test end', function(test){ self.checkGlobals(test); });
   this.on('hook end', function(hook){ self.checkGlobals(hook); });
   this.grep(/.*/);
-  this.globals(this.globalProps().concat(['errno']));
+  this.globals(this.globalProps().concat(extraGlobals()));
 }
 
 /**
@@ -4453,13 +4509,14 @@ Runner.prototype.globals = function(arr){
 Runner.prototype.checkGlobals = function(test){
   if (this.ignoreLeaks) return;
   var ok = this._globals;
+
   var globals = this.globalProps();
   var isNode = process.kill;
   var leaks;
 
-  // check length - 2 ('errno' and 'location' globals)
-  if (isNode && 1 == ok.length - globals.length) return;
-  else if (2 == ok.length - globals.length) return;
+  if (test) {
+    ok = ok.concat(test._allowedGlobals || []);
+  }
 
   if(this.prevGlobalsLength == globals.length) return;
   this.prevGlobalsLength = globals.length;
@@ -4500,12 +4557,12 @@ Runner.prototype.fail = function(test, err){
  * - If bail, then exit
  * - Failed `before` hook skips all tests in a suite and subsuites,
  *   but jumps to corresponding `after` hook
- * - Failed `before each` hook skips remaining tests in a 
+ * - Failed `before each` hook skips remaining tests in a
  *   suite and jumps to corresponding `after each` hook,
  *   which is run only once
  * - Failed `after` hook does not alter
  *   execution order
- * - Failed `after each` hook skips remaining tests in a 
+ * - Failed `after each` hook skips remaining tests in a
  *   suite and subsuites, but executes other `after each`
  *   hooks
  *
@@ -4554,7 +4611,7 @@ Runner.prototype.hook = function(name, fn){
       var testError = hook.error();
       if (testError) self.fail(self.test, testError);
       if (err) {
-        self.failHook(hook, err); 
+        self.failHook(hook, err);
 
         // stop executing hooks, notify callee of hook err
         return fn(err);
@@ -4692,7 +4749,7 @@ Runner.prototype.runTests = function(suite, fn){
     // for failed 'after each' hook start from errSuite parent,
     // otherwise start from errSuite itself
     self.suite = after ? errSuite.parent : errSuite;
-    
+
     if (self.suite) {
       // call hookUp afterEach
       self.hookUp('afterEach', function(err2, errSuite2) {
@@ -4703,7 +4760,7 @@ Runner.prototype.runTests = function(suite, fn){
         fn(errSuite);
       });
     } else {
-      // there is no need calling other 'after each' hooks 
+      // there is no need calling other 'after each' hooks
       self.suite = orig;
       fn(errSuite);
     }
@@ -4713,6 +4770,8 @@ Runner.prototype.runTests = function(suite, fn){
     // if we bail after first err
     if (self.failures && suite._bail) return fn();
 
+    if (self._abort) return fn();
+
     if (err) return hookErr(err, errSuite, true);
 
     // next test
@@ -4795,6 +4854,8 @@ Runner.prototype.runSuite = function(suite, fn){
       }
     }
 
+    if (self._abort) return done();
+
     var curr = suite.suites[i++];
     if (!curr) return done();
     self.runSuite(curr, next);
@@ -4879,6 +4940,17 @@ Runner.prototype.run = function(fn){
   return this;
 };
 
+/**
+ * Cleanly abort execution
+ *
+ * @return {Runner} for chaining
+ * @api public
+ */
+Runner.prototype.abort = function(){
+  debug('aborting');
+  this._abort = true;
+}
+
 /**
  * Filter leaks with the given globals flagged as `ok`.
  *
@@ -4913,6 +4985,31 @@ function filterLeaks(ok, globals) {
   });
 }
 
+/**
+ * Array of globals dependent on the environment.
+ *
+ * @return {Array}
+ * @api private
+ */
+
+ function extraGlobals() {
+  if (typeof(process) === 'object' &&
+      typeof(process.version) === 'string') {
+
+    var nodeVersion = process.version.split('.').reduce(function(a, v) {
+      return a << 8 | v;
+    });
+
+    // 'errno' was renamed to process._errno in v0.9.11.
+
+    if (nodeVersion < 0x00090B) {
+      return ['errno'];
+    }
+  }
+
+  return [];
+ }
+
 }); // module: runner.js
 
 require.register("suite.js", function(module, exports, require){
@@ -5305,6 +5402,22 @@ exports.forEach = function(arr, fn, scope){
     fn.call(scope, arr[i], i);
 };
 
+/**
+ * Array#map (<=IE8)
+ *
+ * @param {Array} array
+ * @param {Function} fn
+ * @param {Object} scope
+ * @api private
+ */
+
+exports.map = function(arr, fn, scope){
+  var result = [];
+  for (var i = 0, l = arr.length; i < l; i++)
+    result.push(fn.call(scope, arr[i], i));
+  return result;
+};
+
 /**
  * Array#indexOf (<=IE8)
  *
@@ -5454,11 +5567,13 @@ exports.slug = function(str){
 
 exports.clean = function(str) {
   str = str
+    .replace(/\r\n?|[\n\u2028\u2029]/g, "\n").replace(/^\uFEFF/, '')
     .replace(/^function *\(.*\) *{/, '')
     .replace(/\s+\}$/, '');
 
-  var whitespace = str.match(/^\n?(\s*)/)[1]
-    , re = new RegExp('^' + whitespace, 'gm');
+  var spaces = str.match(/^\n?( *)/)[1].length
+    , tabs = str.match(/^\n?(\t*)/)[1].length
+    , re = new RegExp('^\n?' + (tabs ? '\t' : ' ') + '{' + (tabs ? tabs : spaces) + '}', 'gm');
 
   str = str.replace(re, '');
 
@@ -5578,9 +5693,8 @@ var uncaughtExceptionHandlers = [];
 process.removeListener = function(e, fn){
   if ('uncaughtException' == e) {
     global.onerror = function() {};
-
-    var indexOfFn = uncaughtExceptionHandlers.indexOf(fn);
-    if (indexOfFn != -1) { uncaughtExceptionHandlers.splice(indexOfFn, 1); }
+    var i = Mocha.utils.indexOf(uncaughtExceptionHandlers, fn);
+    if (i != -1) { uncaughtExceptionHandlers.splice(i, 1); }
   }
 };
 
@@ -5592,6 +5706,7 @@ process.on = function(e, fn){
   if ('uncaughtException' == e) {
     global.onerror = function(err, url, line){
       fn(new Error(err + ' (' + url + ':' + line + ')'));
+      return true;
     };
     uncaughtExceptionHandlers.push(fn);
   }
@@ -5604,6 +5719,11 @@ process.on = function(e, fn){
 var Mocha = global.Mocha = require('mocha'),
     mocha = global.mocha = new Mocha({ reporter: 'html' });
 
+// The BDD UI is registered by default, but no UI will be functional in the
+// browser without an explicit call to the overridden `mocha.ui` (see below).
+// Ensure that this default UI does not expose its methods to the global scope.
+mocha.suite.removeAllListeners('pre-require');
+
 var immediateQueue = []
   , immediateTimeout;
 
@@ -5636,7 +5756,7 @@ Mocha.Runner.immediately = function(callback) {
  * only receive the 'message' attribute of the Error.
  */
 mocha.throwError = function(err) {
-  uncaughtExceptionHandlers.forEach(function (fn) {
+  Mocha.utils.forEach(uncaughtExceptionHandlers, function (fn) {
     fn(err);
   });
   throw err;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mocha",
-  "version": "1.16.0",
+  "version": "1.17.1",
   "description": "simple, flexible, fun test framework",
   "keywords": [
     "mocha",