X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fselector.js;h=07c4434d093717c6abc1f1373bd86b5eaab9b69d;hb=bf802496c6b1055222814e8cd5185c023eadf202;hp=d6121f25123a3604c6617e8f1dc6d55ef49d74c3;hpb=6728e3cf74d02794113deb0af70a5f9a7caa2241;p=jquery.git diff --git a/test/unit/selector.js b/test/unit/selector.js index d6121f2..07c4434 100644 --- a/test/unit/selector.js +++ b/test/unit/selector.js @@ -12,7 +12,7 @@ test("element", function() { t( "Element Selector", "body", ["body"] ); t( "Element Selector", "html", ["html"] ); t( "Parent Element", "div p", ["firstp","ap","sndp","en","sap","first"] ); - ok( $("param", "#object1").length == 2, "Object/param as context" ); + equals( $("param", "#object1").length, 2, "Object/param as context" ); ok( $("#length").length, '<input name="length"> cannot be found under IE, see #945' ); ok( $("#lengthtest input").length, '<input name="length"> cannot be found under IE, see #945' ); @@ -23,7 +23,7 @@ if ( location.protocol != "file:" ) { expect(1); stop(); $.get("data/with_fries.xml", function(xml) { - ok( $("foo_bar", xml).length == 1, "Element Selector with underscore" ); + equals( $("foo_bar", xml).length, 1, "Element Selector with underscore" ); start(); }); }); @@ -59,16 +59,16 @@ test("id", function() { t( "Child escaped ID", "form > #foo\\:bar", ["foo:bar"] ); t( "Child escaped ID", "form > #test\\.foo\\[5\\]bar", ["test.foo[5]bar"] ); - t( "ID Selector, child ID present", "#form > #radio1", ["radio1"] ); // bug #267 - t( "ID Selector, not an ancestor ID", "#form #first", [] ); + t( "ID Selector, child ID present", "#form > #radio1", ["radio1"] ); // bug #267 + 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 with no children", "#firstUL/*", [] ); $('tName1 AtName2 A
tName1 Div
').appendTo('#main'); - ok( $("#tName1")[0].id == 'tName1', "ID selector with same value for a name attribute" ); - ok( $("#tName2").length == 0, "ID selector non-existing but name attribute on an A tag" ); + equals( $("#tName1")[0].id, 'tName1', "ID selector with same value for a name attribute" ); + equals( $("#tName2").length, 0, "ID selector non-existing but name attribute on an A tag" ); 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 @@ -107,7 +107,7 @@ test("multiple", function() { }); test("child and adjacent", function() { - expect(19); + expect(37); t( "Child", "p > a", ["simon1","google","groups","mark","yahoo","simon"] ); t( "Child", "p> a", ["simon1","google","groups","mark","yahoo","simon"] ); t( "Child", "p >a", ["simon1","google","groups","mark","yahoo","simon"] ); @@ -130,6 +130,25 @@ test("child and adjacent", function() { t( "Nth-child", "#main form#form > *:nth-child(2)", ["text2"] ); t( "Nth-child", "#main form#form > :nth-child(2)", ["text2"] ); + + t( "Nth-child", "#form select:first option:nth-child(3)", ["option1c"] ); + t( "Nth-child", "#form select:first option:nth-child(0n+3)", ["option1c"] ); + t( "Nth-child", "#form select:first option:nth-child(1n+0)", ["option1a", "option1b", "option1c", "option1d"] ); + t( "Nth-child", "#form select:first option:nth-child(1n)", ["option1a", "option1b", "option1c", "option1d"] ); + t( "Nth-child", "#form select:first option:nth-child(n)", ["option1a", "option1b", "option1c", "option1d"] ); + t( "Nth-child", "#form select:first option:nth-child(even)", ["option1b", "option1d"] ); + t( "Nth-child", "#form select:first option:nth-child(odd)", ["option1a", "option1c"] ); + t( "Nth-child", "#form select:first option:nth-child(2n)", ["option1b", "option1d"] ); + t( "Nth-child", "#form select:first option:nth-child(2n+1)", ["option1a", "option1c"] ); + t( "Nth-child", "#form select:first option:nth-child(3n)", ["option1c"] ); + t( "Nth-child", "#form select:first option:nth-child(3n+1)", ["option1a", "option1d"] ); + t( "Nth-child", "#form select:first option:nth-child(3n+2)", ["option1b"] ); + t( "Nth-child", "#form select:first option:nth-child(3n+3)", ["option1c"] ); + t( "Nth-child", "#form select:first option:nth-child(3n-1)", ["option1b"] ); + t( "Nth-child", "#form select:first option:nth-child(3n-2)", ["option1a", "option1d"] ); + t( "Nth-child", "#form select:first option:nth-child(3n-3)", ["option1c"] ); + t( "Nth-child", "#form select:first option:nth-child(3n+0)", ["option1c"] ); + t( "Nth-child", "#form select:first option:nth-child(-n+3)", ["option1a", "option1b", "option1c"] ); }); test("attributes", function() { @@ -163,7 +182,7 @@ test("attributes", function() { }); test("pseudo (:) selectors", function() { - expect(32); + expect(35); 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"] ); @@ -174,8 +193,11 @@ test("pseudo (:) selectors", function() { 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"] ); + t( "Element Preceded By", "p ~ div", ["foo","fx-queue","fx-tests", "moretests"] ); t( "Not", "a.blog:not(.link)", ["mark"] ); + t( "Not - multiple", "#form option:not(:contains('Nothing'),#option1b,:selected)", ["option1c", "option1d", "option2b", "option2c", "option3d"] ); + t( "Not - complex", "#form option:not([id^='opt']:gt(0):nth-child(-n+3))", [ "option1a", "option1d", "option2d", "option3d"] ); + t( "Not - recursive", "#form option:not(:not(:selected))[id^='option3']", [ "option3b", "option3c"] ); t( "nth Element", "p:nth(1)", ["ap"] ); t( "First Element", "p:first", ["firstp"] );