"; equals( jQuery(d).appendTo(jQuery(d)).selector, @@ -253,38 +253,38 @@ test("isPlainObject", function() { // The use case that we want to match ok(jQuery.isPlainObject({}), "{}"); - + // Not objects shouldn't be matched ok(!jQuery.isPlainObject(""), "string"); ok(!jQuery.isPlainObject(0) && !jQuery.isPlainObject(1), "number"); ok(!jQuery.isPlainObject(true) && !jQuery.isPlainObject(false), "boolean"); ok(!jQuery.isPlainObject(null), "null"); ok(!jQuery.isPlainObject(undefined), "undefined"); - + // Arrays shouldn't be matched ok(!jQuery.isPlainObject([]), "array"); - + // Instantiated objects shouldn't be matched ok(!jQuery.isPlainObject(new Date), "new Date"); - + var fn = function(){}; - + // Functions shouldn't be matched ok(!jQuery.isPlainObject(fn), "fn"); - + // Again, instantiated objects shouldn't be matched ok(!jQuery.isPlainObject(new fn), "new fn (no methods)"); - + // Makes the function a little more realistic // (and harder to detect, incidentally) fn.prototype = {someMethod: function(){}}; - + // Again, instantiated objects shouldn't be matched ok(!jQuery.isPlainObject(new fn), "new fn"); // DOM Element ok(!jQuery.isPlainObject(document.createElement("div")), "DOM Element"); - + // Window ok(!jQuery.isPlainObject(window), "window"); @@ -298,7 +298,7 @@ test("isPlainObject", function() { document.body.removeChild( iframe ); start(); }; - + var doc = iframe.contentDocument || iframe.contentWindow.document; doc.open(); doc.write(""); @@ -659,7 +659,7 @@ test("jQuery.merge()", function() { // Fixed at [5998], #3641 same( parse([-2,-1], [0,1,2]), [-2,-1,0,1,2], "Second array including a zero (falsy)"); - + // After fixing #5527 same( parse([], [null, undefined]), [null, undefined], "Second array including null and undefined values"); same( parse({length:0}, [1,2]), {length:2, 0:1, 1:2}, "First array like"); @@ -694,7 +694,7 @@ test("jQuery.extend(Object, Object)", function() { equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" ); ok( jQuery.extend(true, {}, nestedarray).arr !== arr, "Deep extend of object must clone child array" ); - + // #5991 ok( jQuery.isArray( jQuery.extend(true, { arr: {} }, nestedarray).arr ), "Cloned array heve to be an Array" ); ok( jQuery.isPlainObject( jQuery.extend(true, { arr: arr }, { arr: {} }).arr ), "Cloned object heve to be an plain object" ); @@ -715,13 +715,13 @@ test("jQuery.extend(Object, Object)", function() { empty = {}; jQuery.extend(true, empty, optionsWithCustomObject); ok( empty.foo && empty.foo.date === customObject, "Custom objects copy correctly (no methods)" ); - + // Makes the class a little more realistic myKlass.prototype = { someMethod: function(){} }; empty = {}; jQuery.extend(true, empty, optionsWithCustomObject); ok( empty.foo && empty.foo.date === customObject, "Custom objects copy correctly" ); - + var ret = jQuery.extend(true, { foo: 4 }, { foo: new Number(5) } ); ok( ret.foo == 5, "Wrapped numbers copy correctly" ); @@ -849,10 +849,10 @@ test("jQuery.makeArray", function(){ test("jQuery.isEmptyObject", function(){ expect(2); - + equals(true, jQuery.isEmptyObject({}), "isEmptyObject on empty object literal" ); equals(false, jQuery.isEmptyObject({a:1}), "isEmptyObject on non-empty object literal" ); - + // What about this ? // equals(true, jQuery.isEmptyObject(null), "isEmptyObject on null" ); }); @@ -878,23 +878,23 @@ test("jQuery.proxy", function(){ test("jQuery.parseJSON", function(){ expect(8); - + equals( jQuery.parseJSON(), null, "Nothing in, null out." ); equals( jQuery.parseJSON( null ), null, "Nothing in, null out." ); equals( jQuery.parseJSON( "" ), null, "Nothing in, null out." ); - + same( jQuery.parseJSON("{}"), {}, "Plain object parsing." ); same( jQuery.parseJSON('{"test":1}'), {"test":1}, "Plain object parsing." ); same( jQuery.parseJSON('\n{"test":1}'), {"test":1}, "Make sure leading whitespaces are handled." ); - + try { jQuery.parseJSON("{a:1}"); ok( false, "Test malformed JSON string." ); } catch( e ) { ok( true, "Test malformed JSON string." ); } - + try { jQuery.parseJSON("{'a':1}"); ok( false, "Test malformed JSON string." ); @@ -904,251 +904,157 @@ test("jQuery.parseJSON", function(){ }); test("jQuery._Deferred()", function() { - - expect( 14 ); - + + expect( 10 ); + var deferred, object, test; - + deferred = jQuery._Deferred(); - + test = false; - - deferred.then( function( value ) { + + deferred.done( function( value ) { equals( value , "value" , "Test pre-resolve callback" ); test = true; } ); - + deferred.resolve( "value" ); - + ok( test , "Test pre-resolve callbacks called right away" ); test = false; - - deferred.then( function( value ) { + + deferred.done( function( value ) { equals( value , "value" , "Test post-resolve callback" ); test = true; } ); - + ok( test , "Test post-resolve callbacks called right away" ); - + deferred.cancel(); - - test = true; - - deferred.then( function() { - ok( false , "Manual cancel was ignored" ); - test = false; - } ); - - ok( test , "Test manual cancel" ); - - deferred = jQuery._Deferred().then( function() { - return false; - } ); - - deferred.resolve(); - + test = true; - - deferred.then( function() { + + deferred.done( function() { + ok( false , "Cancel was ignored" ); test = false; } ); - - ok( test , "Test cancel by returning false" ); + + ok( test , "Test cancel" ); + + deferred = jQuery._Deferred().resolve(); try { - deferred = jQuery._Deferred().resolve().then( function() { + deferred.done( function() { throw "Error"; } , function() { - ok( false , "Test deferred cancel on exception" ); + ok( true , "Test deferred do not cancel on exception" ); } ); } catch( e ) { strictEqual( e , "Error" , "Test deferred propagates exceptions"); - deferred.then(); + deferred.done(); } - + test = ""; - deferred = jQuery._Deferred().then( function() { - + deferred = jQuery._Deferred().done( function() { + test += "A"; - + }, function() { - + test += "B"; - + } ).resolve(); - - strictEqual( test , "AB" , "Test multiple then parameters" ); - + + strictEqual( test , "AB" , "Test multiple done parameters" ); + test = ""; - - deferred.then( function() { - - deferred.then( function() { - + + deferred.done( function() { + + deferred.done( function() { + test += "C"; - + } ); - + test += "A"; - + }, function() { - + test += "B"; } ); - - strictEqual( test , "ABC" , "Test then callbacks order" ); - - deferred = jQuery._Deferred( false ).resolve().cancel(); - - deferred.then( function() { - ok( true , "Test non-cancellable deferred not cancelled manually"); - return false; - } ); - deferred.then( function() { - ok( true , "Test non-cancellable deferred not cancelled by returning false"); - } ); - - try { - deferred.then( function() { - throw "Error"; - } , function() { - ok( true , "Test non-cancellable deferred keeps callbacks after exception" ); - } ); - } catch( e ) { - strictEqual( e , "Error" , "Test non-cancellable deferred propagates exceptions"); - deferred.then(); - } - + strictEqual( test , "ABC" , "Test done callbacks order" ); + deferred = jQuery._Deferred(); - - deferred.fire( jQuery , [ document ] ).then( function( doc ) { + + deferred.fire( jQuery , [ document ] ).done( function( doc ) { ok( this === jQuery && arguments.length === 1 && doc === document , "Test fire context & args" ); }); }); test("jQuery.Deferred()", function() { - - expect( 8 ); - + + expect( 4 ); + jQuery.Deferred( function( defer ) { strictEqual( this , defer , "Defer passed as this & first argument" ); this.resolve( "done" ); }).then( function( value ) { strictEqual( value , "done" , "Passed function executed" ); }); - + jQuery.Deferred().resolve().then( function() { ok( true , "Success on resolve" ); - }).fail( function() { + }, function() { ok( false , "Error on resolve" ); }); - + jQuery.Deferred().reject().then( function() { ok( false , "Success on reject" ); - }).fail( function() { + }, function() { ok( true , "Error on reject" ); }); - - var flag = true; - - jQuery.Deferred().resolve().cancel().then( function() { - ok( flag = false , "Success on resolve/cancel" ); - }).fail( function() { - ok( flag = false , "Error on resolve/cancel" ); - }); - - ok( flag , "Cancel on resolve" ); - - flag = true; - - jQuery.Deferred().reject().cancel().then( function() { - ok( flag = false , "Success on reject/cancel" ); - }).fail( function() { - ok( flag = false , "Error on reject/cancel" ); - }); - - ok( flag , "Cancel on reject" ); - - jQuery.Deferred( false ).resolve().then( function() { - return false; - } , function() { - ok( true , "Not cancelled on resolve" ); - }); - - jQuery.Deferred( false ).reject().fail( function() { - return false; - } , function() { - ok( true , "Not cancelled on reject" ); - }); - -}); - -test("jQuery.isDeferred()", function() { - - expect( 11 ); - - var object1 = { then: function() { return this; } }, - object2 = { then: function() { return this; } }; - - object2.then._ = []; - - // The use case that we want to match - ok(jQuery.isDeferred(jQuery._Deferred()), "Simple deferred"); - ok(jQuery.isDeferred(jQuery.Deferred()), "Failable deferred"); - - // Some other objects - ok(!jQuery.isDeferred(object1), "Object with then & no marker"); - ok(!jQuery.isDeferred(object2), "Object with then & marker"); - - // Not objects shouldn't be matched - ok(!jQuery.isDeferred(""), "string"); - ok(!jQuery.isDeferred(0) && !jQuery.isDeferred(1), "number"); - ok(!jQuery.isDeferred(true) && !jQuery.isDeferred(false), "boolean"); - ok(!jQuery.isDeferred(null), "null"); - ok(!jQuery.isDeferred(undefined), "undefined"); - - object1 = {custom: jQuery._Deferred().then}; - - ok(!jQuery.isDeferred(object1) , "custom method name not found automagically"); - ok(jQuery.isDeferred(object1,"custom") , "custom method name"); }); test("jQuery.when()", function() { - - expect( 5 ); - - var cache, i, deferred = { done: jQuery.Deferred().resolve( 1 ).then }; - - for( i = 1 ; i < 3 ; i++ ) { + + expect( 21 ); + + // Some other objects + jQuery.each( { + + "an empty string": "", + "a non-empty string": "some string", + "zero": 0, + "a number other than zero": 1, + "true": true, + "false": false, + "null": null, + "undefined": undefined, + "a plain object": {} + + } , function( message , value ) { + + ok( jQuery.isFunction( jQuery.when( value ).then( function( resolveValue ) { + strictEqual( resolveValue , value , "Test the promise was resolved with " + message ); + } ).promise ) , "Test " + message + " triggers the creation of a new Promise" ); + + } ); + + var cache, i; + + for( i = 1 ; i < 4 ; i++ ) { jQuery.when( cache || jQuery.Deferred( function() { this.resolve( i ); }) ).then( function( value ) { strictEqual( value , 1 , "Function executed" + ( i > 1 ? " only once" : "" ) ); cache = value; - }).fail( function() { + }, function() { ok( false , "Fail called" ); }); } - - cache = 0; - - for( i = 1 ; i < 3 ; i++ ) { - jQuery.when( cache || deferred , "done" ).done( function( value ) { - strictEqual( value , 1 , "Custom method: resolved" + ( i > 1 ? " only once" : "" ) ); - cache = value; - }).fail( function() { - ok( false , "Custom method: fail called" ); - }); - } - - stop(); - - jQuery.when( jQuery( document ) , "ready" ).then( function( test ) { - strictEqual( test , jQuery , "jQuery.fn.ready recognized as a deferred" ); - start(); - }); });