mocha 1.10.0 → 1.11.0

package/History.md

@@ -1,4 +1,17 @@
 
+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
 ==================
 

package/bin/mocha

@@ -28,6 +28,8 @@ process.argv.slice(2).forEach(function(arg){
     case '--harmony':
     case '--harmony-proxies':
     case '--harmony-collections':
+    case '--harmony-generators':
+    case '--prof':
       args.unshift(arg);
       break;
     default:

package/component.json

@@ -1,6 +1,6 @@
 {
   "name": "mocha",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "repo": "visionmedia/mocha",
   "description": "simple, flexible, fun test framework",
   "keywords": [

package/lib/browser/tty.js

@@ -4,5 +4,10 @@ exports.isatty = function(){
 };
 
 exports.getWindowSize = function(){
-  return [window.innerHeight, window.innerWidth];
-};
+  if ('innerHeight' in global) {
+    return [global.innerHeight, global.innerWidth];
+  } else {
+    // In a Web Worker, the DOM Window is not available.
+    return [640, 480];
+  }
+};

package/lib/interfaces/tdd.js

@@ -82,6 +82,17 @@ module.exports = function(suite){
       return suite;
     };
 
+    /**
+     * Pending suite.
+     */
+    context.suite.skip = function(title, fn) {
+      var suite = Suite.create(suites[0], title);
+      suite.pending = true;
+      suites.unshift(suite);
+      fn.call(suite);
+      suites.shift();
+    };
+
     /**
      * Exclusive test-case.
      */
@@ -98,8 +109,10 @@ module.exports = function(suite){
      */
 
     context.test = function(title, fn){
+      var suite = suites[0];
+      if (suite.pending) var fn = null;
       var test = new Test(title, fn);
-      suites[0].addTest(test);
+      suite.addTest(test);
       return test;
     };
 

package/lib/reporters/base.js

@@ -161,6 +161,11 @@ exports.list = function(failures){
       , expected = err.expected
       , escape = true;
 
+    // uncaught
+    if (err.uncaught) {
+      msg = 'Uncaught ' + msg;
+    }
+
     // explicitly show diff
     if (err.showDiff) {
       escape = false;
@@ -279,48 +284,38 @@ function Base(runner) {
  */
 
 Base.prototype.epilogue = function(){
-  var stats = this.stats
-    , fmt
-    , tests;
+  var stats = this.stats;
+  var tests;
+  var fmt;
 
   console.log();
 
-  function pluralize(n) {
-    return 1 == n ? 'test' : 'tests';
-  }
-
-  // failure
-  if (stats.failures) {
-    fmt = color('bright fail', '  ' + exports.symbols.err)
-      + color('fail', ' %d of %d %s failed')
-      + color('light', ':')
-
-    console.error(fmt,
-      stats.failures,
-      this.runner.total,
-      pluralize(this.runner.total));
-
-    Base.list(this.failures);
-    console.error();
-    return;
-  }
-
-  // pass
+  // passes
   fmt = color('bright pass', ' ')
-    + color('green', ' %d %s complete')
+    + color('green', ' %d passing')
     + color('light', ' (%s)');
 
   console.log(fmt,
-    stats.tests || 0,
-    pluralize(stats.tests),
+    stats.passes || 0,
     ms(stats.duration));
 
   // pending
   if (stats.pending) {
     fmt = color('pending', ' ')
-      + color('pending', ' %d %s pending');
+      + color('pending', ' %d pending');
+
+    console.log(fmt, stats.pending);
+  }
+
+  // failures
+  if (stats.failures) {
+    fmt = color('fail', '  %d failing');
+
+    console.error(fmt,
+      stats.failures);
 
-    console.log(fmt, stats.pending, pluralize(stats.pending));
+    Base.list(this.failures);
+    console.error();
   }
 
   console.log();

package/lib/runnable.js

@@ -131,16 +131,14 @@ Runnable.prototype.inspect = function(){
  */
 
 Runnable.prototype.resetTimeout = function(){
-  var self = this
-    , ms = this.timeout();
+  var self = this;
+  var ms = this.timeout() || 1e9;
 
   this.clearTimeout();
-  if (ms) {
-    this.timer = setTimeout(function(){
-      self.callback(new Error('timeout of ' + ms + 'ms exceeded'));
-      self.timedOut = true;
-    }, ms);
-  }
+  this.timer = setTimeout(function(){
+    self.callback(new Error('timeout of ' + ms + 'ms exceeded'));
+    self.timedOut = true;
+  }, ms);
 };
 
 /**

package/lib/runner.js

@@ -1,4 +1,3 @@
-
 /**
  * Module dependencies.
  */
@@ -44,6 +43,7 @@ module.exports = Runner;
  *   - `hook end`  (hook) hook complete
  *   - `pass`  (test) test passed
  *   - `fail`  (test, err) test failed
+ *   - `pending`  (test) test pending
  *
  * @api public
  */
@@ -232,6 +232,7 @@ Runner.prototype.hook = function(name, fn){
   function next(i) {
     var hook = hooks[i];
     if (!hook) return fn();
+    if (self.failures && suite.bail()) return fn();
     self.currentRunnable = hook;
 
     self.emit('hook', hook);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mocha",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "simple, flexible, fun test framework",
   "keywords": [
     "mocha",
@@ -31,7 +31,7 @@
     "jade": "0.26.3",
     "diff": "1.0.2",
     "debug": "*",
-    "mkdirp": "0.3.3",
+    "mkdirp": "0.3.5",
     "ms": "0.3.0",
     "glob": "3.2.1"
   },

package/test.js

@@ -1,9 +1,13 @@
 
 describe('something', function(){
-  it('should work', function(done){
-    this.timeout(0);
-    setTimeout(function(){
-      done();
-    }, 5999);
+  it('should work', function(){
+
+  })
+
+  // it('be pending')
+  // it('be pending')
+
+  it('should fail', function(){
+    // tasdf
   })
 })