11module ( "selector" ) ;
22
33test ( "element" , function ( ) {
4- expect ( 18 ) ;
5- QUnit . reset ( ) ;
4+ expect ( 19 ) ;
5+ reset ( ) ;
66
77 ok ( jQuery ( "*" ) . size ( ) >= 30 , "Select all" ) ;
88 var all = jQuery ( "*" ) , good = true ;
@@ -21,13 +21,14 @@ test("element", function() {
2121 same ( jQuery ( "p" , jQuery ( "div" ) ) . get ( ) , q ( "firstp" , "ap" , "sndp" , "en" , "sap" , "first" ) , "Finding elements with a context." ) ;
2222 same ( jQuery ( "div" ) . find ( "p" ) . get ( ) , q ( "firstp" , "ap" , "sndp" , "en" , "sap" , "first" ) , "Finding elements with a context." ) ;
2323
24- same ( jQuery ( "#form" ) . find ( "select" ) . get ( ) , q ( "select1" , "select2" , "select3" , "select4" , "select5" ) , "Finding selects with a context." ) ;
24+ same ( jQuery ( "#form" ) . find ( "select" ) . get ( ) , q ( "select1" , "select2" , "select3" ) , "Finding selects with a context." ) ;
2525
2626 ok ( jQuery ( "#length" ) . length , '<input name="length"> cannot be found under IE, see #945' ) ;
2727 ok ( jQuery ( "#lengthtest input" ) . length , '<input name="length"> cannot be found under IE, see #945' ) ;
2828
2929 // Check for unique-ness and sort order
30- same ( jQuery ( "p, div p" ) . get ( ) , jQuery ( "p" ) . get ( ) , "Check for duplicates: p, div p" ) ;
30+ same ( jQuery ( "*" ) . get ( ) , jQuery ( "*, *" ) . get ( ) , "Check for duplicates: *, *" ) ;
31+ same ( jQuery ( "p" ) . get ( ) , jQuery ( "p, div p" ) . get ( ) , "Check for duplicates: p, div p" ) ;
3132
3233 t ( "Checking sort order" , "h2, h1" , [ "qunit-header" , "qunit-banner" , "qunit-userAgent" ] ) ;
3334 t ( "Checking sort order" , "h2:first, h1:first" , [ "qunit-header" , "qunit-banner" ] ) ;
@@ -36,7 +37,7 @@ test("element", function() {
3637
3738if ( location . protocol != "file:" ) {
3839 test ( "XML Document Selectors" , function ( ) {
39- expect ( 8 ) ;
40+ expect ( 7 ) ;
4041 stop ( ) ;
4142 jQuery . get ( "data/with_fries.xml" , function ( xml ) {
4243 equals ( jQuery ( "foo_bar" , xml ) . length , 1 , "Element Selector with underscore" ) ;
@@ -46,7 +47,6 @@ if ( location.protocol != "file:" ) {
4647 equals ( jQuery ( "[name=prop2]" , xml ) . length , 1 , "Attribute selector with name" ) ;
4748 equals ( jQuery ( "#seite1" , xml ) . length , 1 , "Attribute selector with ID" ) ;
4849 equals ( jQuery ( "component#seite1" , xml ) . length , 1 , "Attribute selector with ID" ) ;
49- equals ( jQuery ( "component" , xml ) . filter ( "#seite1" ) . length , 1 , "Attribute selector filter with ID" ) ;
5050 start ( ) ;
5151 } ) ;
5252 } ) ;
@@ -154,7 +154,7 @@ test("class", function() {
154154} ) ;
155155
156156test ( "name" , function ( ) {
157- expect ( 15 ) ;
157+ expect ( 14 ) ;
158158
159159 t ( "Name selector" , "input[name=action]" , [ "text1" ] ) ;
160160 t ( "Name selector with single quotes" , "input[name='action']" , [ "text1" ] ) ;
@@ -169,19 +169,13 @@ test("name", function() {
169169 same ( jQuery ( "#form" ) . find ( "input[name=action]" ) . get ( ) , q ( "text1" ) , "Name selector within the context of another element" ) ;
170170 same ( jQuery ( "#form" ) . find ( "input[name='foo[bar]']" ) . get ( ) , q ( "hidden2" ) , "Name selector for grouped form element within the context of another element" ) ;
171171
172- var form = jQuery ( "<form><input name='id'/></form>" ) . appendTo ( "body" ) ;
173-
174- equals ( form . find ( "input" ) . length , 1 , "Make sure that rooted queries on forms (with possible expandos) work." ) ;
175-
176- form . remove ( ) ;
177-
178172 var a = jQuery ( '<div><a id="tName1ID" name="tName1">tName1 A</a><a id="tName2ID" name="tName2">tName2 A</a><div id="tName1">tName1 Div</div></div>' ) . appendTo ( '#main' ) . children ( ) ;
179173
180174 equals ( a . length , 3 , "Make sure the right number of elements were inserted." ) ;
181175 equals ( a [ 1 ] . id , "tName2ID" , "Make sure the right number of elements were inserted." ) ;
182176
183- equals ( jQuery ( "[name=tName1]" ) [ 0 ] , a [ 0 ] , " Find elements that have similar IDs") ;
184- equals ( jQuery ( "[name=tName2]" ) [ 0 ] , a [ 1 ] , " Find elements that have similar IDs") ;
177+ t ( " Find elements that have similar IDs", "[name=tName1]" , [ "tName1ID" ] ) ;
178+ t ( " Find elements that have similar IDs", "[name=tName2]" , [ "tName2ID" ] ) ;
185179 t ( "Find elements that have similar IDs" , "#tName2ID" , [ "tName2ID" ] ) ;
186180
187181 a . remove ( ) ;
@@ -197,7 +191,7 @@ test("multiple", function() {
197191} ) ;
198192
199193test ( "child and adjacent" , function ( ) {
200- expect ( 27 ) ;
194+ expect ( 29 ) ;
201195 t ( "Child" , "p > a" , [ "simon1" , "google" , "groups" , "mark" , "yahoo" , "simon" ] ) ;
202196 t ( "Child" , "p> a" , [ "simon1" , "google" , "groups" , "mark" , "yahoo" , "simon" ] ) ;
203197 t ( "Child" , "p >a" , [ "simon1" , "google" , "groups" , "mark" , "yahoo" , "simon" ] ) ;
@@ -209,6 +203,7 @@ test("child and adjacent", function() {
209203 t ( "Adjacent" , "a +a" , [ "groups" ] ) ;
210204 t ( "Adjacent" , "a+ a" , [ "groups" ] ) ;
211205 t ( "Adjacent" , "a+a" , [ "groups" ] ) ;
206+ t ( "Adjacent" , "a:eq(1)+a" , [ "groups" ] ) ;
212207 t ( "Adjacent" , "p + p" , [ "ap" , "en" , "sap" ] ) ;
213208 t ( "Adjacent" , "p#firstp + p" , [ "ap" ] ) ;
214209 t ( "Adjacent" , "p[lang=en] + p" , [ "sap" ] ) ;
@@ -219,6 +214,7 @@ test("child and adjacent", function() {
219214 t ( "Element Preceded By" , "#groups ~ a" , [ "mark" ] ) ;
220215 t ( "Element Preceded By" , "#length ~ input" , [ "idTest" ] ) ;
221216 t ( "Element Preceded By" , "#siblingfirst ~ em" , [ "siblingnext" ] ) ;
217+ t ( "Element Preceded By" , "#siblingfirst:first ~ em" , [ "siblingnext" ] ) ;
222218
223219 t ( "Verify deep class selector" , "div.blah > p > a" , [ ] ) ;
224220
@@ -232,7 +228,7 @@ test("child and adjacent", function() {
232228} ) ;
233229
234230test ( "attributes" , function ( ) {
235- expect ( 35 ) ;
231+ expect ( 34 ) ;
236232 t ( "Attribute Exists" , "a[title]" , [ "google" ] ) ;
237233 t ( "Attribute Exists" , "*[title]" , [ "google" ] ) ;
238234 t ( "Attribute Exists" , "[title]" , [ "google" ] ) ;
@@ -270,9 +266,6 @@ test("attributes", function() {
270266 t ( "Attribute Contains" , "a[href *= 'google']" , [ "google" , "groups" ] ) ;
271267 t ( "Attribute Is Not Equal" , "#ap a[hreflang!='en']" , [ "google" , "groups" , "anchor1" ] ) ;
272268
273- var opt = document . getElementById ( "option1a" ) ;
274- ok ( ( window . Sizzle || window . jQuery . find ) . matchesSelector ( opt , "[id*=option1][type!=checkbox]" ) , "Attribute Is Not Equal Matches" ) ;
275-
276269 t ( "Empty values" , "#select1 option[value='']" , [ "option1a" ] ) ;
277270 t ( "Empty values" , "#select1 option[value!='']" , [ "option1b" , "option1c" , "option1d" ] ) ;
278271
@@ -287,7 +280,7 @@ test("pseudo - child", function() {
287280 expect ( 31 ) ;
288281 t ( "First Child" , "p:first-child" , [ "firstp" , "sndp" ] ) ;
289282 t ( "Last Child" , "p:last-child" , [ "sap" ] ) ;
290- t ( "Only Child" , "#main a:only-child" , [ "simon1" , "anchor1" , "yahoo" , "anchor2" , "liveLink1" , "liveLink2" ] ) ;
283+ t ( "Only Child" , "a:only-child" , [ "simon1" , "anchor1" , "yahoo" , "anchor2" , "liveLink1" , "liveLink2" ] ) ;
291284 t ( "Empty" , "ul:empty" , [ "firstUL" ] ) ;
292285 t ( "Is A Parent" , "p:parent" , [ "firstp" , "ap" , "sndp" , "en" , "sap" , "first" ] ) ;
293286
@@ -301,10 +294,10 @@ test("pseudo - child", function() {
301294
302295 t ( "First Child" , "p:first-child" , [ ] ) ;
303296
304- QUnit . reset ( ) ;
297+ reset ( ) ;
305298
306299 t ( "Last Child" , "p:last-child" , [ "sap" ] ) ;
307- t ( "Last Child" , "#main a:last-child" , [ "simon1" , "anchor1" , "mark" , "yahoo" , "anchor2" , "simon" , "liveLink1" , "liveLink2" ] ) ;
300+ t ( "Last Child" , "a:last-child" , [ "simon1" , "anchor1" , "mark" , "yahoo" , "anchor2" , "simon" , "liveLink1" , "liveLink2" ] ) ;
308301
309302 t ( "Nth-child" , "#main form#form > *:nth-child(2)" , [ "text1" ] ) ;
310303 t ( "Nth-child" , "#main form#form > :nth-child(2)" , [ "text1" ] ) ;
@@ -330,27 +323,23 @@ test("pseudo - child", function() {
330323} ) ;
331324
332325test ( "pseudo - misc" , function ( ) {
333- expect ( 7 ) ;
326+ expect ( 6 ) ;
334327
335328 t ( "Headers" , ":header" , [ "qunit-header" , "qunit-banner" , "qunit-userAgent" ] ) ;
336329 t ( "Has Children - :has()" , "p:has(a)" , [ "firstp" , "ap" , "en" , "sap" ] ) ;
337-
338- var select = document . getElementById ( "select1" ) ;
339- ok ( ( window . Sizzle || window . jQuery . find ) . matchesSelector ( select , ":has(option)" ) , "Has Option Matches" ) ;
340330
341- t ( "Text Contains" , "a:contains(Google)" , [ "google" , "groups" ] ) ;
342- t ( "Text Contains" , "a:contains(Google Groups)" , [ "groups" ] ) ;
331+ t ( "Text Contains" , "a:contains(' Google' )" , [ "google" , "groups" ] ) ;
332+ t ( "Text Contains" , "a:contains(' Google Groups' )" , [ "groups" ] ) ;
343333
344- t ( "Text Contains" , "a:contains(Google Groups (Link))" , [ "groups" ] ) ;
345- t ( "Text Contains" , "a:contains((Link))" , [ "groups" ] ) ;
334+ t ( "Text Contains" , "a:contains(' Google Groups (Link)' )" , [ "groups" ] ) ;
335+ t ( "Text Contains" , "a:contains(' (Link)' )" , [ "groups" ] ) ;
346336} ) ;
347337
348338
349339test ( "pseudo - :not" , function ( ) {
350340 expect ( 24 ) ;
351341 t ( "Not" , "a.blog:not(.link)" , [ "mark" ] ) ;
352-
353- t ( "Not - multiple" , "#form option:not(:contains(Nothing),#option1b,:selected)" , [ "option1c" , "option1d" , "option2b" , "option2c" , "option3d" , "option3e" , "option4e" , "option5b" , "option5c" ] ) ;
342+ t ( "Not - multiple" , "#form option:not(:contains('Nothing'),#option1b,:selected)" , [ "option1c" , "option1d" , "option2b" , "option2c" , "option3d" , "option3e" ] ) ;
354343 t ( "Not - recursive" , "#form option:not(:not(:selected))[id^='option3']" , [ "option3b" , "option3c" ] ) ;
355344
356345 t ( ":not() failing interior" , "p:not(.foo)" , [ "firstp" , "ap" , "sndp" , "en" , "sap" , "first" ] ) ;
@@ -371,9 +360,9 @@ test("pseudo - :not", function() {
371360
372361 t ( "No element not selector" , ".container div:not(.excluded) div" , [ ] ) ;
373362
374- t ( ":not() Existing attribute" , "#form select:not([multiple])" , [ "select1" , "select2" , "select5" ] ) ;
375- t ( ":not() Equals attribute" , "#form select:not([name=select1])" , [ "select2" , "select3" , "select4" , "select5" ] ) ;
376- t ( ":not() Equals quoted attribute" , "#form select:not([name='select1'])" , [ "select2" , "select3" , "select4" , "select5" ] ) ;
363+ t ( ":not() Existing attribute" , "#form select:not([multiple])" , [ "select1" , "select2" ] ) ;
364+ t ( ":not() Equals attribute" , "#form select:not([name=select1])" , [ "select2" , "select3" ] ) ;
365+ t ( ":not() Equals quoted attribute" , "#form select:not([name='select1'])" , [ "select2" , "select3" ] ) ;
377366
378367 t ( ":not() Multiple Class" , "#foo a:not(.blog)" , [ "yahoo" , "anchor2" ] ) ;
379368 t ( ":not() Multiple Class" , "#foo a:not(.link)" , [ "yahoo" , "anchor2" ] ) ;
@@ -439,13 +428,13 @@ test("pseudo - visibility", function() {
439428test ( "pseudo - form" , function ( ) {
440429 expect ( 8 ) ;
441430
442- t ( "Form element :input" , "#form :input" , [ "text1" , "text2" , "radio1" , "radio2" , "check1" , "check2" , "hidden1" , "hidden2" , "name" , "search" , "button" , "area1" , "select1" , "select2" , "select3" , "select4" , "select5" ] ) ;
431+ t ( "Form element :input" , "#form :input" , [ "text1" , "text2" , "radio1" , "radio2" , "check1" , "check2" , "hidden1" , "hidden2" , "name" , "search" , "button" , "area1" , "select1" , "select2" , "select3" ] ) ;
443432 t ( "Form element :radio" , "#form :radio" , [ "radio1" , "radio2" ] ) ;
444433 t ( "Form element :checkbox" , "#form :checkbox" , [ "check1" , "check2" ] ) ;
445434 t ( "Form element :text" , "#form :text:not(#search)" , [ "text1" , "text2" , "hidden2" , "name" ] ) ;
446435 t ( "Form element :radio:checked" , "#form :radio:checked" , [ "radio2" ] ) ;
447436 t ( "Form element :checkbox:checked" , "#form :checkbox:checked" , [ "check1" ] ) ;
448437 t ( "Form element :radio:checked, :checkbox:checked" , "#form :radio:checked, #form :checkbox:checked" , [ "radio2" , "check1" ] ) ;
449438
450- t ( "Selected Option Element" , "#form option:selected" , [ "option1a" , "option2d" , "option3b" , "option3c" , "option4b" , "option4c" , "option4d" , "option5a" ] ) ;
439+ t ( "Selected Option Element" , "#form option:selected" , [ "option1a" , "option2d" , "option3b" , "option3c" ] ) ;
451440} ) ;
0 commit comments