deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:jquery/jquery into 1.7/callbacks

Browse source 
Conflicts:
	src/deferred.js
This commit is contained in:
jaubourg 2011-05-09 10:19:12 +02:00
commit d65b27810b
4 changed files with 47 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
test/unit/deferred.js
View file

@ -53,7 +53,7 @@ jQuery.each( [ "", " - new operator" ], function( _, withNew ) {
test( "jQuery.Deferred.pipe - filtering (done)", function() {
expect(3);
expect(4);
var defer = jQuery.Deferred(),
piped = defer.pipe(function( a, b ) {
@ -81,11 +81,15 @@ test( "jQuery.Deferred.pipe - filtering (done)", function() {
jQuery.Deferred().reject().pipe(function() {
ok( false, "pipe should not be called on reject" );
});
jQuery.Deferred().resolve().pipe( jQuery.noop ).done(function( value ) {
strictEqual( value, undefined, "pipe done callback can return undefined/null" );
});
});
test( "jQuery.Deferred.pipe - filtering (fail)", function() {
expect(3);
expect(4);
var defer = jQuery.Deferred(),
piped = defer.pipe( null, function( a, b ) {
@ -113,6 +117,10 @@ test( "jQuery.Deferred.pipe - filtering (fail)", function() {
jQuery.Deferred().resolve().pipe( null, function() {
ok( false, "pipe should not be called on resolve" );
} );
jQuery.Deferred().reject().pipe( null, jQuery.noop ).fail(function( value ) {
strictEqual( value, undefined, "pipe fail callback can return undefined/null" );
});
});
test( "jQuery.Deferred.pipe - filtering (progress)", function() {