some p
\nmore text\r\nxxx
").appendTo(tmp)).add(jQuery("xxx
").appendTo(tmp)); + equals( x[0].id, "x1", "Check on-the-fly element1" ); + equals( x[1].id, "x2", "Check on-the-fly element2" ); + + var x = jQuery([]).add(jQuery("xxx
").appendTo(tmp)[0]).add(jQuery("xxx
").appendTo(tmp)[0]); + equals( x[0].id, "x1", "Check on-the-fly element1" ); + equals( x[1].id, "x2", "Check on-the-fly element2" ); + var x = jQuery([]).add(jQuery("xxx
")).add(jQuery("xxx
")); equals( x[0].id, "x1", "Check on-the-fly element1" ); equals( x[1].id, "x2", "Check on-the-fly element2" ); @@ -375,6 +450,18 @@ test("add(String|Element|Array|undefined)", function() { ok( jQuery([]).add( document.getElementById('form') ).length >= 13, "Add a form (adds the elements)" ); }); +test("add(String, Context)", function() { + expect(6); + + equals( jQuery(document).add("#form").length, 2, "Make sure that using regular context document still works." ); + equals( jQuery(document.body).add("#form").length, 2, "Using a body context." ); + equals( jQuery(document.body).add("#html").length, 1, "Using a body context." ); + + equals( jQuery(document).add("#form", document).length, 2, "Use a passed in document context." ); + equals( jQuery(document).add("#form", document.body).length, 2, "Use a passed in body context." ); + equals( jQuery(document).add("#html", document.body).length, 1, "Use a passed in body context." ); +}); + test("each(Function)", function() { expect(1); var div = jQuery("div"); @@ -386,6 +473,12 @@ test("each(Function)", function() { ok( pass, "Execute a function, Relative" ); }); +test("index()", function() { + expect(1); + + equals( jQuery("#text2").index(), 2, "Returns the index of a child amongst its siblings" ) +}); + test("index(Object|String|undefined)", function() { expect(16); @@ -418,7 +511,7 @@ test("index(Object|String|undefined)", function() { }); test("jQuery.merge()", function() { - expect(6); + expect(8); var parse = jQuery.merge; @@ -432,10 +525,14 @@ 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"); }); test("jQuery.extend(Object, Object)", function() { - expect(20); + expect(25); var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" }, options = { xnumber2: 1, xstring2: "x", xxx: "newstring" }, @@ -448,18 +545,44 @@ test("jQuery.extend(Object, Object)", function() { deepmerged = { foo: { bar: true, baz: true }, foo2: document }; jQuery.extend(settings, options); - isObj( settings, merged, "Check if extended: settings must be extended" ); - isObj( options, optionsCopy, "Check if not modified: options must not be modified" ); + same( settings, merged, "Check if extended: settings must be extended" ); + same( options, optionsCopy, "Check if not modified: options must not be modified" ); jQuery.extend(settings, null, options); - isObj( settings, merged, "Check if extended: settings must be extended" ); - isObj( options, optionsCopy, "Check if not modified: options must not be modified" ); + same( settings, merged, "Check if extended: settings must be extended" ); + same( options, optionsCopy, "Check if not modified: options must not be modified" ); jQuery.extend(true, deep1, deep2); - isObj( deep1.foo, deepmerged.foo, "Check if foo: settings must be extended" ); - isObj( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" ); + same( deep1.foo, deepmerged.foo, "Check if foo: settings must be extended" ); + same( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" ); equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" ); + var empty = {}; + var optionsWithLength = { foo: { length: -1 } }; + jQuery.extend(true, empty, optionsWithLength); + same( empty.foo, optionsWithLength.foo, "The length property must copy correctly" ); + + empty = {}; + var optionsWithDate = { foo: { date: new Date } }; + jQuery.extend(true, empty, optionsWithDate); + same( empty.foo, optionsWithDate.foo, "Dates copy correctly" ); + + var myKlass = function() {}; + var customObject = new myKlass(); + var optionsWithCustomObject = { foo: { date: customObject } }; + 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" ); + var nullUndef; nullUndef = jQuery.extend({}, options, { xnumber2: null }); ok( nullUndef.xnumber2 === null, "Check to make sure null values are copied"); @@ -473,7 +596,7 @@ test("jQuery.extend(Object, Object)", function() { var target = {}; var recursive = { foo:target, bar:5 }; jQuery.extend(true, target, recursive); - isObj( target, { bar:5 }, "Check to make sure a recursive obj doesn't go never-ending loop by not copying it over" ); + same( target, { bar:5 }, "Check to make sure a recursive obj doesn't go never-ending loop by not copying it over" ); var ret = jQuery.extend(true, { foo: [] }, { foo: [0] } ); // 1907 equals( ret.foo.length, 1, "Check to make sure a value with coersion 'false' copies over when necessary to fix #1907" ); @@ -501,10 +624,10 @@ test("jQuery.extend(Object, Object)", function() { merged2 = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "xx", xxx: "newstringx" }; var settings = jQuery.extend({}, defaults, options1, options2); - isObj( settings, merged2, "Check if extended: settings must be extended" ); - isObj( defaults, defaultsCopy, "Check if not modified: options1 must not be modified" ); - isObj( options1, options1Copy, "Check if not modified: options1 must not be modified" ); - isObj( options2, options2Copy, "Check if not modified: options2 must not be modified" ); + same( settings, merged2, "Check if extended: settings must be extended" ); + same( defaults, defaultsCopy, "Check if not modified: options1 must not be modified" ); + same( options1, options1Copy, "Check if not modified: options1 must not be modified" ); + same( options2, options2Copy, "Check if not modified: options2 must not be modified" ); }); test("jQuery.each(Object,Function)", function() { @@ -533,7 +656,7 @@ test("jQuery.each(Object,Function)", function() { total = 0; jQuery.each({"a":3,"b":3,"c":3}, function(i,v){ total += v; return false; }); equals( total, 3, "Looping over an object, with break" ); - + var f = function(){}; f.foo = 'bar'; jQuery.each(f, function(i){ @@ -577,3 +700,13 @@ test("jQuery.makeArray", function(){ ok( jQuery.makeArray(document.getElementById('form')).length >= 13, "Pass makeArray a form (treat as elements)" ); }); + +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" ); +});