mocha 2.2.0 → 2.2.5

package/README.md

@@ -4,219 +4,6 @@
 
   Mocha is a simple, flexible, fun JavaScript test framework for node.js and the browser. For more information view the [documentation](http://mochajs.org).
 
-## Contributors
-
-```
- project  : mocha
- repo age : 3 years, 4 months
- active   : 509 days
- commits  : 1575
- files    : 153
- authors  :
-   977	TJ Holowaychuk          62.0%
-   132	Travis Jeffery          8.4%
-    63	Christopher Hiller      4.0%
-    31	Guillermo Rauch         2.0%
-    27	Joshua Appelman         1.7%
-    13	Attila Domokos          0.8%
-    10	John Firebaugh          0.6%
-     8	Nathan Rajlich          0.5%
-     8	Jo Liss                 0.5%
-     6	Mike Pennisi            0.4%
-     6	Brendan Nee             0.4%
-     6	James Carr              0.4%
-     5	Aaron Heckmann          0.3%
-     5	Raynos                  0.3%
-     5	Ryunosuke SATO          0.3%
-     4	hokaccha                0.3%
-     4	Jonathan Ong            0.3%
-     4	Joshua Krall            0.3%
-     4	Domenic Denicola        0.3%
-     4	Forbes Lindesay         0.3%
-     4	Xavier Antoviaque       0.3%
-     4	David da Silva          0.3%
-     3	Ariel Mashraki          0.2%
-     3	Ben Bradley             0.2%
-     3	Merrick Christensen     0.2%
-     3	Andreas Lind Petersen   0.2%
-     3	Nathan Bowser           0.2%
-     3	Cory Thomas             0.2%
-     3	Benjie Gillam           0.2%
-     3	Wil Moore III           0.2%
-     3	Ben Lindsey             0.2%
-     3	Tyson Tate              0.2%
-     3	Paul Miller             0.2%
-     3	eiji.ienaga             0.2%
-     3	Mathieu Desvé           0.2%
-     3	Jesse Dailey            0.2%
-     3	fool2fish               0.2%
-     3	Fredrik Enestad         0.2%
-     3	Sindre Sorhus           0.2%
-     3	Valentin Agachi         0.2%
-     2	jsdevel                 0.1%
-     2	Arian Stolwijk          0.1%
-     2	Juzer Ali               0.1%
-     2	David Henderson         0.1%
-     2	Justin DuJardin         0.1%
-     2	Paul Armstrong          0.1%
-     2	Pete Hawkins            0.1%
-     2	Jonas Westerlund        0.1%
-     2	Quang Van               0.1%
-     2	Simon Gaeremynck        0.1%
-     2	travis jeffery          0.1%
-     2	Dominique Quatravaux    0.1%
-     2	Jacob Wejendorp         0.1%
-     2	Shawn Krisman           0.1%
-     2	FARKAS Máté             0.1%
-     2	Konstantin Käfer        0.1%
-     2	Timo Tijhof             0.1%
-     2	Sean Lang               0.1%
-     2	Quanlong He             0.1%
-     2	Glen Mailer             0.1%
-     2	Alexander Early         0.1%
-     2	Ian Storm Taylor        0.1%
-     2	Brian Beck              0.1%
-     2	Michael Riley           0.1%
-     2	Michael Schoonmaker     0.1%
-     2	domenic                 0.1%
-     2	fcrisci                 0.1%
-     2	Buck Doyle              0.1%
-     2	Nathan Alderson         0.1%
-     1	Mal Graty               0.1%
-     1	Marc Kuo                0.1%
-     1	Matija Marohnić         0.1%
-     1	Matt Robenolt           0.1%
-     1	Matt Smith              0.1%
-     1	Matthew Shanley         0.1%
-     1	Mattias Tidlund         0.1%
-     1	Michael Jackson         0.1%
-     1	Michael Olson           0.1%
-     1	Michal Charemza         0.1%
-     1	Nathan Black            0.1%
-     1	Nick Fitzgerald         0.1%
-     1	Noshir Patel            0.1%
-     1	Panu Horsmalahti        0.1%
-     1	Phil Sung               0.1%
-     1	R56                     0.1%
-     1	Refael Ackermann        0.1%
-     1	Richard Dingwall        0.1%
-     1	Richard Knop            0.1%
-     1	Rob Wu                  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	Shaine Hatch            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	Zsolt Takács            0.1%
-     1	abrkn                   0.1%
-     1	airportyh               0.1%
-     1	badunk                  0.1%
-     1	claudyus                0.1%
-     1	dasilvacontin           0.1%
-     1	fengmk2                 0.1%
-     1	gaye                    0.1%
-     1	grasGendarme            0.1%
-     1	lakmeer                 0.1%
-     1	lodr                    0.1%
-     1	mrShturman              0.1%
-     1	nishigori               0.1%
-     1	omardelarosa            0.1%
-     1	qiuzuhui                0.1%
-     1	samuel goldszmidt       0.1%
-     1	sebv                    0.1%
-     1	startswithaj            0.1%
-     1	tgautier@yahoo.com      0.1%
-     1	traleig1                0.1%
-     1	vlad                    0.1%
-     1	yuitest                 0.1%
-     1	zhiyelee                0.1%
-     1	Adam Crabtree           0.1%
-     1	Andreas Brekken         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	Ben Noordhuis           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	C. Scott Ananian        0.1%
-     1	Casey Foster            0.1%
-     1	ChrisWren               0.1%
-     1	Connor Dunn             0.1%
-     1	Corey Butler            0.1%
-     1	Daniel Stockman         0.1%
-     1	Dave McKenna            0.1%
-     1	Denis Bardadym          0.1%
-     1	Devin Weaver            0.1%
-     1	Di Wu                   0.1%
-     1	Diogo Monteiro          0.1%
-     1	Dmitry Shirokov         0.1%
-     1	Dr. Travis Jeffery      0.1%
-     1	Fedor Indutny           0.1%
-     1	Florian Margaine        0.1%
-     1	Frederico Silva         0.1%
-     1	Fredrik Lindin          0.1%
-     1	Gareth Aye              0.1%
-     1	Gareth Murphy           0.1%
-     1	Gavin Mogan             0.1%
-     1	Giovanni Bassi          0.1%
-     1	Glen Huang              0.1%
-     1	Greg Perkins            0.1%
-     1	Harish                  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	Jan Kopriva             0.1%
-     1	Jason Barry             0.1%
-     1	Javier Aranda           0.1%
-     1	Jean Ponchon            0.1%
-     1	Jeff Kunkle             0.1%
-     1	Jeremy Martin           0.1%
-     1	Jimmy Cuadra            0.1%
-     1	John Doty               0.1%
-     1	Jonathan Creamer        0.1%
-     1	Jonathan Park           0.1%
-     1	Jussi Virtanen          0.1%
-     1	Katie Gengler           0.1%
-     1	Kazuhito Hokamura       0.1%
-     1	Kent C. Dodds           0.1%
-     1	Kevin Conway            0.1%
-     1	Kirill Korolyov         0.1%
-     1	Koen Punt               0.1%
-     1	Laszlo Bacsi            0.1%
-     1	Liam Newman             0.1%
-     1	Linus Unnebäck          0.1%
-     1	László Bácsi            0.1%
-     1	Maciej Małecki          0.1%
-```
-
 ## Links
 
   - [Google Group](http://groups.google.com/group/mochajs)

package/bin/_mocha

@@ -1,17 +1,20 @@
+#!/usr/bin/env node
+
 /**
  * Module dependencies.
  */
 
-var program = require('commander')
-  , path = require('path')
-  , fs = require('fs')
-  , resolve = path.resolve
-  , exists = fs.existsSync || path.existsSync
-  , Mocha = require('../')
-  , utils = Mocha.utils
-  , join = path.join
-  , cwd = process.cwd()
-  , mocha = new Mocha;
+var program = require('commander'),
+  path = require('path'),
+  fs = require('fs'),
+  resolve = path.resolve,
+  exists = fs.existsSync || path.existsSync,
+  Mocha = require('../'),
+  utils = Mocha.utils,
+  join = path.join,
+  cwd = process.cwd(),
+  getOptions = require('./options'),
+  mocha = new Mocha;
 
 /**
  * Save timer references to avoid Sinon interfering (see GH-237).
@@ -74,16 +77,19 @@ program
   .option('-u, --ui <name>', 'specify user-interface (bdd|tdd|exports)', 'bdd')
   .option('-w, --watch', 'watch files for changes')
   .option('--check-leaks', 'check for global variable leaks')
+  .option('--full-trace', 'display the full stack trace')
   .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('--inline-diffs', 'display actual/expected differences inline within each string')
   .option('--interfaces', 'display available interfaces')
   .option('--no-deprecation', 'silence deprecation warnings')
@@ -170,26 +176,9 @@ program.on('require', function(mod){
   requires.push(mod);
 });
 
-// --opts
+// load mocha.opts into process.argv
 
-var optsPath = process.argv.indexOf('--opts') !== -1
-    ? process.argv[process.argv.indexOf('--opts') + 1]
-    : 'test/mocha.opts';
-
-try {
-  var opts = fs.readFileSync(optsPath, 'utf8')
-    .trim()
-    .split(/\s+/)
-    .filter(function(value) {
-      return value ? true : false;
-    });
-
-  process.argv = process.argv
-    .slice(0, 2)
-    .concat(opts.concat(process.argv.slice(2)));
-} catch (err) {
-  // ignore
-}
+getOptions();
 
 // parse args
 
@@ -279,6 +268,10 @@ if (program.invert) mocha.invert();
 
 if (program.checkLeaks) mocha.checkLeaks();
 
+// --stack-trace
+
+if(program.fullTrace) mocha.fullTrace();
+
 // --growl
 
 if (program.growl) mocha.growl();

package/bin/mocha

@@ -7,7 +7,13 @@
 
 var spawn = require('child_process').spawn,
   path = require('path'),
-  args = [process.execPath, path.join(__dirname, '_mocha')];
+  fs = require('fs'),
+  args = [path.join(__dirname, '_mocha')],
+  getOptions = require('./options');
+
+// load mocha.opts into process.argv
+
+getOptions();
 
 process.argv.slice(2).forEach(function(arg){
   var flag = arg.split('=')[0];
@@ -29,16 +35,19 @@ process.argv.slice(2).forEach(function(arg){
       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':
     case '--trace-deprecation':
+    case '--allow-natives-syntax':
       args.unshift(arg);
       break;
     default:
@@ -48,7 +57,7 @@ process.argv.slice(2).forEach(function(arg){
   }
 });
 
-var proc = spawn(args[0], args.slice(1), { stdio: 'inherit' });
+var proc = spawn(process.execPath, args, { stdio: 'inherit' });
 proc.on('exit', function (code, signal) {
   process.on('exit', function(){
     if (signal) {

package/bin/options.js

@@ -0,0 +1,36 @@
+/**
+ * Dependencies.
+ */
+
+var fs = require('fs');
+
+/**
+ * Export `getOptions`.
+ */
+
+module.exports = getOptions;
+
+/**
+ * Get options.
+ */
+
+function getOptions() {
+  var optsPath = process.argv.indexOf('--opts') !== -1
+        ? process.argv[process.argv.indexOf('--opts') + 1]
+        : 'test/mocha.opts';
+
+  try {
+    var opts = fs.readFileSync(optsPath, 'utf8')
+          .trim()
+          .split(/\s+/)
+          .filter(function(value) {
+            return value ? true : false;
+          });
+
+    process.argv = process.argv
+      .slice(0, 2)
+      .concat(opts.concat(process.argv.slice(2)));
+  } catch (err) {
+    // ignore
+  }
+}

package/lib/mocha.js

@@ -66,6 +66,7 @@ function image(name) {
  *   - `bail` bail on the first test failure
  *   - `slow` milliseconds to wait before considering a test slow
  *   - `ignoreLeaks` ignore global leaks
+ *   - `fullTrace` display the full stack-trace on failing
  *   - `grep` string or regexp to filter tests with
  *
  * @param {Object} options
@@ -83,7 +84,7 @@ function Mocha(options) {
   this.bail(options.bail);
   this.reporter(options.reporter, options.reporterOptions);
   if (null != options.timeout) this.timeout(options.timeout);
-  this.useColors(options.useColors)
+  this.useColors(options.useColors);
   if (options.enableTimeouts !== null) this.enableTimeouts(options.enableTimeouts);
   if (options.slow) this.slow(options.slow);
 
@@ -142,8 +143,12 @@ Mocha.prototype.reporter = function(reporter, reporterOptions){
   } else {
     reporter = reporter || 'spec';
     var _reporter;
-    try { _reporter = require('./reporters/' + reporter); } catch (err) {};
-    if (!_reporter) try { _reporter = require(reporter); } catch (err) {};
+    try { _reporter = require('./reporters/' + reporter); } catch (err) {}
+    if (!_reporter) try { _reporter = require(reporter); } catch (err) {
+      err.message.indexOf('Cannot find module') !== -1
+        ? console.warn('"' + reporter + '" reporter not found')
+        : console.warn('"' + reporter + '" reporter blew up with error:\n' + err.stack);
+    }
     if (!_reporter && reporter === 'teamcity')
       console.warn('The Teamcity reporter was moved to a package named ' +
         'mocha-teamcity-reporter ' +
@@ -165,7 +170,7 @@ Mocha.prototype.reporter = function(reporter, reporterOptions){
 Mocha.prototype.ui = function(name){
   name = name || 'bdd';
   this._ui = exports.interfaces[name];
-  if (!this._ui) try { this._ui = require(name); } catch (err) {};
+  if (!this._ui) try { this._ui = require(name); } catch (err) {}
   if (!this._ui) throw new Error('invalid interface "' + name + '"');
   this._ui = this._ui(this.suite);
   return this;
@@ -266,6 +271,18 @@ Mocha.prototype.checkLeaks = function(){
   return this;
 };
 
+/**
+ * Display long stack-trace on failing
+ *
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.fullTrace = function() {
+  this.options.fullStackTrace = true;
+  return this;
+};
+
 /**
  * Enable growl support.
  *
@@ -409,6 +426,7 @@ Mocha.prototype.run = function(fn){
   var runner = new exports.Runner(suite, options.delay);
   var reporter = new this._reporter(runner, options);
   runner.ignoreLeaks = false !== options.ignoreLeaks;
+  runner.fullStackTrace = options.fullStackTrace;
   runner.asyncOnly = options.asyncOnly;
   if (options.grep) runner.grep(options.grep, options.invert);
   if (options.globals) runner.globals(options.globals);

package/lib/reporters/base.js

@@ -66,8 +66,8 @@ exports.colors = {
   , 'green': 32
   , 'light': 90
   , 'diff gutter': 90
-  , 'diff added': 42
-  , 'diff removed': 41
+  , 'diff added': 32
+  , 'diff removed': 31
 };
 
 /**
@@ -168,21 +168,29 @@ exports.list = function(failures){
     var err = test.err
       , message = err.message || ''
       , stack = err.stack || message
-      , index = stack.indexOf(message) + message.length
-      , msg = stack.slice(0, index)
+      , index = stack.indexOf(message)
       , actual = err.actual
       , expected = err.expected
       , escape = true;
+    if (index === -1) {
+      msg = message;
+    } else {
+      index += message.length;
+      msg = stack.slice(0, index);
+      // remove msg from stack
+      stack = stack.slice(index + 1);
+    }
 
     // uncaught
     if (err.uncaught) {
       msg = 'Uncaught ' + msg;
     }
     // explicitly show diff
-    if (err.showDiff && sameType(actual, expected)) {
+    if (err.showDiff !== false && sameType(actual, expected)
+        && expected !== undefined) {
 
-      if ('string' !== typeof actual) {
-        escape = false;
+      escape = false;
+      if (!(utils.isString(actual) && utils.isString(expected))) {
         err.actual = actual = utils.stringify(actual);
         err.expected = expected = utils.stringify(expected);
       }
@@ -198,9 +206,8 @@ exports.list = function(failures){
       }
     }
 
-    // indent stack trace without msg
-    stack = stack.slice(index ? index + 1 : index)
-      .replace(/^/gm, '  ');
+    // indent stack trace
+    stack = stack.replace(/^/gm, '  ');
 
     console.log(fmt, (i + 1), test.fullTitle(), msg, stack);
   });

package/lib/reporters/dot.js

@@ -27,7 +27,7 @@ function Dot(runner) {
     , n = -1;
 
   runner.on('start', function(){
-    process.stdout.write('\n  ');
+    process.stdout.write('\n');
   });
 
   runner.on('pending', function(test){

package/lib/reporters/spec.js

@@ -54,14 +54,14 @@ function Spec(runner) {
     if ('fast' == test.speed) {
       var fmt = indent()
         + color('checkmark', '  ' + Base.symbols.ok)
-        + color('pass', ' %s ');
+        + color('pass', ' %s');
       cursor.CR();
       console.log(fmt, test.title);
     } else {
       var fmt = indent()
         + color('checkmark', '  ' + Base.symbols.ok)
-        + color('pass', ' %s ')
-        + color(test.speed, '(%dms)');
+        + color('pass', ' %s')
+        + color(test.speed, ' (%dms)');
       cursor.CR();
       console.log(fmt, test.title, test.duration);
     }

package/lib/reporters/templates/menu.jade

@@ -10,4 +10,4 @@
         if segments.length
           span.dirname= segments.join('/') + '/'
         span.basename= basename
-  a#logo(href='http://visionmedia.github.io/mocha/') m
+  a#logo(href='http://mochajs.org/') m

package/lib/reporters/templates/style.html

@@ -8,7 +8,7 @@ body {
 }
 
 #coverage {
-  padding: 60px;
+  padding: 60px 400px 60px 60px;
 }
 
 h1 a {
@@ -124,6 +124,10 @@ footer span {
   padding: 15px 0;
   text-align: right;
   border-left: 1px solid #eee;
+  max-width: 400px;
+  overflow: auto;
+  white-space: nowrap;
+  
   -moz-box-shadow: 0 0 2px #888
      , inset 5px 0 20px rgba(0,0,0,.5)
      , inset 5px 0 3px rgba(0,0,0,.3);

package/lib/runner.js

@@ -10,7 +10,8 @@ var EventEmitter = require('events').EventEmitter
   , filter = utils.filter
   , keys = utils.keys
   , type = utils.type
-  , stringify = utils.stringify;
+  , stringify = utils.stringify
+  , stackFilter = utils.stackTraceFilter();
 
 /**
  * Non-enumerable globals.
@@ -197,16 +198,18 @@ Runner.prototype.checkGlobals = function(test){
  * @api private
  */
 
-Runner.prototype.fail = function(test, err){
+Runner.prototype.fail = function(test, err) {
   ++this.failures;
   test.state = 'failed';
 
-  if ('string' == typeof err) {
-    err = new Error('the string "' + err + '" was thrown, throw an Error :)');
-  } else if (!(err instanceof Error)) {
+  if (!(err instanceof Error)) {
     err = new Error('the ' + type(err) + ' ' + stringify(err) + ' was thrown, throw an Error :)');
   }
 
+  err.stack = (this.fullStackTrace || !err.stack)
+    ? err.stack
+    : stackFilter(err.stack);
+
   this.emit('fail', test, err);
 };
 
@@ -694,20 +697,20 @@ function filterLeaks(ok, globals) {
  * @api private
  */
 
- function extraGlobals() {
-  if (typeof(process) === 'object' &&
-      typeof(process.version) === 'string') {
+function extraGlobals() {
+ if (typeof(process) === 'object' &&
+     typeof(process.version) === 'string') {
 
-    var nodeVersion = process.version.split('.').reduce(function(a, v) {
-      return a << 8 | v;
-    });
+   var nodeVersion = process.version.split('.').reduce(function(a, v) {
+     return a << 8 | v;
+   });
 
-    // 'errno' was renamed to process._errno in v0.9.11.
+   // 'errno' was renamed to process._errno in v0.9.11.
 
-    if (nodeVersion < 0x00090B) {
-      return ['errno'];
-    }
-  }
-
-  return [];
+   if (nodeVersion < 0x00090B) {
+     return ['errno'];
+   }
  }
+
+ return [];
+}