});\r
\r
test("$()", function() {\r
- expect(4);\r
+ expect(8);\r
\r
var main = $("#main");\r
isSet( $("div p", main).get(), q("sndp", "en", "sap"), "Basic selector with jQuery object as context" );\r
equals( img.length, 1, "Correct number of elements generated for img" );\r
var div = $("<div/><hr/><code/><b/>");\r
equals( div.length, 4, "Correct number of elements generated for div hr code b" );\r
+ \r
+ // can actually yield more than one, when iframes are included, the window is an array as well\r
+ equals( $(window).length, 1, "Correct number of elements generated for window" );\r
+ \r
+ equals( $(document).length, 1, "Correct number of elements generated for document" );\r
+ \r
+ equals( $([1,2,3]).get(1), 2, "Test passing an array to the factory" );\r
+ \r
+ equals( $(document.body).get(0), $('body').get(0), "Test passing an html node to the factory" );\r
});\r
\r
test("browser", function() {\r
});\r
\r
test("$.extend(Object, Object)", function() {\r
- expect(17);\r
+ expect(20);\r
\r
var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },\r
options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },\r
isObj( deep1.foo, deepmerged.foo, "Check if foo: settings must be extended" );\r
isObj( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" );\r
equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" );\r
-\r
+ \r
+ var nullUndef;\r
+ nullUndef = jQuery.extend({}, options, { xnumber2: null });\r
+ ok( nullUndef.xnumber2 === null, "Check to make sure null values are copied");\r
+ \r
+ nullUndef = jQuery.extend({}, options, { xnumber2: undefined });\r
+ ok( nullUndef.xnumber2 === options.xnumber2, "Check to make sure undefined values are not copied");\r
+ \r
+ nullUndef = jQuery.extend({}, options, { xnumber0: null });\r
+ ok( nullUndef.xnumber0 === null, "Check to make sure null values are inserted");\r
+ \r
var target = {};\r
var recursive = { foo:target, bar:5 };\r
jQuery.extend(true, target, recursive);\r
});\r
\r
test("$.data", function() {\r
- expect(3);\r
+ expect(5);\r
var div = $("#foo")[0];\r
ok( jQuery.data(div, "test") == undefined, "Check for no data exists" );\r
jQuery.data(div, "test", "success");\r
ok( jQuery.data(div, "test") == "success", "Check for added data" );\r
jQuery.data(div, "test", "overwritten");\r
ok( jQuery.data(div, "test") == "overwritten", "Check for overwritten data" );\r
+ jQuery.data(div, "test", undefined);\r
+ ok( jQuery.data(div, "test") == "overwritten", "Check that data wasn't removed");\r
+ jQuery.data(div, "test", null);\r
+ ok( jQuery.data(div, "test") === null, "Check for null data");\r
});\r
\r
test(".data()", function() {\r
- expect(16);\r
+ expect(18);\r
var div = $("#foo");\r
ok( div.data("test") == undefined, "Check for no data exists" );\r
div.data("test", "success");\r
ok( div.data("test") == "success", "Check for added data" );\r
div.data("test", "overwritten");\r
ok( div.data("test") == "overwritten", "Check for overwritten data" );\r
-\r
+ div.data("test", undefined);\r
+ ok( div.data("test") == "overwritten", "Check that data wasn't removed");\r
+ div.data("test", null);\r
+ ok( div.data("test") === null, "Check for null data");\r
+ \r
+ div.data("test", "overwritten");\r
var hits = {test:0}, gets = {test:0};\r
-\r
+ \r
div\r
.bind("setData",function(e,key,value){ hits[key] += value; })\r
.bind("setData.foo",function(e,key,value){ hits[key] += value; })\r
});\r
\r
test("map()", function() {\r
- expect(6);\r
+ expect(2);//expect(6);\r
\r
isSet(\r
$("#ap").map(function(){\r
"Single Map"\r
);\r
\r
+ return;//these haven't been accepted yet\r
+ \r
//for #2616\r
var keys = $.map( {a:1,b:2}, function( v, k ){\r
return k;\r