Make settle unreport already-rejected promises. Fix #423

cujojs · Jan 28, 2015 · 31f50e8 · 31f50e8
1 parent d892650
commit 31f50e8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/lib/decorators/array.js b/lib/decorators/array.js
@@ -240,8 +240,12 @@ define(function(require) {
 
 		function settleOne(p) {
 			var h = Promise._handler(p);
-			return h.state() === 0 ? toPromise(p).then(state.fulfilled, state.rejected)
-					: state.inspect(h);
+			if(h.state() === 0) {
+				return toPromise(p).then(state.fulfilled, state.rejected);
+			}
+
+			h._unreport();
+			return state.inspect(h);
 		}
 
 		/**

diff --git a/test/settle-test.js b/test/settle-test.js
@@ -1,5 +1,6 @@
 var buster = typeof window !== 'undefined' ? window.buster : require('buster');
 var assert = buster.assert;
+var refute = buster.refute;
 var fail = buster.referee.fail;
 
 var when = require('../when');
@@ -66,5 +67,16 @@ buster.testCase('when.settle', {
 			assertFulfilled(settled[1], sentinel);
 			assertRejected(settled[2], sentinel);
 		});
+	},
+
+	'should not report unhandled rejection for rejected inputs': function(done) {
+		var P = when.Promise;
+		var spy = P.onPotentiallyUnhandledRejection = this.spy();
+		when.settle([when.reject()]);
+
+		setTimeout(function() {
+			refute.called(spy);
+			done();
+		}, 10);
 	}
 });