X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Ftraversing.js;h=e4b3e9537c9f5fd0e655ba5b23261680414eeaaa;hb=948c0dfffcf077ed71e4712b38a33d06ea63264c;hp=f5c88e42ceadd87d257552ce56a910cffb022cc8;hpb=879799fe955f01b85b59fd8a0096d415fc48df03;p=jquery.git

diff --git a/test/unit/traversing.js b/test/unit/traversing.js
index f5c88e4..e4b3e95 100644
--- a/test/unit/traversing.js
+++ b/test/unit/traversing.js
@@ -1,12 +1,16 @@
 module("traversing");
 
 test("find(String)", function() {
-	expect(2);
+	expect(5);
 	equals( 'Yahoo', jQuery('#foo').find('.blogTest').text(), 'Check for find' );
 
 	// using contents will get comments regular, text, and comment nodes
 	var j = jQuery("#nonnodes").contents();
 	equals( j.find("div").length, 0, "Check node,textnode,comment to find zero divs" );
+
+	same( jQuery("#main").find("> div").get(), q("foo", "moretests", "tabindex-tests", "liveHandlerOrder", "siblingTest"), "find child elements" );
+	same( jQuery("#main").find("> #foo, > #moretests").get(), q("foo", "moretests"), "find child elements" );
+	same( jQuery("#main").find("> #foo > p").get(), q("sndp", "en", "sap"), "find child elements" );
 });
 
 test("is(String)", function() {
@@ -120,7 +124,7 @@ test("filter(jQuery)", function() {
 })
 
 test("closest()", function() {
-	expect(10);
+	expect(11);
 	same( jQuery("body").closest("body").get(), q("body"), "closest(body)" );
 	same( jQuery("body").closest("html").get(), q("html"), "closest(html)" );
 	same( jQuery("body").closest("div").get(), [], "closest(div)" );
@@ -137,7 +141,9 @@ test("closest()", function() {
 	
 	//Test that .closest() returns unique'd set
 	equals( jQuery('#main p').closest('#main').length, 1, "Closest should return a unique set" );
-	
+
+	// Test on disconnected node
+	equals( jQuery("<div><p></p></div>").find("p").closest("table").length, 0, "Make sure disconnected closest work." );
 });
 
 test("closest(Array)", function() {
@@ -434,12 +440,13 @@ test("add(String|Element|Array|undefined)", function() {
 
 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." );
+	
+	deepEqual( jQuery( "#firstp" ).add( "#ap" ).get(), q( "firstp", "ap" ), "Add selector to selector " );
+	deepEqual( jQuery( document.getElementById("firstp") ).add( "#ap" ).get(), q( "firstp", "ap" ), "Add gEBId to selector" );
+	deepEqual( jQuery( document.getElementById("firstp") ).add( document.getElementById("ap") ).get(), q( "firstp", "ap" ), "Add gEBId to gEBId" );
+
+	var ctx = document.getElementById("firstp");
+	deepEqual( jQuery( "#firstp" ).add( "#ap", ctx ).get(), q( "firstp" ), "Add selector to selector " );
+	deepEqual( jQuery( document.getElementById("firstp") ).add( "#ap", ctx ).get(), q( "firstp" ), "Add gEBId to selector, not in context" );
+	deepEqual( jQuery( document.getElementById("firstp") ).add( "#ap", document.getElementsByTagName("body")[0] ).get(), q( "firstp", "ap" ), "Add gEBId to selector, in context" );
 });