mocha 1.8.1 → 1.11.0

package/.travis.yml

@@ -1,5 +1,4 @@
 language: node_js
 node_js:
-  - 0.4
-  - 0.6
-  - 0.8
+  - 0.8
+  - 0.10

package/History.md

@@ -1,5 +1,48 @@
 
-1.8.1 / 2013-01-09 
+1.11.0 / 2013-06-12
+==================
+
+ * add --prof support
+ * add --harmony support
+ * add --harmony-generators support
+ * add "Uncaught " prefix to uncaught exceptions
+ * add web workers support
+ * add `suite.skip()`
+ * change to output # of pending / passing even on failures. Closes #872
+ * fix: prevent hooks from being called if we are bailing
+ * fix `this.timeout(0)`
+
+1.10.0 / 2013-05-21
+==================
+
+ * add add better globbing support for windows via `glob` module
+ * add support to pass through flags such as --debug-brk=1234. Closes #852
+ * add test.only, test.skip to qunit interface
+ * change to always use word-based diffs for now. Closes #733
+ * change `mocha init` tests.html to index.html
+ * fix `process` global leak in the browser
+ * fix: use resolve() instead of join() for --require
+ * fix: filterLeaks() condition to not consider indices in global object as leaks
+ * fix: restrict mocha.css styling to #mocha id
+ * fix: save timer references to avoid Sinon interfering in the browser build.
+
+1.9.0 / 2013-04-03
+==================
+
+  * add improved setImmediate implementation
+  * replace --ignore-leaks with --check-leaks
+  * change default of ignoreLeaks to true. Closes #791
+  * remove scrolling for HTML reporter
+  * fix retina support
+  * fix tmbundle, restrict to js scope
+
+1.8.2 / 2013-03-11
+==================
+
+  * add `setImmediate` support for 0.10.x
+  * fix mocha -w spinner on windows
+
+1.8.1 / 2013-01-09
 ==================
 
   * fix .bail() arity check causing it to default to true

package/Makefile

@@ -33,7 +33,7 @@ lib-cov:
 
 test: test-unit
 
-test-all: test-bdd test-tdd test-qunit test-exports test-unit test-grep test-jsapi test-compilers
+test-all: test-bdd test-tdd test-qunit test-exports test-unit test-grep test-jsapi test-compilers test-glob
 
 test-jsapi:
 	@node test/jsapi
