Merge commit '7657cb11d960cf2cd8407b256019b2e34dc93328' into v2.3.0

* commit '7657cb11d960cf2cd8407b256019b2e34dc93328':
  Allow --async-only to be satisfied by returning a promise

bin/_mocha

@@ -57,7 +57,7 @@ var images = {
 program
   .version(JSON.parse(fs.readFileSync(__dirname + '/../package.json', 'utf8')).version)
   .usage('[debug] [options] [files]')
-  .option('-A, --async-only', "force all tests to take a callback (async)")
+  .option('-A, --async-only', "force all tests to take a callback (async) or return a promise")
   .option('-c, --colors', 'force enabling of colors')
   .option('-C, --no-colors', 'force disabling of colors')
   .option('-G, --growl', 'enable growl notification support')

lib/runnable.js

@@ -247,10 +247,6 @@ Runnable.prototype.run = function(fn){
     return;
   }
 
-  if (this.asyncOnly) {
-    return done(new Error('--async-only option in use without declaring `done()`'));
-  }
-
   // sync or promise-returning
   try {
     if (this.pending) {
@@ -274,6 +270,10 @@ Runnable.prototype.run = function(fn){
           done(reason || new Error('Promise rejected with no or falsy reason'))
         });
     } else {
+      if (self.asyncOnly) {
+        return done(new Error('--async-only option in use without declaring `done()` or returning a promise'));
+      }
+
       done();
     }
   }

test/acceptance/misc/asyncOnly.js

@@ -6,4 +6,23 @@ describe('asyncOnly', function(){
   it('should pass', function(done){
     done();
   })
+
+  it('should ignore pending tests')
+
+  it('should fail when test throws an error', function(){
+    // the async warning only applies if the test would have otherwise passed
+    throw Error('you should see this error');
+  })
+
+  describe('with a function that returns a promise', function() {
+    it('should pass', function(){
+      var fulfilledPromise = {
+        then: function (fulfilled, rejected) {
+          process.nextTick(fulfilled);
+        }
+      };
+
+      return fulfilledPromise;
+    })
+  })
 })