mocha 1.21.4 → 2.1.0

package/README.md

@@ -0,0 +1,226 @@
+ [![Build Status](https://secure.travis-ci.org/mochajs/mocha.png)](http://travis-ci.org/mochajs/mocha)
+
+  [![Mocha test framework](http://f.cl.ly/items/3l1k0n2A1U3M1I1L210p/Screen%20Shot%202012-02-24%20at%202.21.43%20PM.png)](http://mochajs.org)
+
+  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)
+  - [Wiki](https://github.com/mochajs/mocha/wiki)
+  - Mocha [Extensions and reporters](https://github.com/mochajs/mocha/wiki)
+
+Mocha also has a chat room on [Slack](https://slack.com). If you'd like to join, [shoot us an email](mailto:tj@travisjeffery.com?subject=mocha%20slack%20room%20invite) from the address you want us to invite you under and we'll happily send you an invite!

package/bin/_mocha

@@ -5,17 +5,13 @@
  */
 
 var program = require('commander')
-  , sprintf = require('util').format
   , path = require('path')
   , fs = require('fs')
-  , glob = require('glob')
   , resolve = path.resolve
   , exists = fs.existsSync || path.existsSync
   , Mocha = require('../')
   , utils = Mocha.utils
-  , interfaces = Mocha.interfaces
   , join = path.join
-  , basename = path.basename
   , cwd = process.cwd()
   , mocha = new Mocha;
 
@@ -65,6 +61,7 @@ program
   .option('-c, --colors', 'force enabling of colors')
   .option('-C, --no-colors', 'force disabling of colors')
   .option('-G, --growl', 'enable growl notification support')
+  .option('-O, --reporter-options <k=v,k2=v2,...>', 'reporter-specific options')
   .option('-R, --reporter <name>', 'specify the reporter to use', 'spec')
   .option('-S, --sort', "sort test files")
   .option('-b, --bail', "bail after first test failure")
@@ -179,7 +176,10 @@ var optsPath = process.argv.indexOf('--opts') !== -1
 try {
   var opts = fs.readFileSync(optsPath, 'utf8')
     .trim()
-    .split(/\s+/);
+    .split(/\s+/)
+    .filter(function(value) {
+      return value ? true : false;
+    });
 
   process.argv = process.argv
     .slice(0, 2)
@@ -196,9 +196,22 @@ program.parse(process.argv);
 
 Error.stackTraceLimit = Infinity; // TODO: config
 
+// reporter options
+
+var reporterOptions = {};
+if (program.reporterOptions !== undefined) {
+    program.reporterOptions.split(",").forEach(function(opt) {
+        var L = opt.split("=");
+        if (L.length != 2) {
+            throw new Error("invalid reporter option '" + opt + "'");
+        }
+        reporterOptions[L[0]] = L[1];
+    });
+}
+
 // reporter
 
-mocha.reporter(program.reporter);
+mocha.reporter(program.reporter, reporterOptions);
 
 // interface
 
@@ -282,27 +295,25 @@ program.compilers.forEach(function(c) {
   if (mod[0] == '.') mod = join(process.cwd(), mod);
   require(mod);
   extensions.push(ext);
+  program.watchExtensions.push(ext);
 });
 
-var re = new RegExp('\\.(' + extensions.join('|') + ')$');
-
 // requires
 
 requires.forEach(function(mod) {
   require(mod);
 });
 
-// files
+//args
 
-var files = []
-  , args = program.args;
+var args = program.args;
 
 // default files to test/*.{js,coffee}
 
 if (!args.length) args.push('test');
 
 args.forEach(function(arg){
-  files = files.concat(lookupFiles(arg, program.recursive));
+  files = files.concat(utils.lookupFiles(arg, extensions, program.recursive));
 });
 
 // resolve
@@ -328,7 +339,7 @@ if (program.watch) {
   });
 
 
-  var watchFiles = utils.files(cwd, [ 'js', 'coffee', 'litcoffee', 'coffee.md' ].concat(program.watchExtensions));
+  var watchFiles = utils.files(cwd, [ 'js' ].concat(program.watchExtensions));
   var runAgain = false;
 
   function loadAndRun() {
@@ -357,6 +368,8 @@ if (program.watch) {
   function rerun() {
     purge();
     stop()
+    if (!program.grep)
+      mocha.grep(null);
     mocha.suite = mocha.suite.clone();
     mocha.suite.ctx = new Mocha.Context;
     mocha.ui(program.ui);
@@ -439,40 +452,6 @@ function stop() {
   clearInterval(play.timer);
 }
 
-/**
- * Lookup file names at the given `path`.
- */
-
-function lookupFiles(path, recursive) {
-  var files = [];
-
-  if (!exists(path)) {
-    if (exists(path + '.js')) {
-      path += '.js'
-    } else {
-      files = glob.sync(path);
-      if (!files.length) throw new Error("cannot resolve path (or pattern) '" + path + "'");
-      return files;
-    }
-  }
-
-  var stat = fs.statSync(path);
-  if (stat.isFile()) return path;
-
-  fs.readdirSync(path).forEach(function(file){
-    file = join(path, file);
-    var stat = fs.statSync(file);
-    if (stat.isDirectory()) {
-      if (recursive) files = files.concat(lookupFiles(file, recursive));
-      return
-    }
-    if (!stat.isFile() || !re.test(file) || basename(file)[0] == '.') return;
-    files.push(file);
-  });
-
-  return files;
-}
-
 /**
  * Play the given array of strings.
  */

package/bin/mocha

@@ -44,7 +44,7 @@ process.argv.slice(2).forEach(function(arg){
   }
 });
 
-var proc = spawn(process.argv[0], args, { customFds: [0,1,2] });
+var proc = spawn(process.argv[0], args, { stdio: 'inherit' });
 proc.on('exit', function (code, signal) {
   process.on('exit', function(){
     if (signal) {
@@ -54,3 +54,10 @@ proc.on('exit', function (code, signal) {
     }
   });
 });
+
+// terminate children.
+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/index.js

@@ -1,4 +1,3 @@
-
 module.exports = process.env.COV
   ? require('./lib-cov/mocha')
-  : require('./lib/mocha');
+  : require('./lib/mocha');

package/lib/browser/debug.js

@@ -1,4 +1,3 @@
-
 module.exports = function(type){
   return function(){
   }

package/lib/browser/diff.js

@@ -165,7 +165,22 @@ var JsDiff = (function() {
 
   var LineDiff = new Diff();
   LineDiff.tokenize = function(value) {
-    return value.split(/^/m);
+    var retLines = [],
+        lines = value.split(/^/m);
+
+    for(var i = 0; i < lines.length; i++) {
+      var line = lines[i],
+          lastLine = lines[i - 1];
+
+      // Merge lines that may contain windows new lines
+      if (line == '\n' && lastLine && lastLine[lastLine.length - 1] === '\r') {
+        retLines[retLines.length - 1] += '\n';
+      } else if (line) {
+        retLines.push(line);
+      }
+    }
+
+    return retLines;
   };
 
   return {

package/lib/browser/escape-string-regexp.js

@@ -0,0 +1,11 @@
+'use strict';
+
+var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
+
+module.exports = function (str) {
+  if (typeof str !== 'string') {
+    throw new TypeError('Expected a string');
+  }
+
+  return str.replace(matchOperatorsRe,  '\\$&');
+};

package/lib/browser/events.js

@@ -1,4 +1,3 @@
-
 /**
  * Module exports.
  */
@@ -175,4 +174,4 @@ EventEmitter.prototype.emit = function (name) {
   }
 
   return true;
-};
+};

package/lib/browser/progress.js

@@ -94,28 +94,28 @@ Progress.prototype.draw = function(ctx){
       , 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

package/lib/browser/tty.js

@@ -1,4 +1,3 @@
-
 exports.isatty = function(){
   return true;
 };

package/lib/context.js

@@ -1,4 +1,3 @@
-
 /**
  * Expose `Context`.
  */

package/lib/hook.js

@@ -1,4 +1,3 @@
-
 /**
  * Module dependencies.
  */

package/lib/interfaces/bdd.js

@@ -1,11 +1,11 @@
-
 /**
  * Module dependencies.
  */
 
 var Suite = require('../suite')
   , Test = require('../test')
-  , utils = require('../utils');
+  , utils = require('../utils')
+  , escapeRe = require('escape-string-regexp');
 
 /**
  * BDD-style interface:
@@ -108,7 +108,7 @@ module.exports = function(suite){
 
     context.it = context.specify = function(title, fn){
       var suite = suites[0];
-      if (suite.pending) var fn = null;
+      if (suite.pending) fn = null;
       var test = new Test(title, fn);
       test.file = file;
       suite.addTest(test);
@@ -121,7 +121,7 @@ module.exports = function(suite){
 
     context.it.only = function(title, fn){
       var test = context.it(title, fn);
-      var reString = '^' + utils.escapeRegexp(test.fullTitle()) + '$';
+      var reString = '^' + escapeRe(test.fullTitle()) + '$';
       mocha.grep(new RegExp(reString));
       return test;
     };

package/lib/interfaces/exports.js

@@ -1,4 +1,3 @@
-
 /**
  * Module dependencies.
  */
@@ -52,7 +51,7 @@ module.exports = function(suite){
             suites[0].addTest(test);
         }
       } else {
-        var suite = Suite.create(suites[0], key);
+        suite = Suite.create(suites[0], key);
         suites.unshift(suite);
         visit(obj[key]);
         suites.shift();

package/lib/interfaces/index.js

@@ -1,4 +1,3 @@
-
 exports.bdd = require('./bdd');
 exports.tdd = require('./tdd');
 exports.qunit = require('./qunit');

package/lib/interfaces/qunit.js

@@ -1,10 +1,10 @@
-
 /**
  * Module dependencies.
  */
 
 var Suite = require('../suite')
   , Test = require('../test')
+  , escapeRe = require('escape-string-regexp')
   , utils = require('../utils');
 
 /**
@@ -109,7 +109,7 @@ module.exports = function(suite){
 
     context.test.only = function(title, fn){
       var test = context.test(title, fn);
-      var reString = '^' + utils.escapeRegexp(test.fullTitle()) + '$';
+      var reString = '^' + escapeRe(test.fullTitle()) + '$';
       mocha.grep(new RegExp(reString));
     };
 

package/lib/interfaces/tdd.js

@@ -1,11 +1,11 @@
-
 /**
  * Module dependencies.
  */
 
 var Suite = require('../suite')
   , Test = require('../test')
-  , utils = require('../utils');;
+  , escapeRe = require('escape-string-regexp')
+  , utils = require('../utils');
 
 /**
  * TDD-style interface:
@@ -112,7 +112,7 @@ module.exports = function(suite){
 
     context.test = function(title, fn){
       var suite = suites[0];
-      if (suite.pending) var fn = null;
+      if (suite.pending) fn = null;
       var test = new Test(title, fn);
       test.file = file;
       suite.addTest(test);
@@ -125,7 +125,7 @@ module.exports = function(suite){
 
     context.test.only = function(title, fn){
       var test = context.test(title, fn);
-      var reString = '^' + utils.escapeRegexp(test.fullTitle()) + '$';
+      var reString = '^' + escapeRe(test.fullTitle()) + '$';
       mocha.grep(new RegExp(reString));
     };