@@ -38,12 +38,11 @@ $.each({
38
38
"multiple lists, ol first" : "#tabs5" ,
39
39
"empty list" : "#tabs6"
40
40
} , function ( type , selector ) {
41
- test ( "markup structure: " + type , function ( ) {
41
+ test ( "markup structure: " + type , function ( assert ) {
42
42
expect ( 2 ) ;
43
43
var element = $ ( selector ) . tabs ( ) ;
44
- ok ( element . hasClass ( "ui-tabs" ) , "main element is .ui-tabs" ) ;
45
- ok ( $ ( selector + "-list" ) . hasClass ( "ui-tabs-nav" ) ,
46
- "list item is .ui-tabs-nav" ) ;
44
+ assert . hasClasses ( element , "ui-tabs" ) ;
45
+ assert . hasClasses ( $ ( selector + "-list" ) , "ui-tabs-nav" ) ;
47
46
} ) ;
48
47
} ) ;
49
48
@@ -168,7 +167,7 @@ asyncTest( "accessibility - ajax", function( assert ) {
168
167
} ) ;
169
168
} ) ;
170
169
171
- asyncTest ( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER" , function ( ) {
170
+ asyncTest ( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER" , function ( assert ) {
172
171
expect ( 92 ) ;
173
172
var element = $ ( "#tabs1" ) . tabs ( {
174
173
collapsible : true
@@ -184,13 +183,13 @@ asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER",
184
183
185
184
// down, right, down (wrap), up (wrap)
186
185
function step1 ( ) {
187
- ok ( tabs . eq ( 0 ) . is ( ". ui-state-focus" ) , "first tab has focus" ) ;
186
+ assert . hasClasses ( tabs . eq ( 0 ) , " ui-state-focus", "first tab has focus" ) ;
188
187
equal ( tabs . eq ( 0 ) . attr ( "aria-selected" ) , "true" , "first tab has aria-selected=true" ) ;
189
188
ok ( panels . eq ( 0 ) . is ( ":visible" ) , "first panel is visible" ) ;
190
189
191
190
tabs . eq ( 0 ) . simulate ( "keydown" , { keyCode : keyCode . DOWN } ) ;
192
- ok ( tabs . eq ( 1 ) . is ( ". ui-state-focus" ) , "DOWN moves focus to next tab" ) ;
193
- ok ( ! tabs . eq ( 0 ) . is ( ". ui-state-focus" ) , "first tab is no longer focused" ) ;
191
+ assert . hasClasses ( tabs . eq ( 1 ) , " ui-state-focus", "DOWN moves focus to next tab" ) ;
192
+ assert . lacksClasses ( tabs . eq ( 0 ) , " ui-state-focus", "first tab is no longer focused" ) ;
194
193
equal ( tabs . eq ( 1 ) . attr ( "aria-selected" ) , "true" , "second tab has aria-selected=true" ) ;
195
194
equal ( tabs . eq ( 0 ) . attr ( "aria-selected" ) , "false" , "first tab has aria-selected=false" ) ;
196
195
ok ( panels . eq ( 1 ) . is ( ":hidden" ) , "second panel is still hidden" ) ;
@@ -201,7 +200,7 @@ asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER",
201
200
equal ( panels . eq ( 0 ) . attr ( "aria-hidden" ) , "false" , "first panel has aria-hidden=false" ) ;
202
201
203
202
tabs . eq ( 1 ) . simulate ( "keydown" , { keyCode : keyCode . RIGHT } ) ;
204
- ok ( tabs . eq ( 2 ) . is ( ". ui-state-focus" ) , "RIGHT moves focus to next tab" ) ;
203
+ assert . hasClasses ( tabs . eq ( 2 ) , " ui-state-focus", "RIGHT moves focus to next tab" ) ;
205
204
equal ( tabs . eq ( 2 ) . attr ( "aria-selected" ) , "true" , "third tab has aria-selected=true" ) ;
206
205
equal ( tabs . eq ( 1 ) . attr ( "aria-selected" ) , "false" , "second tab has aria-selected=false" ) ;
207
206
ok ( panels . eq ( 2 ) . is ( ":hidden" ) , "third panel is still hidden" ) ;
@@ -212,15 +211,15 @@ asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER",
212
211
equal ( panels . eq ( 0 ) . attr ( "aria-hidden" ) , "false" , "first panel has aria-hidden=false" ) ;
213
212
214
213
tabs . eq ( 2 ) . simulate ( "keydown" , { keyCode : keyCode . DOWN } ) ;
215
- ok ( tabs . eq ( 0 ) . is ( ". ui-state-focus" ) , "DOWN wraps focus to first tab" ) ;
214
+ assert . hasClasses ( tabs . eq ( 0 ) , " ui-state-focus", "DOWN wraps focus to first tab" ) ;
216
215
equal ( tabs . eq ( 0 ) . attr ( "aria-selected" ) , "true" , "first tab has aria-selected=true" ) ;
217
216
equal ( tabs . eq ( 2 ) . attr ( "aria-selected" ) , "false" , "third tab has aria-selected=false" ) ;
218
217
ok ( panels . eq ( 0 ) . is ( ":visible" ) , "first panel is still visible" ) ;
219
218
equal ( tabs . eq ( 0 ) . attr ( "aria-expanded" ) , "true" , "first tab has aria-expanded=true" ) ;
220
219
equal ( panels . eq ( 0 ) . attr ( "aria-hidden" ) , "false" , "first panel has aria-hidden=false" ) ;
221
220
222
221
tabs . eq ( 0 ) . simulate ( "keydown" , { keyCode : keyCode . UP } ) ;
223
- ok ( tabs . eq ( 2 ) . is ( ". ui-state-focus" ) , "UP wraps focus to last tab" ) ;
222
+ assert . hasClasses ( tabs . eq ( 2 ) , " ui-state-focus", "UP wraps focus to last tab" ) ;
224
223
equal ( tabs . eq ( 2 ) . attr ( "aria-selected" ) , "true" , "third tab has aria-selected=true" ) ;
225
224
equal ( tabs . eq ( 0 ) . attr ( "aria-selected" ) , "false" , "first tab has aria-selected=false" ) ;
226
225
ok ( panels . eq ( 2 ) . is ( ":hidden" ) , "third panel is still hidden" ) ;
@@ -245,7 +244,7 @@ asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER",
245
244
equal ( panels . eq ( 0 ) . attr ( "aria-hidden" ) , "true" , "first panel has aria-hidden=true" ) ;
246
245
247
246
tabs . eq ( 2 ) . simulate ( "keydown" , { keyCode : keyCode . LEFT } ) ;
248
- ok ( tabs . eq ( 1 ) . is ( ". ui-state-focus" ) , "LEFT moves focus to previous tab" ) ;
247
+ assert . hasClasses ( tabs . eq ( 1 ) , " ui-state-focus", "LEFT moves focus to previous tab" ) ;
249
248
equal ( tabs . eq ( 1 ) . attr ( "aria-selected" ) , "true" , "second tab has aria-selected=true" ) ;
250
249
equal ( tabs . eq ( 2 ) . attr ( "aria-selected" ) , "false" , "third tab has aria-selected=false" ) ;
251
250
ok ( panels . eq ( 1 ) . is ( ":hidden" ) , "second panel is still hidden" ) ;
@@ -256,7 +255,7 @@ asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER",
256
255
equal ( panels . eq ( 2 ) . attr ( "aria-hidden" ) , "false" , "third panel has aria-hidden=false" ) ;
257
256
258
257
tabs . eq ( 1 ) . simulate ( "keydown" , { keyCode : keyCode . HOME } ) ;
259
- ok ( tabs . eq ( 0 ) . is ( ". ui-state-focus" ) , "HOME moves focus to first tab" ) ;
258
+ assert . hasClasses ( tabs . eq ( 0 ) , " ui-state-focus", "HOME moves focus to first tab" ) ;
260
259
equal ( tabs . eq ( 0 ) . attr ( "aria-selected" ) , "true" , "first tab has aria-selected=true" ) ;
261
260
equal ( tabs . eq ( 1 ) . attr ( "aria-selected" ) , "false" , "second tab has aria-selected=false" ) ;
262
261
ok ( panels . eq ( 0 ) . is ( ":hidden" ) , "first panel is still hidden" ) ;
@@ -283,7 +282,7 @@ asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER",
283
282
equal ( panels . eq ( 2 ) . attr ( "aria-hidden" ) , "true" , "third panel has aria-hidden=true" ) ;
284
283
285
284
tabs . eq ( 0 ) . simulate ( "keydown" , { keyCode : keyCode . END } ) ;
286
- ok ( tabs . eq ( 2 ) . is ( ". ui-state-focus" ) , "END moves focus to last tab" ) ;
285
+ assert . hasClasses ( tabs . eq ( 2 ) , " ui-state-focus", "END moves focus to last tab" ) ;
287
286
equal ( tabs . eq ( 2 ) . attr ( "aria-selected" ) , "true" , "third tab has aria-selected=true" ) ;
288
287
equal ( tabs . eq ( 0 ) . attr ( "aria-selected" ) , "false" , "first tab has aria-selected=false" ) ;
289
288
ok ( panels . eq ( 2 ) . is ( ":hidden" ) , "third panel is still hidden" ) ;
@@ -326,7 +325,7 @@ $.each({
326
325
ctrl : "CTRL" ,
327
326
meta : "COMMAND"
328
327
} , function ( modifier , label ) {
329
- asyncTest ( "keyboard support - " + label + " navigation" , function ( ) {
328
+ asyncTest ( "keyboard support - " + label + " navigation" , function ( assert ) {
330
329
expect ( 115 ) ;
331
330
var element = $ ( "#tabs1" ) . tabs ( ) ,
332
331
tabs = element . find ( ".ui-tabs-nav li" ) ,
@@ -343,13 +342,13 @@ $.each({
343
342
var eventProperties = { keyCode : keyCode . DOWN } ;
344
343
eventProperties [ modifier + "Key" ] = true ;
345
344
346
- ok ( tabs . eq ( 0 ) . is ( ". ui-state-focus" ) , "first tab has focus" ) ;
345
+ assert . hasClasses ( tabs . eq ( 0 ) , " ui-state-focus", "first tab has focus" ) ;
347
346
equal ( tabs . eq ( 0 ) . attr ( "aria-selected" ) , "true" , "first tab has aria-selected=true" ) ;
348
347
ok ( panels . eq ( 0 ) . is ( ":visible" ) , "first panel is visible" ) ;
349
348
350
349
tabs . eq ( 0 ) . simulate ( "keydown" , eventProperties ) ;
351
- ok ( tabs . eq ( 1 ) . is ( ". ui-state-focus" ) , "DOWN moves focus to next tab" ) ;
352
- ok ( ! tabs . eq ( 0 ) . is ( ".ui-state-focus" ) , "first tab is no longer focused" ) ;
350
+ assert . hasClasses ( tabs . eq ( 1 ) , " ui-state-focus", "DOWN moves focus to next tab" ) ;
351
+ assert . lacksClasses ( tabs . eq ( 0 ) , ".ui-state-focus" , "first tab is no longer focused" ) ;
353
352
equal ( tabs . eq ( 1 ) . attr ( "aria-selected" ) , "false" , "second tab has aria-selected=false" ) ;
354
353
equal ( tabs . eq ( 0 ) . attr ( "aria-selected" ) , "true" , "first tab has aria-selected=true" ) ;
355
354
ok ( panels . eq ( 1 ) . is ( ":hidden" ) , "second panel is still hidden" ) ;
@@ -376,7 +375,7 @@ $.each({
376
375
equal ( panels . eq ( 1 ) . attr ( "aria-hidden" ) , "true" , "second panel has aria-hidden=true" ) ;
377
376
378
377
tabs . eq ( 1 ) . simulate ( "keydown" , eventProperties ) ;
379
- ok ( tabs . eq ( 2 ) . is ( ". ui-state-focus" ) , "RIGHT moves focus to next tab" ) ;
378
+ assert . hasClasses ( tabs . eq ( 2 ) , " ui-state-focus", "RIGHT moves focus to next tab" ) ;
380
379
equal ( tabs . eq ( 2 ) . attr ( "aria-selected" ) , "false" , "third tab has aria-selected=false" ) ;
381
380
equal ( tabs . eq ( 0 ) . attr ( "aria-selected" ) , "true" , "first tab has aria-selected=true" ) ;
382
381
ok ( panels . eq ( 2 ) . is ( ":hidden" ) , "third panel is still hidden" ) ;
@@ -403,7 +402,7 @@ $.each({
403
402
equal ( panels . eq ( 2 ) . attr ( "aria-hidden" ) , "true" , "third panel has aria-hidden=true" ) ;
404
403
405
404
tabs . eq ( 2 ) . simulate ( "keydown" , eventProperties ) ;
406
- ok ( tabs . eq ( 0 ) . is ( ". ui-state-focus" ) , "DOWN wraps focus to first tab" ) ;
405
+ assert . hasClasses ( tabs . eq ( 0 ) , " ui-state-focus", "DOWN wraps focus to first tab" ) ;
407
406
equal ( tabs . eq ( 0 ) . attr ( "aria-selected" ) , "true" , "first tab has aria-selected=true" ) ;
408
407
ok ( panels . eq ( 0 ) . is ( ":visible" ) , "first panel is still visible" ) ;
409
408
equal ( tabs . eq ( 0 ) . attr ( "aria-expanded" ) , "true" , "first tab has aria-expanded=true" ) ;
@@ -423,7 +422,7 @@ $.each({
423
422
equal ( panels . eq ( 0 ) . attr ( "aria-hidden" ) , "false" , "first panel has aria-hidden=false" ) ;
424
423
425
424
tabs . eq ( 0 ) . simulate ( "keydown" , eventProperties ) ;
426
- ok ( tabs . eq ( 2 ) . is ( ". ui-state-focus" ) , "UP wraps focus to last tab" ) ;
425
+ assert . hasClasses ( tabs . eq ( 2 ) , " ui-state-focus", "UP wraps focus to last tab" ) ;
427
426
equal ( tabs . eq ( 2 ) . attr ( "aria-selected" ) , "false" , "third tab has aria-selected=false" ) ;
428
427
equal ( tabs . eq ( 0 ) . attr ( "aria-selected" ) , "true" , "first tab has aria-selected=true" ) ;
429
428
ok ( panels . eq ( 2 ) . is ( ":hidden" ) , "third panel is still hidden" ) ;
@@ -450,7 +449,7 @@ $.each({
450
449
equal ( panels . eq ( 2 ) . attr ( "aria-hidden" ) , "true" , "third panel has aria-hidden=true" ) ;
451
450
452
451
tabs . eq ( 2 ) . simulate ( "keydown" , eventProperties ) ;
453
- ok ( tabs . eq ( 1 ) . is ( ". ui-state-focus" ) , "LEFT moves focus to previous tab" ) ;
452
+ assert . hasClasses ( tabs . eq ( 1 ) , " ui-state-focus", "LEFT moves focus to previous tab" ) ;
454
453
equal ( tabs . eq ( 1 ) . attr ( "aria-selected" ) , "false" , "second tab has aria-selected=false" ) ;
455
454
equal ( tabs . eq ( 0 ) . attr ( "aria-selected" ) , "true" , "first tab has aria-selected=true" ) ;
456
455
ok ( panels . eq ( 1 ) . is ( ":hidden" ) , "second panel is still hidden" ) ;
@@ -477,7 +476,7 @@ $.each({
477
476
equal ( panels . eq ( 1 ) . attr ( "aria-hidden" ) , "true" , "second panel has aria-hidden=true" ) ;
478
477
479
478
tabs . eq ( 1 ) . simulate ( "keydown" , eventProperties ) ;
480
- ok ( tabs . eq ( 0 ) . is ( ". ui-state-focus" ) , "HOME moves focus to first tab" ) ;
479
+ assert . hasClasses ( tabs . eq ( 0 ) , " ui-state-focus", "HOME moves focus to first tab" ) ;
481
480
equal ( tabs . eq ( 0 ) . attr ( "aria-selected" ) , "true" , "first tab has aria-selected=true" ) ;
482
481
equal ( tabs . eq ( 1 ) . attr ( "aria-selected" ) , "false" , "second tab has aria-selected=false" ) ;
483
482
ok ( panels . eq ( 1 ) . is ( ":hidden" ) , "second panel is still hidden" ) ;
@@ -501,7 +500,7 @@ $.each({
501
500
equal ( panels . eq ( 0 ) . attr ( "aria-hidden" ) , "false" , "first panel has aria-hidden=false" ) ;
502
501
503
502
tabs . eq ( 0 ) . simulate ( "keydown" , eventProperties ) ;
504
- ok ( tabs . eq ( 2 ) . is ( ". ui-state-focus" ) , "END moves focus to last tab" ) ;
503
+ assert . hasClasses ( tabs . eq ( 2 ) , " ui-state-focus", "END moves focus to last tab" ) ;
505
504
equal ( tabs . eq ( 2 ) . attr ( "aria-selected" ) , "false" , "third tab has aria-selected=false" ) ;
506
505
equal ( tabs . eq ( 0 ) . attr ( "aria-selected" ) , "true" , "first tab has aria-selected=true" ) ;
507
506
ok ( panels . eq ( 2 ) . is ( ":hidden" ) , "third panel is still hidden" ) ;
@@ -541,7 +540,7 @@ $.each({
541
540
} ) ;
542
541
} ) ;
543
542
544
- asyncTest ( "keyboard support - CTRL+UP, ALT+PAGE_DOWN, ALT+PAGE_UP" , function ( ) {
543
+ asyncTest ( "keyboard support - CTRL+UP, ALT+PAGE_DOWN, ALT+PAGE_UP" , function ( assert ) {
545
544
expect ( 50 ) ;
546
545
var element = $ ( "#tabs1" ) . tabs ( ) ,
547
546
tabs = element . find ( ".ui-tabs-nav li" ) ,
@@ -557,7 +556,7 @@ asyncTest( "keyboard support - CTRL+UP, ALT+PAGE_DOWN, ALT+PAGE_UP", function()
557
556
558
557
panels . eq ( 0 ) . simulate ( "keydown" , { keyCode : keyCode . PAGE_DOWN , altKey : true } ) ;
559
558
strictEqual ( document . activeElement , tabs [ 1 ] , "second tab is activeElement" ) ;
560
- ok ( tabs . eq ( 1 ) . is ( ". ui-state-focus" ) , "ALT+PAGE_DOWN moves focus to next tab" ) ;
559
+ assert . hasClasses ( tabs . eq ( 1 ) , " ui-state-focus", "ALT+PAGE_DOWN moves focus to next tab" ) ;
561
560
equal ( tabs . eq ( 1 ) . attr ( "aria-selected" ) , "true" , "second tab has aria-selected=true" ) ;
562
561
ok ( panels . eq ( 1 ) . is ( ":visible" ) , "second panel is visible" ) ;
563
562
equal ( tabs . eq ( 1 ) . attr ( "aria-expanded" ) , "true" , "second tab has aria-expanded=true" ) ;
@@ -568,7 +567,7 @@ asyncTest( "keyboard support - CTRL+UP, ALT+PAGE_DOWN, ALT+PAGE_UP", function()
568
567
569
568
tabs . eq ( 1 ) . simulate ( "keydown" , { keyCode : keyCode . PAGE_DOWN , altKey : true } ) ;
570
569
strictEqual ( document . activeElement , tabs [ 2 ] , "third tab is activeElement" ) ;
571
- ok ( tabs . eq ( 2 ) . is ( ". ui-state-focus" ) , "ALT+PAGE_DOWN moves focus to next tab" ) ;
570
+ assert . hasClasses ( tabs . eq ( 2 ) , " ui-state-focus", "ALT+PAGE_DOWN moves focus to next tab" ) ;
572
571
equal ( tabs . eq ( 2 ) . attr ( "aria-selected" ) , "true" , "third tab has aria-selected=true" ) ;
573
572
ok ( panels . eq ( 2 ) . is ( ":visible" ) , "third panel is visible" ) ;
574
573
equal ( tabs . eq ( 2 ) . attr ( "aria-expanded" ) , "true" , "third tab has aria-expanded=true" ) ;
@@ -579,7 +578,7 @@ asyncTest( "keyboard support - CTRL+UP, ALT+PAGE_DOWN, ALT+PAGE_UP", function()
579
578
580
579
tabs . eq ( 2 ) . simulate ( "keydown" , { keyCode : keyCode . PAGE_DOWN , altKey : true } ) ;
581
580
strictEqual ( document . activeElement , tabs [ 0 ] , "first tab is activeElement" ) ;
582
- ok ( tabs . eq ( 0 ) . is ( ". ui-state-focus" ) , "ALT+PAGE_DOWN wraps focus to first tab" ) ;
581
+ assert . hasClasses ( tabs . eq ( 0 ) , " ui-state-focus", "ALT+PAGE_DOWN wraps focus to first tab" ) ;
583
582
equal ( tabs . eq ( 0 ) . attr ( "aria-selected" ) , "true" , "first tab has aria-selected=true" ) ;
584
583
ok ( panels . eq ( 0 ) . is ( ":visible" ) , "first panel is visible" ) ;
585
584
equal ( tabs . eq ( 0 ) . attr ( "aria-expanded" ) , "true" , "first tab has aria-expanded=true" ) ;
@@ -597,7 +596,7 @@ asyncTest( "keyboard support - CTRL+UP, ALT+PAGE_DOWN, ALT+PAGE_UP", function()
597
596
598
597
panels . eq ( 0 ) . simulate ( "keydown" , { keyCode : keyCode . PAGE_UP , altKey : true } ) ;
599
598
strictEqual ( document . activeElement , tabs [ 2 ] , "third tab is activeElement" ) ;
600
- ok ( tabs . eq ( 2 ) . is ( ". ui-state-focus" ) , "ALT+PAGE_UP wraps focus to last tab" ) ;
599
+ assert . hasClasses ( tabs . eq ( 2 ) , " ui-state-focus", "ALT+PAGE_UP wraps focus to last tab" ) ;
601
600
equal ( tabs . eq ( 2 ) . attr ( "aria-selected" ) , "true" , "third tab has aria-selected=true" ) ;
602
601
ok ( panels . eq ( 2 ) . is ( ":visible" ) , "third panel is visible" ) ;
603
602
equal ( tabs . eq ( 2 ) . attr ( "aria-expanded" ) , "true" , "third tab has aria-expanded=true" ) ;
@@ -608,7 +607,7 @@ asyncTest( "keyboard support - CTRL+UP, ALT+PAGE_DOWN, ALT+PAGE_UP", function()
608
607
609
608
tabs . eq ( 2 ) . simulate ( "keydown" , { keyCode : keyCode . PAGE_UP , altKey : true } ) ;
610
609
strictEqual ( document . activeElement , tabs [ 1 ] , "second tab is activeElement" ) ;
611
- ok ( tabs . eq ( 1 ) . is ( ". ui-state-focus" ) , "ALT+PAGE_UP moves focus to previous tab" ) ;
610
+ assert . hasClasses ( tabs . eq ( 1 ) , " ui-state-focus", "ALT+PAGE_UP moves focus to previous tab" ) ;
612
611
equal ( tabs . eq ( 1 ) . attr ( "aria-selected" ) , "true" , "second tab has aria-selected=true" ) ;
613
612
ok ( panels . eq ( 1 ) . is ( ":visible" ) , "second panel is visible" ) ;
614
613
equal ( tabs . eq ( 1 ) . attr ( "aria-expanded" ) , "true" , "second tab has aria-expanded=true" ) ;
0 commit comments