@@ -42,6 +42,7 @@ test-unit:
 	@./bin/mocha \
 		--reporter $(REPORTER) \
 		test/acceptance/*.js \
+		--growl \
 		test/*.js
 
 test-compilers:
@@ -100,6 +101,9 @@ test-async-only:
 	  --async-only \
 	  test/acceptance/misc/asyncOnly
 
+test-glob:
+	@./test/acceptance/glob/glob.sh
+
 non-tty:
 	@./bin/mocha \
 		--reporter dot \

package/Readme.md

@@ -8,29 +8,117 @@
 
 ```
 
-project  : mocha
-repo age : 1 year, 3 months
-active   : 233 days
-commits  : 1034
-files    : 114
-authors  : 
-  451	TJ Holowaychuk          43.6%
-  389	Tj Holowaychuk          37.6%
-   31	Guillermo Rauch         3.0%
-   13	Attila Domokos          1.3%
-    8	Jo Liss                 0.8%
-    7	Nathan Rajlich          0.7%
-    6	James Carr              0.6%
-    6	Brendan Nee             0.6%
-    5	John Firebaugh          0.5%
-    5	Aaron Heckmann          0.5%
-    4	Joshua Krall            0.4%
-    4	Xavier Antoviaque       0.4%
-    4	hokaccha                0.4%
+ project  : mocha
+ repo age : 1 year, 7 months
+ active   : 272 days
+ commits  : 1116
+ files    : 123
+ 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%
 ```
 
 ## Links
 
   - [Google Group](http://groups.google.com/group/mochajs)
   - [Wiki](https://github.com/visionmedia/mocha/wiki)
-  - Mocha [Extensions and reporters](https://github.com/visionmedia/mocha/wiki)
+  - Mocha [Extensions and reporters](https://github.com/visionmedia/mocha/wiki)

package/_mocha.js

@@ -30,11 +30,11 @@ require.register = function (path, fn){
 require.relative = function (parent) {
     return function(p){
       if ('.' != p.charAt(0)) return require(p);
-      
+
       var path = parent.split('/')
         , segs = p.split('/');
       path.pop();
-      
+
       for (var i = 0; i < segs.length; i++) {
         var seg = segs[i];
         if ('..' == seg) path.pop();
@@ -50,9 +50,9 @@ require.register("browser/debug.js", function(module, exports, require){
 
 module.exports = function(type){
   return function(){
-    
   }
 };
+
 }); // module: browser/debug.js
 
 require.register("browser/diff.js", function(module, exports, require){
@@ -803,7 +803,6 @@ Hook.prototype.error = function(err){
   this._error = err;
 };
 
-
 }); // module: hook.js
 
 require.register("interfaces/bdd.js", function(module, exports, require){
@@ -817,7 +816,7 @@ var Suite = require('../suite')
 
 /**
  * BDD-style interface:
- * 
+ *
  *      describe('Array', function(){
  *        describe('#indexOf()', function(){
  *          it('should return -1 when not present', function(){
@@ -829,7 +828,7 @@ var Suite = require('../suite')
  *          });
  *        });
  *      });
- * 
+ *
  */
 
 module.exports = function(suite){
@@ -874,7 +873,7 @@ module.exports = function(suite){
      * and callback `fn` containing nested suites
      * and/or tests.
      */
-  
+
     context.describe = context.context = function(title, fn){
       var suite = Suite.create(suites[0], title);
       suites.unshift(suite);
@@ -954,19 +953,19 @@ var Suite = require('../suite')
 
 /**
  * TDD-style interface:
- * 
+ *
  *     exports.Array = {
  *       '#indexOf()': {
  *         'should return -1 when the value is not present': function(){
- *           
+ *
  *         },
  *
  *         'should return the correct index when the value is present': function(){
- *           
+ *
  *         }
  *       }
  *     };
- * 
+ *
  */
 
 module.exports = function(suite){
@@ -1004,6 +1003,7 @@ module.exports = function(suite){
     }
   }
 };
+
 }); // module: interfaces/exports.js
 
 require.register("interfaces/index.js", function(module, exports, require){
@@ -1026,33 +1026,33 @@ var Suite = require('../suite')
 
 /**
  * QUnit-style interface:
- * 
+ *
  *     suite('Array');
- *     
+ *
  *     test('#length', function(){
  *       var arr = [1,2,3];
  *       ok(arr.length == 3);
  *     });
- *     
+ *
  *     test('#indexOf()', function(){
  *       var arr = [1,2,3];
  *       ok(arr.indexOf(1) == 0);
  *       ok(arr.indexOf(2) == 1);
  *       ok(arr.indexOf(3) == 2);
  *     });
- *     
+ *
  *     suite('String');
- *     
+ *
  *     test('#length', function(){
  *       ok('foo'.length == 3);
  *     });
- * 
+ *
  */
 
 module.exports = function(suite){
   var suites = [suite];
 
-  suite.on('pre-require', function(context){
+  suite.on('pre-require', function(context, file, mocha){
 
     /**
      * Execute before running tests.
@@ -1089,11 +1089,21 @@ module.exports = function(suite){
     /**
      * Describe a "suite" with the given `title`.
      */
-  
+
     context.suite = function(title){
       if (suites.length > 1) suites.shift();
       var suite = Suite.create(suites[0], title);
       suites.unshift(suite);
+      return suite;
+    };
+
+    /**
+     * Exclusive test-case.
+     */
+
+    context.suite.only = function(title, fn){
+      var suite = context.suite(title, fn);
+      mocha.grep(suite.fullTitle());
     };
 
     /**
@@ -1103,7 +1113,26 @@ module.exports = function(suite){
      */
 
     context.test = function(title, fn){
-      suites[0].addTest(new Test(title, fn));
+      var test = new Test(title, fn);
+      suites[0].addTest(test);
+      return test;
+    };
+
+    /**
+     * Exclusive test-case.
+     */
+
+    context.test.only = function(title, fn){
+      var test = context.test(title, fn);
+      mocha.grep(test.fullTitle());
+    };
+
+    /**
+     * Pending test case.
+     */
+
+    context.test.skip = function(title){
+      context.test(title);
     };
   });
 };
@@ -1127,7 +1156,7 @@ var Suite = require('../suite')
  *          suiteSetup(function(){
  *
  *          });
- *          
+ *
  *          test('should return -1 when not present', function(){
  *
  *          });
@@ -1547,7 +1576,7 @@ Mocha.prototype.run = function(fn){
   var options = this.options;
   var runner = new exports.Runner(suite);
   var reporter = new this._reporter(runner);
-  runner.ignoreLeaks = options.ignoreLeaks;
+  runner.ignoreLeaks = false !== options.ignoreLeaks;
   runner.asyncOnly = options.asyncOnly;
   if (options.grep) runner.grep(options.grep, options.invert);
   if (options.globals) runner.globals(options.globals);
@@ -1708,7 +1737,7 @@ exports.colors = {
 /**
  * Default symbol map.
  */
- 
+
 exports.symbols = {
   ok: '✓',
   err: '✖',
@@ -1814,10 +1843,7 @@ exports.list = function(failures){
 
     // actual / expected diff
     if ('string' == typeof actual && 'string' == typeof expected) {
-      var len = Math.max(actual.length, expected.length);
-
-      if (len < 20) msg = errorDiff(err, 'Chars', escape);
-      else msg = errorDiff(err, 'Words', escape);
+      msg = errorDiff(err, 'Words', escape);
 
       // linenos
       var lines = msg.split('\n');
@@ -2332,8 +2358,6 @@ function HTML(runner, root) {
   });
 
   runner.on('test end', function(test){
-    window.scrollTo(0, document.body.scrollHeight);
-
     // TODO: add to stats
     var percent = stats.tests / this.total * 100 | 0;
     if (progress) progress.update(percent).draw(ctx);
@@ -3078,7 +3102,7 @@ exports = module.exports = Min;
 
 function Min(runner) {
   Base.call(this, runner);
-  
+
   runner.on('start', function(){
     // clear screen
     process.stdout.write('\u001b[2J');
@@ -3098,10 +3122,10 @@ F.prototype = Base.prototype;
 Min.prototype = new F;
 Min.prototype.constructor = Min;
 
+
 }); // module: reporters/min.js
 
 require.register("reporters/nyan.js", function(module, exports, require){
-
 /**
  * Module dependencies.
  */
@@ -3247,44 +3271,39 @@ NyanCat.prototype.drawRainbow = function(){
 NyanCat.prototype.drawNyanCat = function(status) {
   var self = this;
   var startWidth = this.scoreboardWidth + this.trajectories[0].length;
-
-  [0, 1, 2, 3].forEach(function(index) {
-    write('\u001b[' + startWidth + 'C');
-
-    switch (index) {
-      case 0:
-        write('_,------,');
-        write('\n');
-        break;
-      case 1:
-        var padding = self.tick ? '  ' : '   ';
-        write('_|' + padding + '/\\_/\\ ');
-        write('\n');
-        break;
-      case 2:
-        var padding = self.tick ? '_' : '__';
-        var tail = self.tick ? '~' : '^';
-        var face;
-        switch (status) {
-          case 'pass':
-            face = '( ^ .^)';
-            break;
-          case 'fail':
-            face = '( o .o)';
-            break;
-          default:
-            face = '( - .-)';
-        }
-        write(tail + '|' + padding + face + ' ');
-        write('\n');
-        break;
-      case 3:
-        var padding = self.tick ? ' ' : '  ';
-        write(padding + '""  "" ');
-        write('\n');
-        break;
-    }
-  });
+  var color = '\u001b[' + startWidth + 'C';
+  var padding = '';
+  
+  write(color);
+  write('_,------,');
+  write('\n');
+  
+  write(color);
+  padding = self.tick ? '  ' : '   ';
+  write('_|' + padding + '/\\_/\\ ');
+  write('\n');
+  
+  write(color);
+  padding = self.tick ? '_' : '__';
+  var tail = self.tick ? '~' : '^';
+  var face;
+  switch (status) {
+    case 'pass':
+      face = '( ^ .^)';
+      break;
+    case 'fail':
+      face = '( o .o)';
+      break;
+    default:
+      face = '( - .-)';
+  }
+  write(tail + '|' + padding + face + ' ');
+  write('\n');
+  
+  write(color);
+  padding = self.tick ? ' ' : '  ';
+  write(padding + '""  "" ');
+  write('\n');
 
   this.cursorUp(this.numberOfLines);
 };
@@ -3744,7 +3763,7 @@ function XUnit(runner) {
   runner.on('pass', function(test){
     tests.push(test);
   });
-  
+
   runner.on('fail', function(test){
     tests.push(test);
   });
@@ -3761,7 +3780,7 @@ function XUnit(runner) {
     }, false));
 
     tests.forEach(test);
-    console.log('</testsuite>');    
+    console.log('</testsuite>');
   });
 }
 
@@ -4063,8 +4082,7 @@ var EventEmitter = require('browser/events').EventEmitter
   , Test = require('./test')
   , utils = require('./utils')
   , filter = utils.filter
-  , keys = utils.keys
-  , noop = function(){};
+  , keys = utils.keys;
 
 /**
  * Non-enumerable globals.
@@ -4116,6 +4134,15 @@ function Runner(suite) {
   this.globals(this.globalProps().concat(['errno']));
 }
 
+/**
+ * Wrapper for setImmediate, process.nextTick, or browser polyfill.
+ *
+ * @param {Function} fn
+ * @api private
+ */
+
+Runner.immediately = global.setImmediate || process.nextTick;
+
 /**
  * Inherit from `EventEmitter.prototype`.
  */
@@ -4244,7 +4271,7 @@ Runner.prototype.fail = function(test, err){
   if ('string' == typeof err) {
     err = new Error('the string "' + err + '" was thrown, throw an Error :)');
   }
-  
+
   this.emit('fail', test, err);
 };
 
@@ -4301,7 +4328,7 @@ Runner.prototype.hook = function(name, fn){
     });
   }
 
-  process.nextTick(function(){
+  Runner.immediately(function(){
     next(0);
   });
 };
@@ -4544,14 +4571,16 @@ Runner.prototype.run = function(fn){
   var self = this
     , fn = fn || function(){};
 
+  function uncaught(err){
+    self.uncaught(err);
+  }
+
   debug('start');
 
   // callback
   this.on('end', function(){
     debug('end');
-    process.removeListener('uncaughtException', function(err){
-      self.uncaught(err);
-    });
+    process.removeListener('uncaughtException', uncaught);
     fn(self.failures);
   });
 
@@ -4563,9 +4592,7 @@ Runner.prototype.run = function(fn){
   });
 
   // uncaught exception
-  process.on('uncaughtException', function(err){
-    self.uncaught(err);
-  });
+  process.on('uncaughtException', uncaught);
 
   return this;
 };
@@ -4581,6 +4608,8 @@ Runner.prototype.run = function(fn){
 
 function filterLeaks(ok, globals) {
   return filter(globals, function(key){
+    // Firefox and Chrome exposes iframes as index inside the window object
+    if (/^d+/.test(key)) return false;
     var matched = filter(ok, function(ok){
       if (~ok.indexOf('*')) return 0 == key.indexOf(ok.split('*')[0]);
       // Opera and IE expose global variables for HTML element IDs (issue #243)
@@ -5003,7 +5032,7 @@ exports.indexOf = function(arr, obj, start){
 
 /**
  * Array#reduce (<=IE8)
- * 
+ *
  * @param {Array} array
  * @param {Function} fn
  * @param {Object} initial value