Added support for a new :header psuedo-selector (only selects H1-H6 elements).

[jquery.git] / src / selector / selectorTest.js

diff --git a/src/selector/selectorTest.js b/src/selector/selectorTest.js
index c0f0aed..9ae2233 100644 (file)
--- a/src/selector/selectorTest.js
+++ b/src/selector/selectorTest.js
@@ -3,18 +3,32 @@ module("selector");
 test("element", function() {
        expect(9);
        ok( $("*").size() >= 30, "Select all" );
-       t( "Element Selector", "div", ["main","foo"] );
+       var all = $("*"), good = true;
+       for ( var i = 0; i < all.length; i++ )
+               if ( all[i].nodeType == 8 )
+                       good = false;
+       ok( good, "Select all elements, no comment nodes" );
+       t( "Element Selector", "p", ["firstp","ap","sndp","en","sap","first"] );
        t( "Element Selector", "body", ["body"] );
        t( "Element Selector", "html", ["html"] );
-       t( "Parent Element", "div div", ["foo"] );
+       t( "Parent Element", "div p", ["firstp","ap","sndp","en","sap","first"] );
        ok( $("param", "#object1").length == 2, "Object/param as context" );
        
        ok( $("#length").length, '&lt;input name="length"&gt; cannot be found under IE, see #945' );
        ok( $("#lengthtest input").length, '&lt;input name="length"&gt; cannot be found under IE, see #945' );
-
-       t( "Element Selector with underscore", "foo_bar", ["foobar"] );
 });
 
+if ( location.protocol != "file:" ) {
+       test("Element Selector with underscore", function() {
+               expect(1);
+               stop();
+               $.get("data/with_fries.xml", function(xml) {
+                       ok( $("foo_bar", xml).length == 1, "Element Selector with underscore" );
+                       start();
+               });
+       });
+}
+
 test("broken", function() {
        expect(7);
        t( "Broken Selector", "[", [] );
@@ -27,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", [] );
@@ -58,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() {
@@ -84,10 +100,10 @@ test("class", function() {
 
 test("multiple", function() {
        expect(4);
-       t( "Comma Support", "a.blog, div", ["mark","simon","main","foo"] );
-       t( "Comma Support", "a.blog , div", ["mark","simon","main","foo"] );
-       t( "Comma Support", "a.blog ,div", ["mark","simon","main","foo"] );
-       t( "Comma Support", "a.blog,div", ["mark","simon","main","foo"] );
+       t( "Comma Support", "a.blog, p", ["mark","simon","firstp","ap","sndp","en","sap","first"] );
+       t( "Comma Support", "a.blog , p", ["mark","simon","firstp","ap","sndp","en","sap","first"] );
+       t( "Comma Support", "a.blog ,p", ["mark","simon","firstp","ap","sndp","en","sap","first"] );
+       t( "Comma Support", "a.blog,p", ["mark","simon","firstp","ap","sndp","en","sap","first"] );
 });
 
 test("child and adjacent", function() {
@@ -147,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"] );
@@ -158,7 +174,7 @@ test("pseudo (:) selectors", function() {
        t( "Selected Option Element", "option:selected", ["option1a","option2d","option3b","option3c"] );
        t( "Text Contains", "a:contains('Google')", ["google","groups"] );
        t( "Text Contains", "a:contains('Google Groups')", ["groups"] );
-       t( "Element Preceded By", "p ~ div", ["foo"] );
+       t( "Element Preceded By", "p ~ div", ["foo","fx-queue","fx-tests"] );
        t( "Not", "a.blog:not(.link)", ["mark"] );
        
        t( "nth Element", "p:nth(1)", ["ap"] );
@@ -180,24 +196,28 @@ 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(15);
+       expect(17);
        ok( jQuery.find("//*").length >= 30, "All Elements (//*)" );
-       t( "All Div Elements", "//div", ["main","foo"] );
+       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"] );
        t( "Absolute Path", "/html/body", ["body"] );
        t( "Absolute Path w/ *", "/* /body", ["body"] );
        t( "Long Absolute Path", "/html/body/dl/div/div/p", ["sndp","en","sap"] );
-       t( "Absolute and Relative Paths", "/html//div", ["main","foo"] );
+       t( "Absolute and Relative Paths", "/html//p", ["firstp","ap","sndp","en","sap","first"] );
        t( "All Children, Explicit", "//code/*", ["anchor1","anchor2"] );
        t( "All Children, Implicit", "//code/", ["anchor1","anchor2"] );
        t( "Attribute Exists", "//a[@title]", ["google"] );
        t( "Attribute Equals", "//a[@rel='bookmark']", ["simon1"] );
        t( "Parent Axis", "//p/..", ["main","foo"] );
-       t( "Sibling Axis", "//p/../", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","iframe","lengthtest","table","sndp","en","sap"] );
-       t( "Sibling Axis", "//p/../*", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","iframe","lengthtest","table","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( "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" );