Deferred: Propagate progress correctly from unwrapped promises

mgol · mgol · commit d5dae259eb52 · 2016-06-09T14:53:34.000+02:00
Progress parameters are now correctly propagated from a deferred to which another deferred resolved unwrapping it. Thanks to @gibson042 for the report and a clear description of the problem and the needed fix. Fixes gh-3062 Closes gh-3150
diff --git a/src/deferred.js b/src/deferred.js
@@ -162,7 +162,7 @@ jQuery.extend( {
 												resolve( maxDepth, deferred, Identity, special ),
 												resolve( maxDepth, deferred, Thrower, special ),
 												resolve( maxDepth, deferred, Identity,
-													deferred.notify )
+													deferred.notifyWith )
 											);
 										}
 
diff --git a/test/unit/deferred.js b/test/unit/deferred.js
@@ -768,6 +768,36 @@ QUnit.test( "jQuery.Deferred - notify and resolve", function( assert ) {
 	} );
 } );
 
+QUnit.test( "jQuery.Deferred - resolved to a notifying deferred", function( assert ) {
+
+	assert.expect( 2 );
+
+    var deferred = jQuery.Deferred(),
+		done = assert.async( 2 );
+
+	deferred.resolve( jQuery.Deferred( function( notifyingDeferred ) {
+	    notifyingDeferred.notify( "foo", "bar" );
+	    notifyingDeferred.resolve( "baz", "quux" );
+	} ) );
+
+	// Apply an empty then to force thenable unwrapping.
+	// See https://github.com/jquery/jquery/issues/3000 for more info.
+	deferred.then().then( function() {
+		assert.deepEqual(
+			[].slice.call( arguments ),
+			[ "baz", "quux" ],
+			"The fulfilled handler receives proper params"
+		);
+		done();
+	}, null, function() {
+		assert.deepEqual(
+			[].slice.call( arguments ),
+			[ "foo", "bar" ],
+			"The progress handler receives proper params"
+		);
+		done();
+	} );
+} );
 
 QUnit.test( "jQuery.when(nonThenable) - like Promise.resolve", function( assert ) {
 	"use strict";

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ jQuery.extend( {`
`162`	`162`	`resolve( maxDepth, deferred, Identity, special ),`
`163`	`163`	`resolve( maxDepth, deferred, Thrower, special ),`
`164`	`164`	`resolve( maxDepth, deferred, Identity,`
`165`		`- deferred.notify )`
	`165`	`+ deferred.notifyWith )`
`166`	`166`	`);`
`167`	`167`	`}`
`168`	`168`