Fixes #117

petkaantonov · Feb 18, 2014 · 73afa4a · 73afa4a
1 parent 9926365
commit 73afa4a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/src/promise.js b/src/promise.js
@@ -820,6 +820,8 @@ function Promise$_follow(promise) {
             promise._getCarriedStackTrace());
     }
 
+    if (promise._isRejectionUnhandled()) promise._unsetRejectionIsUnhandled();
+
     if (debugging &&
         promise._traceParent == null) {
         promise._traceParent = this;

diff --git a/test/mocha/unhandled_rejections.js b/test/mocha/unhandled_rejections.js
@@ -543,7 +543,37 @@ describe("immediate failures with .then", function(done) {
     });
 });
 
+describe("gh-117", function() {
+    specify("eventually rejected promise", function(done) {
+        onUnhandledFail();
 
+        Promise.resolve().then(function() {
+            return new Promise(function(_, reject) {
+                setTimeout(function() {
+                    reject(13);
+                }, 13);
+            });
+        }).caught(async(done));
+    });
+
+    specify("already rejected promise", function(done) {
+        onUnhandledFail();
+
+        Promise.resolve().then(function() {
+            return Promise.reject(13);
+        }).caught(async(done));
+    });
+
+    specify("immediately rejected promise", function(done) {
+        onUnhandledFail();
+
+        Promise.resolve().then(function() {
+            return new Promise(function(_, reject) {
+                reject(13);
+            });
+        }).caught(async(done));
+    });
+});
 
 if (Promise.hasLongStackTraces()) {
     describe("Gives long stack traces for non-errors", function() {