Skip to content

Commit ba9bd20

Browse files
scottgonzalezscottgonzalez
committed
Accordion tests: Don't use deprecated assertion methods.
1 parent 3e0d3c9 commit ba9bd20

File tree

6 files changed

+89
-89
lines changed

6 files changed

+89
-89
lines changed

‎tests/unit/accordion/accordion.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
var actual = accordion.find( ".ui-accordion-content" ).map(function() {
2626
return $( this ).css( "display" ) === "none" ? 0 : 1;
2727
}).get();
28-
same( actual, expected );
28+
deepEqual( actual, expected );
2929
}
3030
function equalHeights( accordion, min, max ) {
3131
var sizes = [];
@@ -34,8 +34,8 @@
3434
});
3535
ok( sizes[ 0 ] >= min && sizes[ 0 ] <= max,
3636
"must be within " + min + " and " + max + ", was " + sizes[ 0 ] );
37-
same( sizes[ 0 ], sizes[ 1 ] );
38-
same( sizes[ 0 ], sizes[ 2 ] );
37+
deepEqual( sizes[ 0 ], sizes[ 1 ] );
38+
deepEqual( sizes[ 0 ], sizes[ 2 ] );
3939
}
4040
function accordionSetupTeardown() {
4141
var animated = $.ui.accordion.prototype.options.animated;

‎tests/unit/accordion/accordion_core.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $.each( { div: "#list1", ul: "#navigation", dl: "#accordion-dl" }, function( typ
1010
".ui-accordion-header elements exist, correct number" );
1111
equal( element.find( ".ui-accordion-content" ).length, 3,
1212
".ui-accordion-content elements exist, correct number" );
13-
same( element.find( ".ui-accordion-header" ).next().get(),
13+
deepEqual( element.find( ".ui-accordion-header" ).next().get(),
1414
element.find( ".ui-accordion-content" ).get(),
1515
"content panels come immediately after headers" );
1616
});
@@ -26,28 +26,28 @@ test( "ui-accordion-heading class added to headers anchor", function() {
2626
expect( 1 );
2727
var element = $( "#list1" ).accordion();
2828
var anchors = element.find( ".ui-accordion-heading" );
29-
equals( anchors.length, 3 );
29+
equal( anchors.length, 3 );
3030
});
3131

3232
test( "accessibility", function () {
3333
expect( 13 );
3434
var element = $( "#list1" ).accordion().accordion( "option", "active", 1 );
3535
var headers = element.find( ".ui-accordion-header" );
3636

37-
equals( headers.eq( 1 ).attr( "tabindex" ), 0, "active header should have tabindex=0" );
38-
equals( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header should have tabindex=-1" );
39-
equals( element.attr( "role" ), "tablist", "main role" );
40-
equals( headers.attr( "role" ), "tab", "tab roles" );
41-
equals( headers.next().attr( "role" ), "tabpanel", "tabpanel roles" );
42-
equals( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab has aria-expanded" );
43-
equals( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded" );
44-
equals( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab has aria-selected" );
45-
equals( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected" );
37+
equal( headers.eq( 1 ).attr( "tabindex" ), 0, "active header should have tabindex=0" );
38+
equal( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header should have tabindex=-1" );
39+
equal( element.attr( "role" ), "tablist", "main role" );
40+
equal( headers.attr( "role" ), "tab", "tab roles" );
41+
equal( headers.next().attr( "role" ), "tabpanel", "tabpanel roles" );
42+
equal( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab has aria-expanded" );
43+
equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded" );
44+
equal( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab has aria-selected" );
45+
equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected" );
4646
element.accordion( "option", "active", 0 );
47-
equals( headers.eq( 0 ).attr( "aria-expanded" ), "true", "newly active tab has aria-expanded" );
48-
equals( headers.eq( 1 ).attr( "aria-expanded" ), "false", "newly inactive tab has aria-expanded" );
49-
equals( headers.eq( 0 ).attr( "aria-selected" ), "true", "active tab has aria-selected" );
50-
equals( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected" );
47+
equal( headers.eq( 0 ).attr( "aria-expanded" ), "true", "newly active tab has aria-expanded" );
48+
equal( headers.eq( 1 ).attr( "aria-expanded" ), "false", "newly inactive tab has aria-expanded" );
49+
equal( headers.eq( 0 ).attr( "aria-selected" ), "true", "active tab has aria-selected" );
50+
equal( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected" );
5151
});
5252

5353
}( jQuery ) );

‎tests/unit/accordion/accordion_deprecated.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
var actual = accordion.find( ".ui-accordion-content" ).map(function() {
2323
return $( this ).css( "display" ) === "none" ? 0 : 1;
2424
}).get();
25-
same( actual, expected );
25+
deepEqual( actual, expected );
2626
}
2727
function equalHeights( accordion, min, max ) {
2828
var sizes = [];
@@ -31,8 +31,8 @@
3131
});
3232
ok( sizes[ 0 ] >= min && sizes[ 0 ] <= max,
3333
"must be within " + min + " and " + max + ", was " + sizes[ 0 ] );
34-
same( sizes[ 0 ], sizes[ 1 ] );
35-
same( sizes[ 0 ], sizes[ 2 ] );
34+
deepEqual( sizes[ 0 ], sizes[ 1 ] );
35+
deepEqual( sizes[ 0 ], sizes[ 2 ] );
3636
}
3737
function accordionSetupTeardown() {
3838
var animated = $.ui.accordion.prototype.options.animated;

‎tests/unit/accordion/accordion_deprecated.js

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -237,38 +237,38 @@ test( "changestart", function() {
237237
var content = element.find( ".ui-accordion-content" );
238238

239239
element.one( "accordionchangestart", function( event, ui ) {
240-
equals( ui.oldHeader.size(), 0 );
241-
equals( ui.oldContent.size(), 0 );
242-
equals( ui.newHeader.size(), 1 );
240+
equal( ui.oldHeader.size(), 0 );
241+
equal( ui.oldContent.size(), 0 );
242+
equal( ui.newHeader.size(), 1 );
243243
strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
244-
equals( ui.newContent.size(), 1 );
244+
equal( ui.newContent.size(), 1 );
245245
strictEqual( ui.newContent[ 0 ], content[ 0 ] );
246246
accordion_state( element, 0, 0, 0 );
247247
});
248248
element.accordion( "option", "active", 0 );
249249
accordion_state( element, 1, 0, 0 );
250250

251251
element.one( "accordionchangestart", function( event, ui ) {
252-
equals( ui.oldHeader.size(), 1 );
252+
equal( ui.oldHeader.size(), 1 );
253253
strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
254-
equals( ui.oldContent.size(), 1 );
254+
equal( ui.oldContent.size(), 1 );
255255
strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
256-
equals( ui.newHeader.size(), 1 );
256+
equal( ui.newHeader.size(), 1 );
257257
strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
258-
equals( ui.newContent.size(), 1 );
258+
equal( ui.newContent.size(), 1 );
259259
strictEqual( ui.newContent[ 0 ], content[ 1 ] );
260260
accordion_state( element, 1, 0, 0 );
261261
});
262262
headers.eq( 1 ).click();
263263
accordion_state( element, 0, 1, 0 );
264264

265265
element.one( "accordionchangestart", function( event, ui ) {
266-
equals( ui.oldHeader.size(), 1 );
266+
equal( ui.oldHeader.size(), 1 );
267267
strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
268-
equals( ui.oldContent.size(), 1 );
268+
equal( ui.oldContent.size(), 1 );
269269
strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
270-
equals( ui.newHeader.size(), 0 );
271-
equals( ui.newContent.size(), 0 );
270+
equal( ui.newHeader.size(), 0 );
271+
equal( ui.newContent.size(), 0 );
272272
accordion_state( element, 0, 1, 0 );
273273
});
274274
element.accordion( "option", "active", false );
@@ -285,34 +285,34 @@ test( "change", function() {
285285
var content = element.find( ".ui-accordion-content" );
286286

287287
element.one( "accordionchange", function( event, ui ) {
288-
equals( ui.oldHeader.size(), 0 );
289-
equals( ui.oldContent.size(), 0 );
290-
equals( ui.newHeader.size(), 1 );
288+
equal( ui.oldHeader.size(), 0 );
289+
equal( ui.oldContent.size(), 0 );
290+
equal( ui.newHeader.size(), 1 );
291291
strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
292-
equals( ui.newContent.size(), 1 );
292+
equal( ui.newContent.size(), 1 );
293293
strictEqual( ui.newContent[ 0 ], content[ 0 ] );
294294
});
295295
element.accordion( "option", "active", 0 );
296296

297297
element.one( "accordionchange", function( event, ui ) {
298-
equals( ui.oldHeader.size(), 1 );
298+
equal( ui.oldHeader.size(), 1 );
299299
strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
300-
equals( ui.oldContent.size(), 1 );
300+
equal( ui.oldContent.size(), 1 );
301301
strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
302-
equals( ui.newHeader.size(), 1 );
302+
equal( ui.newHeader.size(), 1 );
303303
strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
304-
equals( ui.newContent.size(), 1 );
304+
equal( ui.newContent.size(), 1 );
305305
strictEqual( ui.newContent[ 0 ], content[ 1 ] );
306306
});
307307
headers.eq( 1 ).click();
308308

309309
element.one( "accordionchange", function( event, ui ) {
310-
equals( ui.oldHeader.size(), 1 );
310+
equal( ui.oldHeader.size(), 1 );
311311
strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
312-
equals( ui.oldContent.size(), 1 );
312+
equal( ui.oldContent.size(), 1 );
313313
strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
314-
equals( ui.newHeader.size(), 0 );
315-
equals( ui.newContent.size(), 0 );
314+
equal( ui.newHeader.size(), 0 );
315+
equal( ui.newContent.size(), 0 );
316316
});
317317
element.accordion( "option", "active", false );
318318
});

‎tests/unit/accordion/accordion_events.js

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,26 @@ test( "beforeActivate", function() {
1313

1414
element.one( "accordionbeforeactivate", function( event, ui ) {
1515
ok( !( "originalEvent" in event ) );
16-
equals( ui.oldHeader.size(), 0 );
17-
equals( ui.oldContent.size(), 0 );
18-
equals( ui.newHeader.size(), 1 );
16+
equal( ui.oldHeader.size(), 0 );
17+
equal( ui.oldContent.size(), 0 );
18+
equal( ui.newHeader.size(), 1 );
1919
strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
20-
equals( ui.newContent.size(), 1 );
20+
equal( ui.newContent.size(), 1 );
2121
strictEqual( ui.newContent[ 0 ], content[ 0 ] );
2222
accordion_state( element, 0, 0, 0 );
2323
});
2424
element.accordion( "option", "active", 0 );
2525
accordion_state( element, 1, 0, 0 );
2626

2727
element.one( "accordionbeforeactivate", function( event, ui ) {
28-
equals( event.originalEvent.type, "click" );
29-
equals( ui.oldHeader.size(), 1 );
28+
equal( event.originalEvent.type, "click" );
29+
equal( ui.oldHeader.size(), 1 );
3030
strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
31-
equals( ui.oldContent.size(), 1 );
31+
equal( ui.oldContent.size(), 1 );
3232
strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
33-
equals( ui.newHeader.size(), 1 );
33+
equal( ui.newHeader.size(), 1 );
3434
strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
35-
equals( ui.newContent.size(), 1 );
35+
equal( ui.newContent.size(), 1 );
3636
strictEqual( ui.newContent[ 0 ], content[ 1 ] );
3737
accordion_state( element, 1, 0, 0 );
3838
});
@@ -41,24 +41,24 @@ test( "beforeActivate", function() {
4141

4242
element.one( "accordionbeforeactivate", function( event, ui ) {
4343
ok( !( "originalEvent" in event ) );
44-
equals( ui.oldHeader.size(), 1 );
44+
equal( ui.oldHeader.size(), 1 );
4545
strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
46-
equals( ui.oldContent.size(), 1 );
46+
equal( ui.oldContent.size(), 1 );
4747
strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
48-
equals( ui.newHeader.size(), 0 );
49-
equals( ui.newContent.size(), 0 );
48+
equal( ui.newHeader.size(), 0 );
49+
equal( ui.newContent.size(), 0 );
5050
accordion_state( element, 0, 1, 0 );
5151
});
5252
element.accordion( "option", "active", false );
5353
accordion_state( element, 0, 0, 0 );
5454

5555
element.one( "accordionbeforeactivate", function( event, ui ) {
5656
ok( !( "originalEvent" in event ) );
57-
equals( ui.oldHeader.size(), 0 );
58-
equals( ui.oldContent.size(), 0 );
59-
equals( ui.newHeader.size(), 1 );
57+
equal( ui.oldHeader.size(), 0 );
58+
equal( ui.oldContent.size(), 0 );
59+
equal( ui.newHeader.size(), 1 );
6060
strictEqual( ui.newHeader[ 0 ], headers[ 2 ] );
61-
equals( ui.newContent.size(), 1 );
61+
equal( ui.newContent.size(), 1 );
6262
strictEqual( ui.newContent[ 0 ], content[ 2 ] );
6363
event.preventDefault();
6464
accordion_state( element, 0, 0, 0 );
@@ -77,34 +77,34 @@ test( "activate", function() {
7777
var content = element.find( ".ui-accordion-content" );
7878

7979
element.one( "accordionactivate", function( event, ui ) {
80-
equals( ui.oldHeader.size(), 0 );
81-
equals( ui.oldContent.size(), 0 );
82-
equals( ui.newHeader.size(), 1 );
80+
equal( ui.oldHeader.size(), 0 );
81+
equal( ui.oldContent.size(), 0 );
82+
equal( ui.newHeader.size(), 1 );
8383
strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
84-
equals( ui.newContent.size(), 1 );
84+
equal( ui.newContent.size(), 1 );
8585
strictEqual( ui.newContent[ 0 ], content[ 0 ] );
8686
});
8787
element.accordion( "option", "active", 0 );
8888

8989
element.one( "accordionactivate", function( event, ui ) {
90-
equals( ui.oldHeader.size(), 1 );
90+
equal( ui.oldHeader.size(), 1 );
9191
strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
92-
equals( ui.oldContent.size(), 1 );
92+
equal( ui.oldContent.size(), 1 );
9393
strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
94-
equals( ui.newHeader.size(), 1 );
94+
equal( ui.newHeader.size(), 1 );
9595
strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
96-
equals( ui.newContent.size(), 1 );
96+
equal( ui.newContent.size(), 1 );
9797
strictEqual( ui.newContent[ 0 ], content[ 1 ] );
9898
});
9999
headers.eq( 1 ).click();
100100

101101
element.one( "accordionactivate", function( event, ui ) {
102-
equals( ui.oldHeader.size(), 1 );
102+
equal( ui.oldHeader.size(), 1 );
103103
strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
104-
equals( ui.oldContent.size(), 1 );
104+
equal( ui.oldContent.size(), 1 );
105105
strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
106-
equals( ui.newHeader.size(), 0 );
107-
equals( ui.newContent.size(), 0 );
106+
equal( ui.newHeader.size(), 0 );
107+
equal( ui.newContent.size(), 0 );
108108
});
109109
element.accordion( "option", "active", false );
110110

‎tests/unit/accordion/accordion_options.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module( "accordion: options", accordionSetupTeardown() );
44

55
test( "{ active: default }", function() {
66
var element = $( "#list1" ).accordion();
7-
equals( element.accordion( "option", "active" ), 0 );
7+
equal( element.accordion( "option", "active" ), 0 );
88
accordion_state( element, 1, 0, 0 );
99
});
1010

@@ -14,12 +14,12 @@ test( "{ active: false }", function() {
1414
collapsible: true
1515
});
1616
accordion_state( element, 0, 0, 0 );
17-
equals( element.find( ".ui-accordion-header.ui-state-active" ).size(), 0, "no headers selected" );
18-
equals( element.accordion( "option", "active" ), false );
17+
equal( element.find( ".ui-accordion-header.ui-state-active" ).size(), 0, "no headers selected" );
18+
equal( element.accordion( "option", "active" ), false );
1919

2020
element.accordion( "option", "collapsible", false );
2121
accordion_state( element, 1, 0, 0 );
22-
equals( element.accordion( "option", "active" ), 0 );
22+
equal( element.accordion( "option", "active" ), 0 );
2323

2424
element.accordion( "destroy" );
2525
element.accordion({
@@ -33,19 +33,19 @@ test( "{ active: Number }", function() {
3333
var element = $( "#list1" ).accordion({
3434
active: 2
3535
});
36-
equals( element.accordion( "option", "active" ), 2 );
36+
equal( element.accordion( "option", "active" ), 2 );
3737
accordion_state( element, 0, 0, 1 );
3838

3939
element.accordion( "option", "active", 0 );
40-
equals( element.accordion( "option", "active" ), 0 );
40+
equal( element.accordion( "option", "active" ), 0 );
4141
accordion_state( element, 1, 0, 0 );
4242

4343
element.find( ".ui-accordion-header" ).eq( 1 ).click();
44-
equals( element.accordion( "option", "active" ), 1 );
44+
equal( element.accordion( "option", "active" ), 1 );
4545
accordion_state( element, 0, 1, 0 );
4646

4747
element.accordion( "option", "active", 10 );
48-
equals( element.accordion( "option", "active" ), 1 );
48+
equal( element.accordion( "option", "active" ), 1 );
4949
accordion_state( element, 0, 1, 0 );
5050
});
5151

@@ -54,19 +54,19 @@ if ( $.uiBackCompat === false ) {
5454
var element = $( "#list1" ).accordion({
5555
active: -1
5656
});
57-
equals( element.accordion( "option", "active" ), 2 );
57+
equal( element.accordion( "option", "active" ), 2 );
5858
accordion_state( element, 0, 0, 1 );
5959

6060
element.accordion( "option", "active", -2 );
61-
equals( element.accordion( "option", "active" ), 1 );
61+
equal( element.accordion( "option", "active" ), 1 );
6262
accordion_state( element, 0, 1, 0 );
6363

6464
element.accordion( "option", "active", -10 );
65-
equals( element.accordion( "option", "active" ), 1 );
65+
equal( element.accordion( "option", "active" ), 1 );
6666
accordion_state( element, 0, 1, 0 );
6767

6868
element.accordion( "option", "active", -3 );
69-
equals( element.accordion( "option", "active" ), 0 );
69+
equal( element.accordion( "option", "active" ), 0 );
7070
accordion_state( element, 1, 0, 0 );
7171
});
7272
}
@@ -101,7 +101,7 @@ test( "{ collapsible: true }", function() {
101101
accordion_state( element, 0, 1, 0 );
102102

103103
element.find( ".ui-accordion-header" ).eq( 1 ).click();
104-
equals( element.accordion( "option", "active" ), false );
104+
equal( element.accordion( "option", "active" ), false );
105105
accordion_state( element, 0, 0, 0 );
106106
});
107107

@@ -238,8 +238,8 @@ test( "{ heightStyle: 'fill' } with multiple siblings", function() {
238238
test( "{ icons: false }", function() {
239239
var element = $( "#list1" );
240240
function icons( on ) {
241-
same( element.find( "span.ui-icon").length, on ? 3 : 0 );
242-
same( element.hasClass( "ui-accordion-icons" ), on );
241+
deepEqual( element.find( "span.ui-icon").length, on ? 3 : 0 );
242+
deepEqual( element.hasClass( "ui-accordion-icons" ), on );
243243
}
244244
element.accordion();
245245
icons( true );

0 commit comments

Comments
 (0)