Skip to content

Commit e549e18

Browse files
committed
Accordion tests: Cleanup.
1 parent 2bc6627 commit e549e18

File tree

6 files changed

+63
-23
lines changed

6 files changed

+63
-23
lines changed

tests/unit/accordion/accordion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
}).get();
2828
deepEqual( actual, expected );
2929
}
30-
function equalHeights( accordion, min, max ) {
30+
function accordion_equalHeights( accordion, min, max ) {
3131
var sizes = [];
3232
accordion.find( ".ui-accordion-content" ).each(function() {
3333
sizes.push( $( this ).outerHeight() );

tests/unit/accordion/accordion_core.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
module( "accordion: core", accordionSetupTeardown() );
44

55
$.each( { div: "#list1", ul: "#navigation", dl: "#accordion-dl" }, function( type, selector ) {
6+
expect( 4 );
67
test( "markup structure: " + type, function() {
78
var element = $( selector ).accordion();
89
ok( element.hasClass( "ui-accordion" ), "main element is .ui-accordion" );
@@ -17,6 +18,7 @@ $.each( { div: "#list1", ul: "#navigation", dl: "#accordion-dl" }, function( typ
1718
});
1819

1920
test( "handle click on header-descendant", function() {
21+
expect( 1 );
2022
var element = $( "#navigation" ).accordion();
2123
$( "#navigation h2:eq(1) a" ).click();
2224
accordion_state( element, 0, 1, 0 );

tests/unit/accordion/accordion_deprecated.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
}).get();
2525
deepEqual( actual, expected );
2626
}
27-
function equalHeights( accordion, min, max ) {
27+
function accordion_equalHeights( accordion, min, max ) {
2828
var sizes = [];
2929
accordion.find( ".ui-accordion-content" ).each(function() {
3030
sizes.push( $( this ).outerHeight() );

tests/unit/accordion/accordion_deprecated.js

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
module( "accordion (deprecated): expanded active option, activate method", accordionSetupTeardown() );
44

55
test( "activate, numeric", function() {
6+
expect( 5 );
67
var element = $( "#list1" ).accordion({ active: 1 });
78
accordion_state( element, 0, 1, 0 );
89
element.accordion( "activate", 2 );
@@ -16,6 +17,7 @@ test( "activate, numeric", function() {
1617
});
1718

1819
test( "activate, numeric, collapsible:true", function() {
20+
expect( 3 );
1921
var element = $( "#list1" ).accordion({ collapsible: true });
2022
element.accordion( "activate", 2 );
2123
accordion_state( element, 0, 0, 1 );
@@ -26,6 +28,7 @@ test( "activate, numeric, collapsible:true", function() {
2628
});
2729

2830
test( "activate, boolean, collapsible: true", function() {
31+
expect( 2 );
2932
var element = $( "#list1" ).accordion({ collapsible: true });
3033
element.accordion( "activate", 2 );
3134
accordion_state( element, 0, 0, 1 );
@@ -34,6 +37,7 @@ test( "activate, boolean, collapsible: true", function() {
3437
});
3538

3639
test( "activate, boolean, collapsible: false", function() {
40+
expect( 2 );
3741
var element = $( "#list1" ).accordion();
3842
element.accordion( "activate", 2 );
3943
accordion_state( element, 0, 0, 1 );
@@ -42,6 +46,7 @@ test( "activate, boolean, collapsible: false", function() {
4246
});
4347

4448
test( "activate, string expression", function() {
49+
expect( 4 );
4550
var element = $( "#list1" ).accordion({ active: "h3:last" });
4651
accordion_state( element, 0, 0, 1 );
4752
element.accordion( "activate", ":first" );
@@ -53,6 +58,7 @@ test( "activate, string expression", function() {
5358
});
5459

5560
test( "activate, jQuery or DOM element", function() {
61+
expect( 3 );
5662
var element = $( "#list1" ).accordion({ active: $( "#list1 h3:last" ) });
5763
accordion_state( element, 0, 0, 1 );
5864
element.accordion( "activate", $( "#list1 h3:first" ) );
@@ -62,6 +68,7 @@ test( "activate, jQuery or DOM element", function() {
6268
});
6369

6470
test( "{ active: Selector }", function() {
71+
expect( 2 );
6572
var element = $("#list1").accordion({
6673
active: "h3:last"
6774
});
@@ -71,6 +78,7 @@ test( "{ active: Selector }", function() {
7178
});
7279

7380
test( "{ active: Element }", function() {
81+
expect( 2 );
7482
var element = $( "#list1" ).accordion({
7583
active: $( "#list1 h3:last" )[ 0 ]
7684
});
@@ -80,6 +88,7 @@ test( "{ active: Element }", function() {
8088
});
8189

8290
test( "{ active: jQuery Object }", function() {
91+
expect( 2 );
8392
var element = $( "#list1" ).accordion({
8493
active: $( "#list1 h3:last" )
8594
});
@@ -95,27 +104,31 @@ test( "{ active: jQuery Object }", function() {
95104
module( "accordion (deprecated) - height options", accordionSetupTeardown() );
96105

97106
test( "{ autoHeight: true }, default", function() {
98-
equalHeights($('#navigation').accordion({ autoHeight: true }), 95, 130);
107+
expect( 3 );
108+
accordion_equalHeights( $( "#navigation" ).accordion({ autoHeight: true }), 95, 130 );
99109
});
100110

101-
test("{ autoHeight: false }", function() {
102-
var element = $('#navigation').accordion({ autoHeight: false });
111+
test( "{ autoHeight: false }", function() {
112+
expect( 3 );
113+
var element = $( "#navigation" ).accordion({ autoHeight: false });
103114
var sizes = [];
104-
element.find(".ui-accordion-content").each(function() {
105-
sizes.push($(this).height());
115+
element.find( ".ui-accordion-content" ).each(function() {
116+
sizes.push( $(this).height() );
106117
});
107118
ok( sizes[0] >= 70 && sizes[0] <= 105, "was " + sizes[0] );
108119
ok( sizes[1] >= 98 && sizes[1] <= 126, "was " + sizes[1] );
109120
ok( sizes[2] >= 42 && sizes[2] <= 54, "was " + sizes[2] );
110121
});
111122

112123
test( "{ fillSpace: true }", function() {
124+
expect( 3 );
113125
$( "#navigationWrapper" ).height( 500 );
114126
var element = $( "#navigation" ).accordion({ fillSpace: true });
115-
equalHeights( element, 446, 458 );
127+
accordion_equalHeights( element, 446, 458 );
116128
});
117129

118130
test( "{ fillSapce: true } with sibling", function() {
131+
expect( 3 );
119132
$( "#navigationWrapper" ).height( 500 );
120133
$( "<p>Lorem Ipsum</p>" )
121134
.css({
@@ -125,10 +138,11 @@ test( "{ fillSapce: true } with sibling", function() {
125138
})
126139
.prependTo( "#navigationWrapper" );
127140
var element = $( "#navigation" ).accordion({ fillSpace: true });
128-
equalHeights( element , 346, 358);
141+
accordion_equalHeights( element , 346, 358);
129142
});
130143

131144
test( "{ fillSpace: true } with multiple siblings", function() {
145+
expect( 3 );
132146
$( "#navigationWrapper" ).height( 500 );
133147
$( "<p>Lorem Ipsum</p>" )
134148
.css({
@@ -153,7 +167,7 @@ test( "{ fillSpace: true } with multiple siblings", function() {
153167
})
154168
.prependTo( "#navigationWrapper" );
155169
var element = $( "#navigation" ).accordion({ fillSpace: true });
156-
equalHeights( element, 296, 308 );
170+
accordion_equalHeights( element, 296, 308 );
157171
});
158172

159173

@@ -163,6 +177,7 @@ test( "{ fillSpace: true } with multiple siblings", function() {
163177
module( "accordion (deprecated) - icons", accordionSetupTeardown() );
164178

165179
test( "icons, headerSelected", function() {
180+
expect( 3 );
166181
var element = $( "#list1" ).accordion({
167182
icons: { headerSelected: "a1", header: "h1" }
168183
});
@@ -179,18 +194,19 @@ test( "icons, headerSelected", function() {
179194
module( "accordion (deprecated) - resize", accordionSetupTeardown() );
180195

181196
test( "resize", function() {
197+
expect( 6 );
182198
var element = $( "#navigation" )
183199
.parent()
184200
.height( 300 )
185201
.end()
186202
.accordion({
187203
heightStyle: "fill"
188204
});
189-
equalHeights( element, 246, 258 );
205+
accordion_equalHeights( element, 246, 258 );
190206

191207
element.parent().height( 500 );
192208
element.accordion( "resize" );
193-
equalHeights( element, 446, 458 );
209+
accordion_equalHeights( element, 446, 458 );
194210
});
195211

196212

@@ -200,6 +216,7 @@ test( "resize", function() {
200216
module( "accordion (deprecated) - navigation", accordionSetupTeardown() );
201217

202218
test( "{ navigation: true, navigationFilter: header }", function() {
219+
expect( 2 );
203220
var element = $( "#navigation" ).accordion({
204221
navigation: true,
205222
navigationFilter: function() {
@@ -211,10 +228,11 @@ test( "{ navigation: true, navigationFilter: header }", function() {
211228
});
212229

213230
test( "{ navigation: true, navigationFilter: content }", function() {
214-
var element = $("#navigation").accordion({
231+
expect( 2 );
232+
var element = $( "#navigation" ).accordion({
215233
navigation: true,
216234
navigationFilter: function() {
217-
return /\?p=1\.1\.3\.2$/.test(this.href);
235+
return /\?p=1\.1\.3\.2$/.test( this.href );
218236
}
219237
});
220238
equal( element.accordion( "option", "active" ), 2 );

tests/unit/accordion/accordion_methods.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
module( "accordion: methods", accordionSetupTeardown() );
44

55
test( "destroy", function() {
6-
domEqual("#list1", function() {
7-
$("#list1").accordion().accordion("destroy");
6+
expect( 1 );
7+
domEqual( "#list1", function() {
8+
$( "#list1" ).accordion().accordion( "destroy" );
89
});
910
});
1011

1112
test( "enable/disable", function() {
12-
var element = $('#list1').accordion();
13+
expect( 3 );
14+
var element = $( "#list1" ).accordion();
1315
accordion_state( element, 1, 0, 0 );
1416
element.accordion( "disable" );
1517
element.accordion( "option", "active", 1 );
@@ -20,18 +22,19 @@ test( "enable/disable", function() {
2022
});
2123

2224
test( "refresh", function() {
25+
expect( 6 );
2326
var element = $( "#navigation" )
2427
.parent()
2528
.height( 300 )
2629
.end()
2730
.accordion({
2831
heightStyle: "fill"
2932
});
30-
equalHeights( element, 246, 258 );
33+
accordion_equalHeights( element, 246, 258 );
3134

3235
element.parent().height( 500 );
3336
element.accordion( "refresh" );
34-
equalHeights( element, 446, 458 );
37+
accordion_equalHeights( element, 446, 458 );
3538
});
3639

3740
}( jQuery ) );

0 commit comments

Comments
 (0)