X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Ftraversing.js;h=4233f70f9c174c917edf06d88ff5131a4e7e6987;hb=0636dffc2481c14368464a22ffa1bd8017da2a26;hp=f406ac724e08e8a631b14c835f2f7cc25326d615;hpb=474d814076963f41157c0054448984c00fd46c1b;p=jquery.git
diff --git a/test/unit/traversing.js b/test/unit/traversing.js
index f406ac7..4233f70 100644
--- a/test/unit/traversing.js
+++ b/test/unit/traversing.js
@@ -138,13 +138,13 @@ test("closest()", function() {
test("closest(Array)", function() {
expect(6);
- same( jQuery("body").closest(["body"]), [{selector:"body", elem:document.body}], "closest([body])" );
- same( jQuery("body").closest(["html"]), [{selector:"html", elem:document.documentElement}], "closest([html])" );
+ same( jQuery("body").closest(["body"]), [{selector:"body", elem:document.body, level:1}], "closest([body])" );
+ same( jQuery("body").closest(["html"]), [{selector:"html", elem:document.documentElement, level:2}], "closest([html])" );
same( jQuery("body").closest(["div"]), [], "closest([div])" );
- same( jQuery("#main").closest(["span,#html"]), [{selector:"span,#html", elem:document.documentElement}], "closest([span,#html])" );
+ same( jQuery("#main").closest(["span,#html"]), [{selector:"span,#html", elem:document.documentElement, level:4}], "closest([span,#html])" );
- same( jQuery("body").closest(["body","html"]), [{selector:"body", elem:document.body}, {selector:"html", elem:document.documentElement}], "closest([body, html])" );
- same( jQuery("body").closest(["span","html"]), [{selector:"html", elem:document.documentElement}], "closest([body, html])" );
+ same( jQuery("body").closest(["body","html"]), [{selector:"body", elem:document.body, level:1}, {selector:"html", elem:document.documentElement, level:2}], "closest([body, html])" );
+ same( jQuery("body").closest(["span","html"]), [{selector:"html", elem:document.documentElement, level:2}], "closest([body, html])" );
});
test("not(Selector)", function() {
@@ -152,7 +152,7 @@ test("not(Selector)", function() {
equals( jQuery("#main > p#ap > a").not("#google").length, 2, "not('selector')" );
same( jQuery("p").not(".result").get(), q("firstp", "ap", "sndp", "en", "sap", "first"), "not('.class')" );
same( jQuery("p").not("#ap, #sndp, .result").get(), q("firstp", "en", "sap", "first"), "not('selector, selector')" );
- same( jQuery("#form option").not("option.emptyopt:contains('Nothing'),[selected],[value='1']").get(), q("option1c", "option1d", "option2c", "option3d", "option3e" ), "not('complex selector')");
+ same( jQuery("#form option").not("option.emptyopt:contains('Nothing'),[selected],[value='1']").get(), q("option1c", "option1d", "option2c", "option3d", "option3e", "option4e" ), "not('complex selector')");
same( jQuery('#ap *').not('code').get(), q("google", "groups", "anchor1", "mark"), "not('tag selector')" );
same( jQuery('#ap *').not('code, #mark').get(), q("google", "groups", "anchor1"), "not('tag, ID selector')" );
@@ -163,7 +163,7 @@ test("not(Element)", function() {
expect(1);
var selects = jQuery("#form select");
- same( selects.not( selects[1] ).get(), q("select1", "select3"), "filter out DOM element");
+ same( selects.not( selects[1] ).get(), q("select1", "select3", "select4"), "filter out DOM element");
});
test("not(Function)", function() {
@@ -317,7 +317,7 @@ test("prevAll([String])", function() {
});
test("nextUntil([String])", function() {
- expect(10);
+ expect(11);
var elems = jQuery('#form').children().slice( 2, 12 );
@@ -331,6 +331,8 @@ test("nextUntil([String])", function() {
same( jQuery("#text1").nextUntil("#area1", "button,input").get(), elems.get(), "Multiple-filtered nextUntil check" );
equals( jQuery("#text1").nextUntil("#area1", "div").length, 0, "Filtered nextUntil check, no match" );
same( jQuery("#text1, #hidden1").nextUntil("#area1", "button,input").get(), elems.get(), "Multi-source, multiple-filtered nextUntil check" );
+
+ same( jQuery("#text1").nextUntil("[class=foo]").get(), jQuery("#text1").nextAll().get(), "Non-element nodes must be skipped, since they have no attributes" );
});
test("prevUntil([String])", function() {
@@ -381,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." );
+});