Merge pull request #1197 from raydog/master

Callback can be called twice in asyncify when using promises.

lib/asyncify.js

@@ -67,7 +67,7 @@ export default function asyncify(func) {
         if (isObject(result) && typeof result.then === 'function') {
             result.then(function(value) {
                 callback(null, value);
-            })['catch'](function(err) {
+            }, function(err) {
                 callback(err.message ? err : new Error(err));
             });
         } else {

mocha_test/asyncify.js

@@ -74,6 +74,13 @@ describe('asyncify', function(){
             'rsvp'
         ];
 
+        // Both Bluebird and native promises emit these events. We handle it because Bluebird
+        // will report these rejections to stderr if we don't, which is a great feature for
+        // normal cases, but not here, since we expect unhandled rejections:
+        process.on('unhandledRejection', function () {
+            // Ignore.
+        });
+
         names.forEach(function(name) {
             describe(name, function() {
 
@@ -111,6 +118,25 @@ describe('asyncify', function(){
                         done();
                     });
                 });
+
+                it('callback error', function(done) {
+                    var promisified = function(argument) {
+                        return new Promise(function (resolve) {
+                            resolve(argument + " resolved");
+                        });
+                    };
+                    var call_count = 0;
+                    async.asyncify(promisified)("argument", function () {
+                        call_count++;
+                        if (call_count === 1) {
+                            throw new Error("error in callback");
+                        }
+                    });
+                    setTimeout(function () {
+                        expect(call_count).to.equal(1);
+                        done();
+                    }, 15);
+                });
             });
         });
     });