Fixes #362

petkaantonov · Oct 25, 2014 · fb7ec48 · fb7ec48
1 parent bf9f64f
commit fb7ec48
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/cancel.js b/src/cancel.js
@@ -16,6 +16,7 @@ Promise.prototype._cancel = function Promise$_cancel(reason) {
         promiseToReject = parent;
     }
     ASSERT(promiseToReject.isCancellable());
+    this._unsetCancellable();
     promiseToReject._attachExtraTrace(reason);
     promiseToReject._rejectUnchecked(reason);
 };

diff --git a/test/mocha/cancel.js b/test/mocha/cancel.js
@@ -271,3 +271,18 @@ describe("simple", function() {
 
     });
 });
+
+describe("Cancelling a promise twice should have no additional effect", function() {
+    specify("With delay", function(done) {
+        var promise = pending().promise.cancellable().catch(function(){}).then(done).catch(function() { done(new Error('Should not be called')) });
+        promise.cancel();
+        setTimeout(function() {
+            promise.cancel();
+        }, 50);
+    });
+    specify("Without delay", function(done) {
+        var promise = pending().promise.cancellable().catch(function(){}).then(done).catch(function() { done(new Error('Should not be called')) });
+        promise.cancel()
+        promise.cancel();
+    });
+});