.timeout() cancels instead of rejecting the promise

petkaantonov · May 22, 2014 · b0dd919 · b0dd919
1 parent 147f22d
commit b0dd919
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -81,7 +81,6 @@ module.exports = function( grunt ) {
     };
 
     var optionalModuleRequireMap = {
-        "timers.js": true,
         "race.js": true,
         "call_get.js": true,
         "generators.js": true,
@@ -97,7 +96,8 @@ module.exports = function( grunt ) {
         "using.js": true,
         "filter.js": ["map.js"],
         "any.js": ["some.js"],
-        "each.js": ["reduce.js"]
+        "each.js": ["reduce.js"],
+        "timers.js": ["cancel.js"]
     };
 
     function getOptionalRequireCode( srcs ) {

diff --git a/src/timers.js b/src/timers.js
@@ -26,7 +26,7 @@ var afterTimeout = function Promise$_afterTimeout(promise, message, ms) {
     var err = new TimeoutError(message);
     errors.markAsOriginatingFromRejection(err);
     promise._attachExtraTrace(err);
-    promise._rejectUnchecked(err);
+    promise._cancel(err);
 };
 
 var afterDelay = function Promise$_afterDelay(value, promise) {
@@ -67,7 +67,7 @@ Promise.prototype.timeout = function Promise$timeout(ms, message) {
     ret._propagateFrom(this, PROPAGATE_ALL);
     ret._follow(this);
     _setTimeout(afterTimeout, ms, ret, message, ms);
-    return ret;
+    return ret.cancellable();
 };
 
 };
diff --git a/test/mocha/timers.js b/test/mocha/timers.js
@@ -83,6 +83,20 @@ describe("timeout", function () {
             done();
         });
     });
+
+    it("should propagate the timeout error to cancellable parents", function(done) {
+        function doExpensiveOp() {
+            return new Promise(function() {
+
+            })
+            .cancellable()
+            .caught(Promise.TimeoutError, function(e) {
+                done();
+            })
+        }
+
+        doExpensiveOp().timeout(100);
+    });
 });
 
 describe("delay", function () {