X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fselector%2FselectorTest.js;h=9ae223309c8222466c25711997459cbe4f209551;hb=456f0fe5985eaad42eba456b9ff710771669607c;hp=7644fbea8c92474c813344b68a387aed6a5117ed;hpb=24db022ba06523f92e94ac5fa791fc4865b55ba7;p=jquery.git

diff --git a/src/selector/selectorTest.js b/src/selector/selectorTest.js
index 7644fbe..9ae2233 100644
--- a/src/selector/selectorTest.js
+++ b/src/selector/selectorTest.js
@@ -41,7 +41,7 @@ test("broken", function() {
 });
 
 test("id", function() {
-	expect(24);
+	expect(25);
 	t( "ID Selector", "#body", ["body"] );
 	t( "ID Selector w/ Element", "body#body", ["body"] );
 	t( "ID Selector w/ Element", "ul#first", [] );
@@ -72,6 +72,8 @@ test("id", function() {
 	t( "ID Selector on Form with an input that has a name of 'id'", "#lengthtest", ["lengthtest"] );
 	
 	t( "ID selector with non-existant ancestor", "#asdfasdf #foobar", [] ); // bug #986
+
+	isSet( $("body").find("div#form"), [], "ID selector within the context of another element" );
 });
 
 test("class", function() {
@@ -161,7 +163,7 @@ test("attributes", function() {
 });
 
 test("pseudo (:) selectors", function() {
-	expect(30);
+	expect(31);
 	t( "First Child", "p:first-child", ["firstp","sndp"] );
 	t( "Last Child", "p:last-child", ["sap"] );
 	t( "Only Child", "a:only-child", ["simon1","anchor1","yahoo","anchor2"] );
@@ -194,10 +196,12 @@ test("pseudo (:) selectors", function() {
 	t( "Form element :radio:checked", ":radio:checked", ["radio2"] );
 	t( "Form element :checkbox:checked", ":checkbox:checked", ["check1"] );
 	t( "Form element :checkbox:checked, :radio:checked", ":checkbox:checked, :radio:checked", ["check1", "radio2"] );
+
+	t( "Headers", ":header", ["header", "banner", "userAgent"] );
 });
 
 test("basic xpath", function() {
-	expect(16);
+	expect(17);
 	ok( jQuery.find("//*").length >= 30, "All Elements (//*)" );
 	ok( jQuery.find("//div", q("main")[0])[0] = q("foo")[0], "All Relative (#main//div)" );
 	t( "All P Elements", "//p", ["firstp","ap","sndp","en","sap","first"] );
@@ -213,6 +217,7 @@ test("basic xpath", function() {
 	t( "Sibling Axis", "//p/../", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","iframe","lengthtest","table","fx-queue","fx-tests","sndp","en","sap"] );
 	t( "Sibling Axis", "//p/../*", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","iframe","lengthtest","table","fx-queue","fx-tests","sndp","en","sap"] );
 	t( "Has Children", "//p[a]", ["firstp","ap","en","sap"] );
+	t( "Has Children - :has()", "//p:has(a)", ["firstp","ap","en","sap"] );
 	
 	$("#foo").each(function() {
 		isSet( $("/p", this).get(), q("sndp", "en", "sap"), "Check XPath context" );