Skip to content

Commit 163555d

Browse files
scottgonzalezscottgonzalez
committed
Accordion tests: Don't polloute the global namespace with helpers.
1 parent 0e8d9dd commit 163555d

File tree

8 files changed

+149
-129
lines changed

8 files changed

+149
-129
lines changed

‎grunt.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,9 +348,6 @@ grunt.initConfig({
348348
}, defaults ),
349349
// TODO: don't create so many globals in tests
350350
globals: {
351-
accordion_equalHeights: true,
352-
accordion_setupTeardown: true,
353-
accordion_state: true,
354351
addMonths: true,
355352
asyncTest: true,
356353
commonWidgetTests: true,
@@ -396,6 +393,7 @@ grunt.initConfig({
396393
tabs_state: true,
397394
tabs_disabled: true,
398395
test: true,
396+
TestHelpers: true,
399397
widthAfter: true
400398
}
401399
}

‎tests/unit/accordion/accordion_core.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
(function( $ ) {
22

3-
module( "accordion: core", accordion_setupTeardown() );
3+
var setupTeardown = TestHelpers.accordion.setupTeardown,
4+
state = TestHelpers.accordion.state;
5+
6+
module( "accordion: core", setupTeardown() );
47

58
$.each( { div: "#list1", ul: "#navigation", dl: "#accordion-dl" }, function( type, selector ) {
69
test( "markup structure: " + type, function() {
@@ -21,7 +24,7 @@ test( "handle click on header-descendant", function() {
2124
expect( 1 );
2225
var element = $( "#navigation" ).accordion();
2326
$( "#navigation h2:eq(1) a" ).click();
24-
accordion_state( element, 0, 1, 0 );
27+
state( element, 0, 1, 0 );
2528
});
2629

2730
test( "accessibility", function () {

‎tests/unit/accordion/accordion_deprecated.js

Lines changed: 49 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,115 @@
11
(function( $ ) {
22

3-
module( "accordion (deprecated): expanded active option, activate method", accordion_setupTeardown() );
3+
var equalHeights = TestHelpers.accordion.equalHeights,
4+
setupTeardown = TestHelpers.accordion.setupTeardown,
5+
state = TestHelpers.accordion.state;
6+
7+
module( "accordion (deprecated): expanded active option, activate method", setupTeardown() );
48

59
test( "activate, numeric", function() {
610
expect( 5 );
711
var element = $( "#list1" ).accordion({ active: 1 });
8-
accordion_state( element, 0, 1, 0 );
12+
state( element, 0, 1, 0 );
913
element.accordion( "activate", 2 );
10-
accordion_state( element, 0, 0, 1 );
14+
state( element, 0, 0, 1 );
1115
element.accordion( "activate", 0 );
12-
accordion_state( element, 1, 0, 0 );
16+
state( element, 1, 0, 0 );
1317
element.accordion( "activate", 1 );
14-
accordion_state( element, 0, 1, 0 );
18+
state( element, 0, 1, 0 );
1519
element.accordion( "activate", 2 );
16-
accordion_state( element, 0, 0, 1 );
20+
state( element, 0, 0, 1 );
1721
});
1822

1923
test( "activate, numeric, collapsible:true", function() {
2024
expect( 3 );
2125
var element = $( "#list1" ).accordion({ collapsible: true });
2226
element.accordion( "activate", 2 );
23-
accordion_state( element, 0, 0, 1 );
27+
state( element, 0, 0, 1 );
2428
element.accordion( "activate", 0 );
25-
accordion_state( element, 1, 0, 0 );
29+
state( element, 1, 0, 0 );
2630
element.accordion( "activate", -1 );
27-
accordion_state( element, 0, 0, 0 );
31+
state( element, 0, 0, 0 );
2832
});
2933

3034
test( "activate, boolean, collapsible: true", function() {
3135
expect( 2 );
3236
var element = $( "#list1" ).accordion({ collapsible: true });
3337
element.accordion( "activate", 2 );
34-
accordion_state( element, 0, 0, 1 );
38+
state( element, 0, 0, 1 );
3539
element.accordion( "activate", false );
36-
accordion_state( element, 0, 0, 0 );
40+
state( element, 0, 0, 0 );
3741
});
3842

3943
test( "activate, boolean, collapsible: false", function() {
4044
expect( 2 );
4145
var element = $( "#list1" ).accordion();
4246
element.accordion( "activate", 2 );
43-
accordion_state( element, 0, 0, 1 );
47+
state( element, 0, 0, 1 );
4448
element.accordion( "activate", false );
45-
accordion_state( element, 0, 0, 1 );
49+
state( element, 0, 0, 1 );
4650
});
4751

4852
test( "activate, string expression", function() {
4953
expect( 4 );
5054
var element = $( "#list1" ).accordion({ active: "h3:last" });
51-
accordion_state( element, 0, 0, 1 );
55+
state( element, 0, 0, 1 );
5256
element.accordion( "activate", ":first" );
53-
accordion_state( element, 1, 0, 0 );
57+
state( element, 1, 0, 0 );
5458
element.accordion( "activate", ":eq(1)" );
55-
accordion_state( element, 0, 1, 0 );
59+
state( element, 0, 1, 0 );
5660
element.accordion( "activate", ":last" );
57-
accordion_state( element, 0, 0, 1 );
61+
state( element, 0, 0, 1 );
5862
});
5963

6064
test( "activate, jQuery or DOM element", function() {
6165
expect( 3 );
6266
var element = $( "#list1" ).accordion({ active: $( "#list1 h3:last" ) });
63-
accordion_state( element, 0, 0, 1 );
67+
state( element, 0, 0, 1 );
6468
element.accordion( "activate", $( "#list1 h3:first" ) );
65-
accordion_state( element, 1, 0, 0 );
69+
state( element, 1, 0, 0 );
6670
element.accordion( "activate", $( "#list1 h3" )[ 1 ] );
67-
accordion_state( element, 0, 1, 0 );
71+
state( element, 0, 1, 0 );
6872
});
6973

7074
test( "{ active: Selector }", function() {
7175
expect( 2 );
7276
var element = $("#list1").accordion({
7377
active: "h3:last"
7478
});
75-
accordion_state( element, 0, 0, 1 );
79+
state( element, 0, 0, 1 );
7680
element.accordion( "option", "active", "h3:eq(1)" );
77-
accordion_state( element, 0, 1, 0 );
81+
state( element, 0, 1, 0 );
7882
});
7983

8084
test( "{ active: Element }", function() {
8185
expect( 2 );
8286
var element = $( "#list1" ).accordion({
8387
active: $( "#list1 h3:last" )[ 0 ]
8488
});
85-
accordion_state( element, 0, 0, 1 );
89+
state( element, 0, 0, 1 );
8690
element.accordion( "option", "active", $( "#list1 h3:eq(1)" )[ 0 ] );
87-
accordion_state( element, 0, 1, 0 );
91+
state( element, 0, 1, 0 );
8892
});
8993

9094
test( "{ active: jQuery Object }", function() {
9195
expect( 2 );
9296
var element = $( "#list1" ).accordion({
9397
active: $( "#list1 h3:last" )
9498
});
95-
accordion_state( element, 0, 0, 1 );
99+
state( element, 0, 0, 1 );
96100
element.accordion( "option", "active", $( "#list1 h3:eq(1)" ) );
97-
accordion_state( element, 0, 1, 0 );
101+
state( element, 0, 1, 0 );
98102
});
99103

100104

101105

102106

103107

104-
module( "accordion (deprecated) - height options", accordion_setupTeardown() );
108+
module( "accordion (deprecated) - height options", setupTeardown() );
105109

106110
test( "{ autoHeight: true }, default", function() {
107111
expect( 3 );
108-
accordion_equalHeights( $( "#navigation" ).accordion({ autoHeight: true }), 95, 130 );
112+
equalHeights( $( "#navigation" ).accordion({ autoHeight: true }), 95, 130 );
109113
});
110114

111115
test( "{ autoHeight: false }", function() {
@@ -124,7 +128,7 @@ test( "{ fillSpace: true }", function() {
124128
expect( 3 );
125129
$( "#navigationWrapper" ).height( 500 );
126130
var element = $( "#navigation" ).accordion({ fillSpace: true });
127-
accordion_equalHeights( element, 446, 458 );
131+
equalHeights( element, 446, 458 );
128132
});
129133

130134
test( "{ fillSapce: true } with sibling", function() {
@@ -138,7 +142,7 @@ test( "{ fillSapce: true } with sibling", function() {
138142
})
139143
.prependTo( "#navigationWrapper" );
140144
var element = $( "#navigation" ).accordion({ fillSpace: true });
141-
accordion_equalHeights( element , 346, 358);
145+
equalHeights( element , 346, 358);
142146
});
143147

144148
test( "{ fillSpace: true } with multiple siblings", function() {
@@ -167,14 +171,14 @@ test( "{ fillSpace: true } with multiple siblings", function() {
167171
})
168172
.prependTo( "#navigationWrapper" );
169173
var element = $( "#navigation" ).accordion({ fillSpace: true });
170-
accordion_equalHeights( element, 296, 308 );
174+
equalHeights( element, 296, 308 );
171175
});
172176

173177

174178

175179

176180

177-
module( "accordion (deprecated) - icons", accordion_setupTeardown() );
181+
module( "accordion (deprecated) - icons", setupTeardown() );
178182

179183
test( "icons, headerSelected", function() {
180184
expect( 3 );
@@ -191,7 +195,7 @@ test( "icons, headerSelected", function() {
191195

192196

193197

194-
module( "accordion (deprecated) - resize", accordion_setupTeardown() );
198+
module( "accordion (deprecated) - resize", setupTeardown() );
195199

196200
test( "resize", function() {
197201
expect( 6 );
@@ -202,18 +206,18 @@ test( "resize", function() {
202206
.accordion({
203207
heightStyle: "fill"
204208
});
205-
accordion_equalHeights( element, 246, 258 );
209+
equalHeights( element, 246, 258 );
206210

207211
element.parent().height( 500 );
208212
element.accordion( "resize" );
209-
accordion_equalHeights( element, 446, 458 );
213+
equalHeights( element, 446, 458 );
210214
});
211215

212216

213217

214218

215219

216-
module( "accordion (deprecated) - navigation", accordion_setupTeardown() );
220+
module( "accordion (deprecated) - navigation", setupTeardown() );
217221

218222
test( "{ navigation: true, navigationFilter: header }", function() {
219223
expect( 2 );
@@ -224,7 +228,7 @@ test( "{ navigation: true, navigationFilter: header }", function() {
224228
}
225229
});
226230
equal( element.accordion( "option", "active" ), 2 );
227-
accordion_state( element, 0, 0, 1 );
231+
state( element, 0, 0, 1 );
228232
});
229233

230234
test( "{ navigation: true, navigationFilter: content }", function() {
@@ -236,14 +240,14 @@ test( "{ navigation: true, navigationFilter: content }", function() {
236240
}
237241
});
238242
equal( element.accordion( "option", "active" ), 2 );
239-
accordion_state( element, 0, 0, 1 );
243+
state( element, 0, 0, 1 );
240244
});
241245

242246

243247

244248

245249

246-
module( "accordion (deprecated) - changestart/change events", accordion_setupTeardown() );
250+
module( "accordion (deprecated) - changestart/change events", setupTeardown() );
247251

248252
test( "changestart", function() {
249253
expect( 26 );
@@ -261,10 +265,10 @@ test( "changestart", function() {
261265
strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
262266
equal( ui.newContent.size(), 1 );
263267
strictEqual( ui.newContent[ 0 ], content[ 0 ] );
264-
accordion_state( element, 0, 0, 0 );
268+
state( element, 0, 0, 0 );
265269
});
266270
element.accordion( "option", "active", 0 );
267-
accordion_state( element, 1, 0, 0 );
271+
state( element, 1, 0, 0 );
268272

269273
element.one( "accordionchangestart", function( event, ui ) {
270274
equal( ui.oldHeader.size(), 1 );
@@ -275,10 +279,10 @@ test( "changestart", function() {
275279
strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
276280
equal( ui.newContent.size(), 1 );
277281
strictEqual( ui.newContent[ 0 ], content[ 1 ] );
278-
accordion_state( element, 1, 0, 0 );
282+
state( element, 1, 0, 0 );
279283
});
280284
headers.eq( 1 ).click();
281-
accordion_state( element, 0, 1, 0 );
285+
state( element, 0, 1, 0 );
282286

283287
element.one( "accordionchangestart", function( event, ui ) {
284288
equal( ui.oldHeader.size(), 1 );
@@ -287,10 +291,10 @@ test( "changestart", function() {
287291
strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
288292
equal( ui.newHeader.size(), 0 );
289293
equal( ui.newContent.size(), 0 );
290-
accordion_state( element, 0, 1, 0 );
294+
state( element, 0, 1, 0 );
291295
});
292296
element.accordion( "option", "active", false );
293-
accordion_state( element, 0, 0, 0 );
297+
state( element, 0, 0, 0 );
294298
});
295299

296300
test( "change", function() {

‎tests/unit/accordion/accordion_events.js

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
(function( $ ) {
22

3-
module( "accordion: events", accordion_setupTeardown() );
3+
var setupTeardown = TestHelpers.accordion.setupTeardown,
4+
state = TestHelpers.accordion.state;
5+
6+
module( "accordion: events", setupTeardown() );
47

58
test( "create", function() {
69
expect( 10 );
@@ -58,10 +61,10 @@ test( "beforeActivate", function() {
5861
strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
5962
equal( ui.newContent.size(), 1 );
6063
strictEqual( ui.newContent[ 0 ], content[ 0 ] );
61-
accordion_state( element, 0, 0, 0 );
64+
state( element, 0, 0, 0 );
6265
});
6366
element.accordion( "option", "active", 0 );
64-
accordion_state( element, 1, 0, 0 );
67+
state( element, 1, 0, 0 );
6568

6669
element.one( "accordionbeforeactivate", function( event, ui ) {
6770
equal( event.originalEvent.type, "click" );
@@ -73,10 +76,10 @@ test( "beforeActivate", function() {
7376
strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
7477
equal( ui.newContent.size(), 1 );
7578
strictEqual( ui.newContent[ 0 ], content[ 1 ] );
76-
accordion_state( element, 1, 0, 0 );
79+
state( element, 1, 0, 0 );
7780
});
7881
headers.eq( 1 ).click();
79-
accordion_state( element, 0, 1, 0 );
82+
state( element, 0, 1, 0 );
8083

8184
element.one( "accordionbeforeactivate", function( event, ui ) {
8285
ok( !( "originalEvent" in event ) );
@@ -86,10 +89,10 @@ test( "beforeActivate", function() {
8689
strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
8790
equal( ui.newHeader.size(), 0 );
8891
equal( ui.newContent.size(), 0 );
89-
accordion_state( element, 0, 1, 0 );
92+
state( element, 0, 1, 0 );
9093
});
9194
element.accordion( "option", "active", false );
92-
accordion_state( element, 0, 0, 0 );
95+
state( element, 0, 0, 0 );
9396

9497
element.one( "accordionbeforeactivate", function( event, ui ) {
9598
ok( !( "originalEvent" in event ) );
@@ -100,10 +103,10 @@ test( "beforeActivate", function() {
100103
equal( ui.newContent.size(), 1 );
101104
strictEqual( ui.newContent[ 0 ], content[ 2 ] );
102105
event.preventDefault();
103-
accordion_state( element, 0, 0, 0 );
106+
state( element, 0, 0, 0 );
104107
});
105108
element.accordion( "option", "active", 2 );
106-
accordion_state( element, 0, 0, 0 );
109+
state( element, 0, 0, 0 );
107110
});
108111

109112
test( "activate", function() {

0 commit comments

Comments
 (0)