Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions dist/polyfill.js
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ function finale(self) {
if (self._state === 2 && self._deferreds.length === 0) {
Promise._immediateFn(function() {
if (!self._handled) {
Promise._unhandledRejectionFn(self._value);
Promise._unhandledRejectionFn(self._value, self);
}
});
}
Expand Down Expand Up @@ -363,7 +363,8 @@ Promise._immediateFn =
setTimeoutFunc(fn, 0);
};

Promise._unhandledRejectionFn = function _unhandledRejectionFn(err) {
// eslint-disable-next-line no-unused-vars
Promise._unhandledRejectionFn = function _unhandledRejectionFn(err, promise) {
if (typeof console !== 'undefined' && console) {
console.warn('Possible Unhandled Promise Rejection:', err); // eslint-disable-line no-console
}
Expand Down
2 changes: 1 addition & 1 deletion dist/polyfill.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ function finale(self) {
if (self._state === 2 && self._deferreds.length === 0) {
Promise._immediateFn(function() {
if (!self._handled) {
Promise._unhandledRejectionFn(self._value);
Promise._unhandledRejectionFn(self._value, self);
}
});
}
Expand Down Expand Up @@ -249,7 +249,8 @@ Promise._immediateFn =
setTimeoutFunc(fn, 0);
};

Promise._unhandledRejectionFn = function _unhandledRejectionFn(err) {
// eslint-disable-next-line no-unused-vars
Promise._unhandledRejectionFn = function _unhandledRejectionFn(err, promise) {
if (typeof console !== 'undefined' && console) {
console.warn('Possible Unhandled Promise Rejection:', err); // eslint-disable-line no-console
}
Expand Down
45 changes: 44 additions & 1 deletion test/promise.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ describe('Promise', function() {
assert(done);
});
});
describe('Promise._onUnhandledRejection', function() {
describe('Promise._unhandledRejectionFn', function() {
var stub, sandbox;
beforeEach(function() {
sandbox = sinon.sandbox.create();
Expand Down Expand Up @@ -157,6 +157,49 @@ describe('Promise', function() {
}, 50);
});
});
describe('Promise._unhandledRejectionFn custom handler', function() {
var stub, sandbox;
beforeEach(function() {
sandbox = sinon.sandbox.create();
stub = sandbox.stub(Promise, '_unhandledRejectionFn');
});
afterEach(function() {
sandbox.restore();
});
it('error single Promise', function(done) {
var err = new Error('err');
var promise = new Promise(function() {
throw err;
});
setTimeout(function() {
assert(stub.calledOnce);
assert(stub.calledWithExactly(err, promise));
done();
}, 50);
});
it('multi promise error', function(done) {
var err = new Error('err');
var promise = new Promise(function() {
throw err;
}).then(function(result) {
return result;
});
setTimeout(function() {
assert(stub.calledOnce);
assert(stub.calledWithExactly(err, promise));
done();
}, 50);
});
it('promise reject error', function(done) {
var err = new Error('err');
var promise = Promise.reject(err);
setTimeout(function() {
assert(stub.calledOnce);
assert(stub.calledWithExactly(err, promise));
done();
}, 50);
});
});
describe('Promise.prototype.then', function() {
var spy, SubClass;
beforeEach(function() {
Expand Down