From: jeresig Date: Sat, 23 Jan 2010 21:54:24 +0000 (-0500) Subject: Moved add() tests from core to traversing. X-Git-Url: http://git.asbjorn.it/?p=jquery.git;a=commitdiff_plain;h=ea9e0ed841f0f2851162e01d5199052872ba7483 Moved add() tests from core to traversing. --- diff --git a/test/unit/core.js b/test/unit/core.js index 0026929..a61f8ba 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -491,61 +491,6 @@ test("get(-Number)",function() { "Get a single element with negative index" ) }) -test("add(String|Element|Array|undefined)", function() { - expect(16); - same( jQuery("#sndp").add("#en").add("#sap").get(), q("sndp", "en", "sap"), "Check elements from document" ); - same( jQuery("#sndp").add( jQuery("#en")[0] ).add( jQuery("#sap") ).get(), q("sndp", "en", "sap"), "Check elements from document" ); - ok( jQuery([]).add(jQuery("#form")[0].elements).length >= 13, "Check elements from array" ); - - // For the time being, we're discontinuing support for jQuery(form.elements) since it's ambiguous in IE - // use jQuery([]).add(form.elements) instead. - //equals( jQuery([]).add(jQuery("#form")[0].elements).length, jQuery(jQuery("#form")[0].elements).length, "Array in constructor must equals array in add()" ); - - var divs = jQuery("
").add("#sndp"); - ok( !divs[0].parentNode, "Make sure the first element is still the disconnected node." ); - - divs = jQuery("
test
").add("#sndp"); - equals( divs[0].parentNode.nodeType, 11, "Make sure the first element is still the disconnected node." ); - - divs = jQuery("#sndp").add("
"); - ok( !divs[1].parentNode, "Make sure the first element is still the disconnected node." ); - - var tmp = jQuery("
"); - - var x = jQuery([]).add(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" ); - - var x = jQuery([]).add("

xxx

").add("

xxx

"); - equals( x[0].id, "x1", "Check on-the-fly element1" ); - equals( x[1].id, "x2", "Check on-the-fly element2" ); - - var notDefined; - equals( jQuery([]).add(notDefined).length, 0, "Check that undefined adds nothing" ); - - 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"); diff --git a/test/unit/traversing.js b/test/unit/traversing.js index d297ce3..ecddfb0 100644 --- a/test/unit/traversing.js +++ b/test/unit/traversing.js @@ -383,3 +383,58 @@ test("contents()", function() { equals( c.length, 1, "Check node,textnode,comment contents is just one" ); equals( c[0].nodeValue, "hi", "Check node,textnode,comment contents is just the one from span" ); }); + +test("add(String|Element|Array|undefined)", function() { + expect(16); + same( jQuery("#sndp").add("#en").add("#sap").get(), q("sndp", "en", "sap"), "Check elements from document" ); + same( jQuery("#sndp").add( jQuery("#en")[0] ).add( jQuery("#sap") ).get(), q("sndp", "en", "sap"), "Check elements from document" ); + ok( jQuery([]).add(jQuery("#form")[0].elements).length >= 13, "Check elements from array" ); + + // For the time being, we're discontinuing support for jQuery(form.elements) since it's ambiguous in IE + // use jQuery([]).add(form.elements) instead. + //equals( jQuery([]).add(jQuery("#form")[0].elements).length, jQuery(jQuery("#form")[0].elements).length, "Array in constructor must equals array in add()" ); + + var divs = jQuery("
").add("#sndp"); + ok( !divs[0].parentNode, "Make sure the first element is still the disconnected node." ); + + divs = jQuery("
test
").add("#sndp"); + equals( divs[0].parentNode.nodeType, 11, "Make sure the first element is still the disconnected node." ); + + divs = jQuery("#sndp").add("
"); + ok( !divs[1].parentNode, "Make sure the first element is still the disconnected node." ); + + var tmp = jQuery("
"); + + var x = jQuery([]).add(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" ); + + var x = jQuery([]).add("

xxx

").add("

xxx

"); + equals( x[0].id, "x1", "Check on-the-fly element1" ); + equals( x[1].id, "x2", "Check on-the-fly element2" ); + + var notDefined; + equals( jQuery([]).add(notDefined).length, 0, "Check that undefined adds nothing" ); + + 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." ); +}); \ No newline at end of file