mocha 1.2.1 → 1.3.2

package/bin/_mocha

@@ -11,15 +11,15 @@ var program = require('commander')
   , vm = require('vm')
   , resolve = path.resolve
   , exists = fs.existsSync || path.existsSync
-  , mocha = require('../')
-  , utils = mocha.utils
-  , reporters = mocha.reporters
-  , interfaces = mocha.interfaces
-  , Context = mocha.Context
-  , Runner = mocha.Runner
-  , Suite = mocha.Suite
+  , Mocha = require('../')
+  , utils = Mocha.utils
+  , reporters = Mocha.reporters
+  , interfaces = Mocha.interfaces
+  , Base = reporters.Base
   , join = path.join
-  , cwd = process.cwd();
+  , basename = path.basename
+  , cwd = process.cwd()
+  , mocha = new Mocha;
 
 /**
  * Save timer references to avoid Sinon interfering (see GH-237).
@@ -55,12 +55,13 @@ var images = {
 // options
 
 program
-  .version(mocha.version)
+  .version(JSON.parse(fs.readFileSync(__dirname + '/../package.json', 'utf8')).version)
   .usage('[debug] [options] [files]')
   .option('-r, --require <name>', 'require the given module')
   .option('-R, --reporter <name>', 'specify the reporter to use', 'dot')
   .option('-u, --ui <name>', 'specify user-interface (bdd|tdd|exports)', 'bdd')
   .option('-g, --grep <pattern>', 'only run tests matching <pattern>')
+  .option('-i, --invert', 'inverts --grep matches')
   .option('-t, --timeout <ms>', 'set test-case timeout in milliseconds [2000]')
   .option('-s, --slow <ms>', '"slow" test threshold in milliseconds [75]', parseInt)
   .option('-w, --watch', 'watch files for changes')
@@ -172,10 +173,23 @@ Error.stackTraceLimit = Infinity; // TODO: config
 
 // reporter
 
-var suite = new Suite('', new Context)
-  , Base = require('../lib/reporters/base')
-  , Reporter = require('../lib/reporters/' + program.reporter)
-  , ui = interfaces[program.ui](suite);
+mocha.reporter(program.reporter);
+
+// interface
+
+mocha.ui(program.ui);
+
+// load reporter
+
+try {
+  Reporter = require('../lib/reporters/' + program.reporter);
+} catch (err) {
+  try {
+    Reporter = require(program.reporter);
+  } catch (err) {
+    throw new Error('reporter "' + program.reporter + '" does not exist');
+  }
+}
 
 // --no-colors
 
@@ -194,11 +208,31 @@ if (program.slow) Base.slow = program.slow;
 
 // --timeout
 
-if (program.timeout) suite.timeout(program.timeout);
+if (program.timeout) mocha.suite.timeout(program.timeout);
 
 // --bail
 
-suite.bail(program.bail);
+mocha.suite.bail(program.bail);
+
+// --grep
+
+if (program.grep) mocha.grep(new RegExp(utils.escapeRegexp(program.grep)));
+
+// --invert
+
+if (program.invert) mocha.invert();
+
+// --ignore-leaks
+
+if (program.ignoreLeaks) mocha.ignoreLeaks();
+
+// --growl
+
+if (program.growl) mocha.growl();
+
+// --globals
+
+mocha.globals(globals);
 
 // custom compiler support
 
@@ -246,21 +280,20 @@ if (program.watch) {
   });
 
   var frames = [
-      '  \033[96m◜ \033[90mwatching\033[0m'
-    , '  \033[96m◠ \033[90mwatching\033[0m'
-    , '  \033[96m◝ \033[90mwatching\033[0m'
-    , '  \033[96m◞ \033[90mwatching\033[0m'
-    , '  \033[96m◡ \033[90mwatching\033[0m'
-    , '  \033[96m◟ \033[90mwatching\033[0m'
+      '  \u001b[96m◜ \u001b[90mwatching\u001b[0m'
+    , '  \u001b[96m◠ \u001b[90mwatching\u001b[0m'
+    , '  \u001b[96m◝ \u001b[90mwatching\u001b[0m'
+    , '  \u001b[96m◞ \u001b[90mwatching\u001b[0m'
+    , '  \u001b[96m◡ \u001b[90mwatching\u001b[0m'
+    , '  \u001b[96m◟ \u001b[90mwatching\u001b[0m'
   ];
 
   var watchFiles = utils.files(cwd);
 
   function loadAndRun() {
-    load(files, function(){
-      run(suite, function(){
-        play(frames);
-      });
+    mocha.files = files;
+    mocha.run(function(){
+      play(frames);
     });
   }
 
@@ -275,8 +308,8 @@ if (program.watch) {
   utils.watch(watchFiles, function(){
     purge();
     stop()
-    suite = suite.clone();
-    ui = interfaces[program.ui](suite);
+    mocha.suite = mocha.suite.clone();
+    mocha.ui(program.ui);
     loadAndRun();
   });
 
@@ -285,36 +318,8 @@ if (program.watch) {
 
 // load
 
-load(files, function(){
-  run(suite, process.exit);
-});
-
-// require test files before
-// running the root suite
-
-function load(files, fn) {
-  var pending = files.length;
-  files.forEach(function(file){
-    delete require.cache[file];
-    suite.emit('pre-require', global, file);
-    suite.emit('require', require(file), file);
-    suite.emit('post-require', global, file);
-    --pending || fn();
-  });
-}
-
-// run the given suite
-
-function run(suite, fn) {
-  suite.emit('run');
-  var runner = new Runner(suite);
-  runner.globals(globals);
-  if (program.ignoreLeaks) runner.ignoreLeaks = true;
-  if (program.grep) runner.grep(new RegExp(program.grep));
-  var reporter = new Reporter(runner);
-  if (program.growl) growl(runner, reporter);
-  runner.run(fn);
-}
+mocha.files = files;
+mocha.run(process.exit);
 
 // enable growl notifications
 
@@ -349,7 +354,7 @@ function list(str) {
  */
 
 function hideCursor(){
-  process.stdout.write('\033[?25l');
+  process.stdout.write('\u001b[?25l');
 };
 
 /**
@@ -357,7 +362,7 @@ function hideCursor(){
  */
 
 function showCursor(){
-  process.stdout.write('\033[?25h');
+  process.stdout.write('\u001b[?25h');
 };
 
 /**
@@ -365,7 +370,7 @@ function showCursor(){
  */
 
 function stop() {
-  process.stdout.write('\033[2K');
+  process.stdout.write('\u001b[2K');
   clearInterval(play.timer);
 }
 
