X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=inline;f=test%2Funit%2Fcore.js;h=0640cf5ce24052c6c1137c1d6d41999c1dff04b1;hb=df6e02a4a7d8da037ebdb812e6b92a067223a6ea;hp=46858ceef30ec8eb91e62a15c2d5f02f09f1f921;hpb=569c8b45c0d301663f3f6c88b606d199fc78ec1a;p=jquery.git diff --git a/test/unit/core.js b/test/unit/core.js index 46858ce..0640cf5 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -29,7 +29,7 @@ test("jQuery()", function() { var main = jQuery("#main"); - isSet( jQuery("div p", main).get(), q("sndp", "en", "sap"), "Basic selector with jQuery object as context" ); + same( jQuery("div p", main).get(), q("sndp", "en", "sap"), "Basic selector with jQuery object as context" ); /* // disabled since this test was doing nothing. i tried to fix it but i'm not sure @@ -62,7 +62,7 @@ test("jQuery()", function() { }); test("selector state", function() { - expect(30); + expect(31); var test; @@ -126,6 +126,13 @@ test("selector state", function() { test = jQuery("#main").eq(0); equals( test.selector, "#main.slice(0,1)", "#main eq Selector" ); equals( test.context, document, "#main eq Context" ); + + var d = "
"; + equals( + jQuery(d).appendTo(jQuery(d)).selector, + jQuery(d).appendTo(d).selector, + "manipulation methods make same selector for jQuery objects" + ); }); test("browser", function() { @@ -182,6 +189,17 @@ test("noConflict", function() { jQuery = $$; }); +test("trim", function() { + expect(4); + + var nbsp = String.fromCharCode(160); + + equals( jQuery.trim("hello "), "hello", "trailing space" ); + equals( jQuery.trim(" hello"), "hello", "leading space" ); + equals( jQuery.trim(" hello "), "hello", "space on both sides" ); + equals( jQuery.trim(" " + nbsp + "hello " + nbsp + " "), "hello", " " ); +}); + test("isFunction", function() { expect(19); @@ -303,7 +321,7 @@ test("isXMLDoc - XML", function() { } test("jQuery('html')", function() { - expect(13); + expect(15); reset(); jQuery.foo = false; @@ -332,12 +350,15 @@ test("jQuery('html')", function() { ok( j.length >= 2, "Check node,textnode,comment creation (some browsers delete comments)" ); ok( !jQuery("")[0].selected, "Make sure that options are auto-selected #2050" ); + + ok( jQuery("")[0], "Create a div with closing tag." ); + ok( jQuery("xxx
").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" ); @@ -419,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"); @@ -468,7 +511,7 @@ test("index(Object|String|undefined)", function() { }); test("jQuery.merge()", function() { - expect(6); + expect(8); var parse = jQuery.merge; @@ -482,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(23); + expect(25); var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" }, options = { xnumber2: 1, xstring2: "x", xxx: "newstring" }, @@ -498,33 +545,43 @@ 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); - isObj( empty.foo, optionsWithLength.foo, "The length property must copy correctly" ); + same( empty.foo, optionsWithLength.foo, "The length property must copy correctly" ); empty = {}; var optionsWithDate = { foo: { date: new Date } }; jQuery.extend(true, empty, optionsWithDate); - isObj( empty.foo, optionsWithDate.foo, "Dates copy correctly" ); + same( empty.foo, optionsWithDate.foo, "Dates copy correctly" ); var myKlass = function() {}; + var customObject = new myKlass(); + var optionsWithCustomObject = { foo: { date: customObject } }; empty = {}; - var optionsWithCustomObject = { foo: { date: new myKlass } }; jQuery.extend(true, empty, optionsWithCustomObject); - isObj( empty.foo, optionsWithCustomObject.foo, "Custom objects copy correctly" ); + 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 }); @@ -539,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" ); @@ -567,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() {