Skip to content

Commit 4415e99

Browse files
scottgonzalezscottgonzalez
committed
Accordion tests: cleanup.
1 parent 1e9e0ed commit 4415e99

File tree

3 files changed

+46
-64
lines changed

3 files changed

+46
-64
lines changed

‎tests/unit/accordion/accordion.html

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Accordion Test Suite</title>
66

7+
<link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
78
<link rel="stylesheet" href="../../../themes/base/jquery.ui.accordion.css">
89

910
<script src="../../jquery.js"></script>
@@ -19,36 +20,7 @@
1920
<script src="../../jquery.simulate.js"></script>
2021
<script src="../testsuite.js"></script>
2122

22-
<script>
23-
function accordion_state( accordion ) {
24-
var expected = $.makeArray( arguments ).slice( 1 );
25-
var actual = accordion.find( ".ui-accordion-content" ).map(function() {
26-
return $( this ).css( "display" ) === "none" ? 0 : 1;
27-
}).get();
28-
deepEqual( actual, expected );
29-
}
30-
function accordion_equalHeights( accordion, min, max ) {
31-
var sizes = [];
32-
accordion.find( ".ui-accordion-content" ).each(function() {
33-
sizes.push( $( this ).outerHeight() );
34-
});
35-
ok( sizes[ 0 ] >= min && sizes[ 0 ] <= max,
36-
"must be within " + min + " and " + max + ", was " + sizes[ 0 ] );
37-
deepEqual( sizes[ 0 ], sizes[ 1 ] );
38-
deepEqual( sizes[ 0 ], sizes[ 2 ] );
39-
}
40-
function accordionSetupTeardown() {
41-
var animated = $.ui.accordion.prototype.options.animated;
42-
return {
43-
setup: function() {
44-
$.ui.accordion.prototype.options.animated = false;
45-
},
46-
teardown: function() {
47-
$.ui.accordion.prototype.options.animated = animated;
48-
}
49-
};
50-
}
51-
</script>
23+
<script src="accordion_test_helpers.js"></script>
5224
<script src="accordion_defaults.js"></script>
5325
<script src="accordion_core.js"></script>
5426
<script src="accordion_events.js"></script>
@@ -57,8 +29,12 @@
5729

5830
<script src="../swarminject.js"></script>
5931
<style>
60-
#qunit-fixture { font-size: 10pt; font-family: "trebuchet ms", verdana, arial; }
61-
#list, #list1 *, #navigation, #navigation * { margin: 0; padding: 0; font-size: 12px; line-height: 15px; }
32+
#list, #list1 *, #navigation, #navigation * {
33+
margin: 0;
34+
padding: 0;
35+
font-size: 12px;
36+
line-height: 15px;
37+
}
6238
</style>
6339
</head>
6440
<body>

‎tests/unit/accordion/accordion_deprecated.html

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Accordion Test Suite</title>
66

7+
<link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
78
<link rel="stylesheet" href="../../../themes/base/jquery.ui.accordion.css">
89

910
<script src="../../jquery.js"></script>
@@ -16,36 +17,7 @@
1617
<script src="../../jquery.simulate.js"></script>
1718
<script src="../testsuite.js"></script>
1819

19-
<script>
20-
function accordion_state( accordion ) {
21-
var expected = $.makeArray( arguments ).slice( 1 );
22-
var actual = accordion.find( ".ui-accordion-content" ).map(function() {
23-
return $( this ).css( "display" ) === "none" ? 0 : 1;
24-
}).get();
25-
deepEqual( actual, expected );
26-
}
27-
function accordion_equalHeights( accordion, min, max ) {
28-
var sizes = [];
29-
accordion.find( ".ui-accordion-content" ).each(function() {
30-
sizes.push( $( this ).outerHeight() );
31-
});
32-
ok( sizes[ 0 ] >= min && sizes[ 0 ] <= max,
33-
"must be within " + min + " and " + max + ", was " + sizes[ 0 ] );
34-
deepEqual( sizes[ 0 ], sizes[ 1 ] );
35-
deepEqual( sizes[ 0 ], sizes[ 2 ] );
36-
}
37-
function accordionSetupTeardown() {
38-
var animated = $.ui.accordion.prototype.options.animated;
39-
return {
40-
setup: function() {
41-
$.ui.accordion.prototype.options.animated = false;
42-
},
43-
teardown: function() {
44-
$.ui.accordion.prototype.options.animated = animated;
45-
}
46-
};
47-
}
48-
</script>
20+
<script src="accordion_test_helpers.js"></script>
4921
<script src="accordion_defaults_deprecated.js"></script>
5022
<script src="accordion_core.js"></script>
5123
<script src="accordion_events.js"></script>
@@ -55,8 +27,12 @@
5527

5628
<script src="../swarminject.js"></script>
5729
<style>
58-
#qunit-fixture { font-size: 10pt; font-family: "trebuchet ms", verdana, arial; }
59-
#list, #list1 *, #navigation, #navigation * { margin: 0; padding: 0; font-size: 12px; line-height: 15px; }
30+
#list, #list1 *, #navigation, #navigation * {
31+
margin: 0;
32+
padding: 0;
33+
font-size: 12px;
34+
line-height: 15px;
35+
}
6036
</style>
6137
</head>
6238
<body>

‎tests/unit/accordion/accordion_test_helpers.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
function accordion_state( accordion ) {
2+
var expected = $.makeArray( arguments ).slice( 1 );
3+
var actual = accordion.find( ".ui-accordion-content" ).map(function() {
4+
return $( this ).css( "display" ) === "none" ? 0 : 1;
5+
}).get();
6+
deepEqual( actual, expected );
7+
}
8+
9+
function accordion_equalHeights( accordion, min, max ) {
10+
var sizes = [];
11+
accordion.find( ".ui-accordion-content" ).each(function() {
12+
sizes.push( $( this ).outerHeight() );
13+
});
14+
ok( sizes[ 0 ] >= min && sizes[ 0 ] <= max,
15+
"must be within " + min + " and " + max + ", was " + sizes[ 0 ] );
16+
deepEqual( sizes[ 0 ], sizes[ 1 ] );
17+
deepEqual( sizes[ 0 ], sizes[ 2 ] );
18+
}
19+
20+
function accordionSetupTeardown() {
21+
var animated = $.ui.accordion.prototype.options.animated;
22+
return {
23+
setup: function() {
24+
$.ui.accordion.prototype.options.animated = false;
25+
},
26+
teardown: function() {
27+
$.ui.accordion.prototype.options.animated = animated;
28+
}
29+
};
30+
}

0 commit comments

Comments
 (0)