Skip to content

Commit

Permalink
Fixes #373
Browse files Browse the repository at this point in the history
  • Loading branch information
petkaantonov committed Oct 31, 2014
1 parent 70dc544 commit c01c256
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/join.js
Expand Up @@ -58,8 +58,9 @@ if (canEvaluate) {
};
}



function reject(reason) {
this._reject(reason);
}

Promise.join = function Promise$Join() {
var last = arguments.length - 1;
Expand All @@ -70,7 +71,6 @@ Promise.join = function Promise$Join() {
var ret = new Promise(INTERNAL);
ret._setTrace(void 0);
var holder = new Holder(last, fn);
var reject = ret._reject;
var callbacks = thenCallbacks;
for (var i = 0; i < last; ++i) {
var maybePromise = cast(arguments[i], void 0);
Expand Down
17 changes: 17 additions & 0 deletions test/mocha/github-3.7.3.js
@@ -0,0 +1,17 @@
"use strict";

var assert = require("assert");
var Promise = require("../../js/debug/bluebird.js");

describe("github-373", function() {
specify("unhandled unsuccessful Promise.join should result in correct error being reported", function(done) {
var err = new Error("test");
var rejected = Promise.delay(30).thenThrow(err);
Promise.onPossiblyUnhandledRejection(function(error) {
Promise.onPossiblyUnhandledRejection(null);
assert(err === error);
done();
});
Promise.join(rejected, Promise.resolve(1), function(){});
});
});

0 comments on commit c01c256

Please sign in to comment.