@@ -387,7 +392,7 @@ function lookupFiles(path, recursive) {
       if (recursive) files = files.concat(lookupFiles(file, recursive));
       return
     }
-    if (!stat.isFile() || !re.test(file)) return;
+    if (!stat.isFile() || !re.test(file) || basename(file)[0] == '.') return;
     files.push(file);
   });
 

package/bin/mocha

@@ -22,8 +22,12 @@ process.argv.slice(2).forEach(function (arg) {
     case '--expose-gc':
       args.unshift('--expose-gc');
       break;
+    case '--harmony-proxies':
+      args.unshift('--harmony-proxies');
+      break;
     default:
-      args.push(arg);
+      if (0 == arg.indexOf('--trace')) args.unshift(arg);
+      else args.push(arg);
       break;
   }
 });

package/lib/interfaces/bdd.js

@@ -28,11 +28,6 @@ module.exports = function(suite){
 
   suite.on('pre-require', function(context){
 
-    // noop variants
-
-    context.xdescribe = function(){};
-    context.xit = function(){};
-
     /**
      * Execute before running tests.
      */
@@ -65,6 +60,18 @@ module.exports = function(suite){
       suites[0].afterEach(fn);
     };
 
+    /**
+     * Pending describe.
+     */
+
+    context.xdescribe = context.xcontext = function(title, fn){
+      var suite = Suite.create(suites[0], title);
+      suite.pending = true;
+      suites.unshift(suite);
+      fn();
+      suites.shift();
+    };
+
     /**
      * Describe a "suite" with the given `title`
      * and callback `fn` containing nested suites
@@ -85,7 +92,17 @@ module.exports = function(suite){
      */
 
     context.it = context.specify = function(title, fn){
-      suites[0].addTest(new Test(title, fn));
+      var suite = suites[0];
+      if (suite.pending) var fn = null;
+      suite.addTest(new Test(title, fn));
+    };
+
+    /**
+     * Pending test case.
+     */
+
+    context.xit = context.xspecify = function(title){
+      context.it(title);
     };
   });
 };

