X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=inline;f=src%2Fselector%2FselectorTest.js;h=d6121f25123a3604c6617e8f1dc6d55ef49d74c3;hb=3abf3125cb737f120b6b86c6011fd7ce0e6ba7cc;hp=7644fbea8c92474c813344b68a387aed6a5117ed;hpb=24db022ba06523f92e94ac5fa791fc4865b55ba7;p=jquery.git
diff --git a/src/selector/selectorTest.js b/src/selector/selectorTest.js
index 7644fbe..d6121f2 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", [] );
@@ -63,7 +63,7 @@ test("id", function() {
t( "ID Selector, not an ancestor ID", "#form #first", [] );
t( "ID Selector, not a child ID", "#form > #option1a", [] );
- t( "All Children of ID", "#foo/*", ["sndp", "en", "sap"] );
+ t( "All Children of ID", "#foo > *", ["sndp", "en", "sap"] );
t( "All Children of ID with no children", "#firstUL/*", [] );
$('tName1 AtName2 A
tName1 Div
').appendTo('#main');
@@ -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() {
@@ -126,50 +128,50 @@ test("child and adjacent", function() {
t( "Last Child", "p:last-child", ["sap"] );
t( "Last Child", "a:last-child", ["simon1","anchor1","mark","yahoo","anchor2","simon"] );
- t( "Nth-child", "#main form > *:nth-child(2)", ["text2","idTest"] );
- t( "Nth-child", "#main form > :nth-child(2)", ["text2","idTest"] );
+ t( "Nth-child", "#main form#form > *:nth-child(2)", ["text2"] );
+ t( "Nth-child", "#main form#form > :nth-child(2)", ["text2"] );
});
test("attributes", function() {
expect(20);
- t( "Attribute Exists", "a[@title]", ["google"] );
- t( "Attribute Exists", "*[@title]", ["google"] );
- t( "Attribute Exists", "[@title]", ["google"] );
+ t( "Attribute Exists", "a[title]", ["google"] );
+ t( "Attribute Exists", "*[title]", ["google"] );
+ t( "Attribute Exists", "[title]", ["google"] );
- t( "Attribute Equals", "a[@rel='bookmark']", ["simon1"] );
- t( "Attribute Equals", 'a[@rel="bookmark"]', ["simon1"] );
- t( "Attribute Equals", "a[@rel=bookmark]", ["simon1"] );
- t( "Multiple Attribute Equals", "input[@type='hidden'],input[@type='radio']", ["hidden1","radio1","radio2"] );
- t( "Multiple Attribute Equals", "input[@type=\"hidden\"],input[@type='radio']", ["hidden1","radio1","radio2"] );
- t( "Multiple Attribute Equals", "input[@type=hidden],input[@type=radio]", ["hidden1","radio1","radio2"] );
+ t( "Attribute Equals", "a[rel='bookmark']", ["simon1"] );
+ t( "Attribute Equals", 'a[rel="bookmark"]', ["simon1"] );
+ t( "Attribute Equals", "a[rel=bookmark]", ["simon1"] );
+ t( "Multiple Attribute Equals", "#form input[type='hidden'],#form input[type='radio']", ["hidden1","radio1","radio2"] );
+ t( "Multiple Attribute Equals", "#form input[type=\"hidden\"],#form input[type='radio']", ["hidden1","radio1","radio2"] );
+ t( "Multiple Attribute Equals", "#form input[type=hidden],#form input[type=radio]", ["hidden1","radio1","radio2"] );
- t( "Attribute selector using UTF8", "span[@lang=ä¸æ]", ["å°å"] );
+ t( "Attribute selector using UTF8", "span[lang=ä¸æ]", ["å°å"] );
- t( "Attribute Begins With", "a[@href ^= 'http://www']", ["google","yahoo"] );
- t( "Attribute Ends With", "a[@href $= 'org/']", ["mark"] );
- t( "Attribute Contains", "a[@href *= 'google']", ["google","groups"] );
+ t( "Attribute Begins With", "a[href ^= 'http://www']", ["google","yahoo"] );
+ t( "Attribute Ends With", "a[href $= 'org/']", ["mark"] );
+ t( "Attribute Contains", "a[href *= 'google']", ["google","groups"] );
- t("Select options via [@selected]", "#select1 option[@selected]", ["option1a"] );
- t("Select options via [@selected]", "#select2 option[@selected]", ["option2d"] );
- t("Select options via [@selected]", "#select3 option[@selected]", ["option3b", "option3c"] );
+ t("Select options via [selected]", "#select1 option[selected]", ["option1a"] );
+ t("Select options via [selected]", "#select2 option[selected]", ["option2d"] );
+ t("Select options via [selected]", "#select3 option[selected]", ["option3b", "option3c"] );
- t( "Grouped Form Elements", "input[@name='foo[bar]']", ["hidden2"] );
+ t( "Grouped Form Elements", "input[name='foo[bar]']", ["hidden2"] );
- t( ":not() Existing attribute", "select:not([@multiple])", ["select1", "select2"]);
- t( ":not() Equals attribute", "select:not([@name=select1])", ["select2", "select3"]);
- t( ":not() Equals quoted attribute", "select:not([@name='select1'])", ["select2", "select3"]);
+ t( ":not() Existing attribute", "#form select:not([multiple])", ["select1", "select2"]);
+ t( ":not() Equals attribute", "#form select:not([name=select1])", ["select2", "select3"]);
+ t( ":not() Equals quoted attribute", "#form select:not([name='select1'])", ["select2", "select3"]);
});
test("pseudo (:) selectors", function() {
- expect(30);
+ expect(32);
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"] );
t( "Empty", "ul:empty", ["firstUL"] );
- t( "Enabled UI Element", "input:enabled", ["text1","radio1","radio2","check1","check2","hidden1","hidden2","name","length","idTest"] );
- t( "Disabled UI Element", "input:disabled", ["text2"] );
- t( "Checked UI Element", "input:checked", ["radio2","check1"] );
- t( "Selected Option Element", "option:selected", ["option1a","option2d","option3b","option3c"] );
+ t( "Enabled UI Element", "#form input:enabled", ["text1","radio1","radio2","check1","check2","hidden1","hidden2","name"] );
+ t( "Disabled UI Element", "#form input:disabled", ["text2"] );
+ t( "Checked UI Element", "#form input:checked", ["radio2","check1"] );
+ t( "Selected Option Element", "#form 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","fx-queue","fx-tests"] );
@@ -184,37 +186,17 @@ test("pseudo (:) selectors", function() {
t( "Position Greater Than", "p:gt(0)", ["ap","sndp","en","sap","first"] );
t( "Position Less Than", "p:lt(3)", ["firstp","ap","sndp"] );
t( "Is A Parent", "p:parent", ["firstp","ap","sndp","en","sap","first"] );
- t( "Is Visible", "input:visible", ["text1","text2","radio1","radio2","check1","check2","name","length","idTest"] );
- t( "Is Hidden", "input:hidden", ["hidden1","hidden2"] );
-
- t( "Form element :input", ":input", ["text1", "text2", "radio1", "radio2", "check1", "check2", "hidden1", "hidden2", "name", "button", "area1", "select1", "select2", "select3", "length", "idTest"] );
- t( "Form element :radio", ":radio", ["radio1", "radio2"] );
- t( "Form element :checkbox", ":checkbox", ["check1", "check2"] );
- t( "Form element :text", ":text", ["text1", "text2", "hidden2", "name", "length", "idTest"] );
- 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( "Is Visible", "#form input:visible", ["text1","text2","radio1","radio2","check1","check2","name"] );
+ t( "Is Hidden", "#form input:hidden", ["hidden1","hidden2"] );
+
+ t( "Form element :input", "#form :input", ["text1", "text2", "radio1", "radio2", "check1", "check2", "hidden1", "hidden2", "name", "button", "area1", "select1", "select2", "select3"] );
+ t( "Form element :radio", "#form :radio", ["radio1", "radio2"] );
+ t( "Form element :checkbox", "#form :checkbox", ["check1", "check2"] );
+ t( "Form element :text", "#form :text", ["text1", "text2", "hidden2", "name"] );
+ t( "Form element :radio:checked", "#form :radio:checked", ["radio2"] );
+ t( "Form element :checkbox:checked", "#form :checkbox:checked", ["check1"] );
+ t( "Form element :checkbox:checked, :radio:checked", "#form :checkbox:checked, #form :radio:checked", ["check1", "radio2"] );
-test("basic xpath", function() {
- expect(16);
- 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"] );
- 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//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","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"] );
-
- $("#foo").each(function() {
- isSet( $("/p", this).get(), q("sndp", "en", "sap"), "Check XPath context" );
- });
+ t( "Headers", ":header", ["header", "banner", "userAgent"] );
+ t( "Has Children - :has()", "p:has(a)", ["firstp","ap","en","sap"] );
});