package/lib/mocha.js

@@ -16,12 +16,6 @@ var path = require('path');
 
 exports = module.exports = Mocha;
 
-/**
- * Library version.
- */
-
-exports.version = '1.2.1';
-
 /**
  * Expose internals.
  */
@@ -122,13 +116,15 @@ Mocha.prototype.ui = function(name){
  * @api private
  */
 
-Mocha.prototype.loadFiles = function(){
+Mocha.prototype.loadFiles = function(fn){
   var suite = this.suite;
+  var pending = this.files.length;
   this.files.forEach(function(file){
     file = path.resolve(file);
     suite.emit('pre-require', global, file);
     suite.emit('require', require(file), file);
     suite.emit('post-require', global, file);
+    --pending || (fn && fn());
   });
 };
 
@@ -138,7 +134,7 @@ Mocha.prototype.loadFiles = function(){
  * @api private
  */
 
-Mocha.prototype.growl = function(runner, reporter) {
+Mocha.prototype._growl = function(runner, reporter) {
   var notify = require('growl');
 
   runner.on('end', function(){
@@ -171,6 +167,55 @@ Mocha.prototype.grep = function(re){
   return this;
 };
 
+/**
+ * Invert `.grep()` matches.
+ *
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.invert = function(){
+  this.options.invert = true;
+  return this;
+};
+
+/**
+ * Ignore global leaks.
+ *
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.ignoreLeaks = function(){
+  this.options.ignoreLeaks = true;
+  return this;
+};
+
+/**
+ * Enable growl support.
+ *
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.growl = function(){
+  this.options.growl = true;
+  return this;
+};
+
+/**
+ * Ignore `globals`.
+ *
+ * @param {Array} globals
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.globals = function(globals){
+  this.options.globals = globals;
+  return this;
+};
+
 /**
  * Run tests and invoke `fn()` when complete.
  *
@@ -186,8 +231,8 @@ Mocha.prototype.run = function(fn){
   var runner = new exports.Runner(suite);
   var reporter = new this._reporter(runner);
   runner.ignoreLeaks = options.ignoreLeaks;
-  if (options.grep) runner.grep(options.grep);
+  if (options.grep) runner.grep(options.grep, options.invert);
   if (options.globals) runner.globals(options.globals);
-  if (options.growl) this.growl(runner, reporter);
+  if (options.growl) this._growl(runner, reporter);
   return runner.run(fn);
 };

package/lib/reporters/base.js

@@ -74,7 +74,7 @@ exports.colors = {
 
 var color = exports.color = function(type, str) {
   if (!exports.useColors) return str;
-  return '\033[' + exports.colors[type] + 'm' + str + '\033[0m';
+  return '\u001b[' + exports.colors[type] + 'm' + str + '\u001b[0m';
 };
 
 /**
@@ -97,19 +97,19 @@ exports.window = {
 
 exports.cursor = {
   hide: function(){
-    process.stdout.write('\033[?25l');
+    process.stdout.write('\u001b[?25l');
   },
 
   show: function(){
-    process.stdout.write('\033[?25h');
+    process.stdout.write('\u001b[?25h');
   },
 
   deleteLine: function(){
-    process.stdout.write('\033[2K');
+    process.stdout.write('\u001b[2K');
   },
 
   beginningOfLine: function(){
-    process.stdout.write('\033[0G');
+    process.stdout.write('\u001b[0G');
   },
 
   CR: function(){

package/lib/reporters/dot.js

@@ -25,6 +25,7 @@ function Dot(runner) {
   var self = this
     , stats = this.stats
     , width = Base.window.width * .75 | 0
+    , c = '․'
     , n = 0;
 
   runner.on('start', function(){
@@ -32,21 +33,21 @@ function Dot(runner) {
   });
 
   runner.on('pending', function(test){
-    process.stdout.write(color('pending', '.'));
+    process.stdout.write(color('pending', c));
   });
 
   runner.on('pass', function(test){
     if (++n % width == 0) process.stdout.write('\n  ');
     if ('slow' == test.speed) {
-      process.stdout.write(color('bright yellow', '.'));
+      process.stdout.write(color('bright yellow', c));
     } else {
-      process.stdout.write(color(test.speed, '.'));
+      process.stdout.write(color(test.speed, c));
     }
   });
 
   runner.on('fail', function(test, err){
     if (++n % width == 0) process.stdout.write('\n  ');
-    process.stdout.write(color('fail', '.'));
+    process.stdout.write(color('fail', c));
   });
 
   runner.on('end', function(){

package/lib/reporters/html.js

@@ -30,8 +30,8 @@ exports = module.exports = HTML;
 
 var statsTemplate = '<ul id="stats">'
   + '<li class="progress"><canvas width="40" height="40"></canvas></li>'
-  + '<li class="passes">passes: <em>0</em></li>'
-  + '<li class="failures">failures: <em>0</em></li>'
+  + '<li class="passes"><a href="#">passes:</a> <em>0</em></li>'
+  + '<li class="failures"><a href="#">failures:</a> <em>0</em></li>'
   + '<li class="duration">duration: <em>0</em>s</li>'
   + '</ul>';
 
@@ -52,7 +52,9 @@ function HTML(runner) {
     , stat = fragment(statsTemplate)
     , items = stat.getElementsByTagName('li')
     , passes = items[1].getElementsByTagName('em')[0]
+    , passesLink = items[1].getElementsByTagName('a')[0]
     , failures = items[2].getElementsByTagName('em')[0]
+    , failuresLink = items[2].getElementsByTagName('a')[0]
     , duration = items[3].getElementsByTagName('em')[0]
     , canvas = stat.getElementsByTagName('canvas')[0]
     , report = fragment('<ul id="report"></ul>')
@@ -67,6 +69,18 @@ function HTML(runner) {
 
   if (!root) return error('#mocha div missing, add it to your document');
 
+  // pass toggle
+  on(passesLink, 'click', function () {
+    var className = /pass/.test(report.className) ? '' : ' pass';
+    report.className = report.className.replace(/fail|pass/g, '') + className;
+  });
+
+  // failure toggle
+  on(failuresLink, 'click', function () {
+    var className = /fail/.test(report.className) ? '' : ' fail';
+    report.className = report.className.replace(/fail|pass/g, '') + className;
+  });
+
   root.appendChild(stat);
   root.appendChild(report);
 
@@ -77,7 +91,7 @@ function HTML(runner) {
 
     // suite
     var url = location.protocol + '//' + location.host + location.pathname + '?grep=^' + utils.escapeRegexp(suite.fullTitle());
-    var el = fragment('<li class="suite"><h1><a href="%s">%s</a></h1></li>', url, suite.title);
+    var el = fragment('<li class="suite"><h1><a href="%s">%s</a></h1></li>', url, escape(suite.title));
 
     // container
     stack[0].appendChild(el);
@@ -95,6 +109,8 @@ function HTML(runner) {
   });
 
   runner.on('test end', function(test){
+    window.scrollTo(0, document.body.scrollHeight);
+
     // TODO: add to stats
     var percent = stats.tests / total * 100 | 0;
     if (progress) progress.update(percent).draw(ctx);
@@ -132,17 +148,16 @@ function HTML(runner) {
     }
 
     // toggle code
-    var h2 = el.getElementsByTagName('h2')[0];
-
-    on(h2, 'click', function(){
-      pre.style.display = 'none' == pre.style.display
-        ? 'block'
-        : 'none';
-    });
-
-    // code
     // TODO: defer
     if (!test.pending) {
+      var h2 = el.getElementsByTagName('h2')[0];
+
+      on(h2, 'click', function(){
+        pre.style.display = 'none' == pre.style.display
+          ? 'inline-block'
+          : 'none';
+      });
+
       var pre = fragment('<pre><code>%e</code></pre>', utils.clean(test.fn.toString()));
       el.appendChild(pre);
       pre.style.display = 'none';
@@ -201,4 +216,4 @@ function on(el, event, fn) {
   } else {
     el.attachEvent('on' + event, fn);
   }
-}
+}

package/lib/reporters/index.js

@@ -8,10 +8,11 @@ exports.HTML = require('./html');
 exports.List = require('./list');
 exports.Min = require('./min');
 exports.Spec = require('./spec');
+exports.Nyan = require('./nyan');
+exports.XUnit = require('./xunit');
 exports.Progress = require('./progress');
 exports.Landing = require('./landing');
 exports.JSONCov = require('./json-cov');
 exports.HTMLCov = require('./html-cov');
 exports.JSONStream = require('./json-stream');
-exports.XUnit = require('./xunit')
-exports.Teamcity = require('./teamcity')
+exports.Teamcity = require('./teamcity');

package/lib/reporters/landing.js

@@ -73,14 +73,14 @@ function Landing(runner) {
     }
 
     // render landing strip
-    stream.write('\033[4F\n\n');
+    stream.write('\u001b[4F\n\n');
     stream.write(runway());
     stream.write('\n  ');
     stream.write(color('runway', Array(col).join('⋅')));
     stream.write(plane)
     stream.write(color('runway', Array(width - col).join('⋅') + '\n'));
     stream.write(runway());
-    stream.write('\033[0m');
+    stream.write('\u001b[0m');
   });
 
   runner.on('end', function(){

package/lib/reporters/min.js

@@ -1,3 +1,4 @@
+
 /**
  * Module dependencies.
  */
@@ -22,9 +23,9 @@ function Min(runner) {
   
   runner.on('start', function(){
     // clear screen
-    process.stdout.write('\033[2J');
+    process.stdout.write('\u001b[2J');
     // set cursor position
-    process.stdout.write('\033[1;3H');
+    process.stdout.write('\u001b[1;3H');
   });
 
   runner.on('end', this.epilogue.bind(this));

package/lib/reporters/nyan.js

@@ -87,7 +87,7 @@ NyanCat.prototype.drawScoreboard = function(){
 
   function draw(color, n) {
     write(' ');
-    write('\033[' + color + 'm' + n + '\033[0m');
+    write('\u001b[' + color + 'm' + n + '\u001b[0m');
     write('\n');
   }
 
@@ -126,7 +126,7 @@ NyanCat.prototype.drawRainbow = function(){
   var self = this;
 
   this.trajectories.forEach(function(line, index) {
-    write('\033[' + self.scoreboardWidth + 'C');
+    write('\u001b[' + self.scoreboardWidth + 'C');
     write(line.join(''));
     write('\n');
   });
@@ -146,7 +146,7 @@ NyanCat.prototype.drawNyanCat = function(status) {
   var startWidth = this.scoreboardWidth + this.trajectories[0].length;
 
   [0, 1, 2, 3].forEach(function(index) {
-    write('\033[' + startWidth + 'C');
+    write('\u001b[' + startWidth + 'C');
 
     switch (index) {
       case 0:
@@ -194,7 +194,7 @@ NyanCat.prototype.drawNyanCat = function(status) {
  */
 
 NyanCat.prototype.cursorUp = function(n) {
-  write('\033[' + n + 'A');
+  write('\u001b[' + n + 'A');
 };
 
 /**
@@ -205,7 +205,7 @@ NyanCat.prototype.cursorUp = function(n) {
  */
 
 NyanCat.prototype.cursorDown = function(n) {
-  write('\033[' + n + 'B');
+  write('\u001b[' + n + 'B');
 };
 
 /**
@@ -241,7 +241,7 @@ NyanCat.prototype.generateColors = function(){
 NyanCat.prototype.rainbowify = function(str){
   var color = this.rainbowColors[this.colorIndex % this.rainbowColors.length];
   this.colorIndex += 1;
-  return '\033[38;5;' + color + 'm' + str + '\033[0m';
+  return '\u001b[38;5;' + color + 'm' + str + '\u001b[0m';
 };
 
 /**

package/lib/reporters/progress.js

@@ -60,7 +60,7 @@ function Progress(runner, options) {
       , i = width - n;
 
     cursor.CR();
-    process.stdout.write('\033[J');
+    process.stdout.write('\u001b[J');
     process.stdout.write(color('progress', '  ' + options.open));
     process.stdout.write(Array(n).join(options.complete));
     process.stdout.write(Array(i).join(options.incomplete));

package/lib/reporters/xunit.js

@@ -36,7 +36,11 @@ function XUnit(runner) {
     , tests = []
     , self = this;
 
-  runner.on('test end', function(test){
+  runner.on('pass', function(test){
+    tests.push(test);
+  });
+  
+  runner.on('fail', function(test){
     tests.push(test);
   });