Skip to content

Commit c96c249

Browse files
scottgonzalezscottgonzalez
committed
Accordion: First pass at splitting out tests for deprecated functionality.
1 parent cc90b44 commit c96c249

8 files changed

+474
-286
lines changed

‎tests/unit/accordion/accordion.html

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,58 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="UTF-8" />
4+
<meta charset="utf-8">
55
<title>jQuery UI Accordion Test Suite</title>
66

7-
<link type="text/css" href="../../../themes/base/jquery.ui.accordion.css" rel="stylesheet" />
7+
<link rel="stylesheet" href="../../../themes/base/jquery.ui.accordion.css">
88

9-
<script type="text/javascript" src="../../../jquery-1.4.4.js"></script>
10-
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
11-
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
12-
<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
9+
<script src="../../../jquery-1.4.4.js"></script>
10+
<script>
11+
$.uiBackCompat = false;
12+
</script>
13+
<script src="../../../ui/jquery.ui.core.js"></script>
14+
<script src="../../../ui/jquery.ui.widget.js"></script>
15+
<script src="../../../ui/jquery.ui.accordion.js"></script>
1316

14-
<link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
15-
<script type="text/javascript" src="../../../external/qunit.js"></script>
16-
<script type="text/javascript" src="../../jquery.simulate.js"></script>
17-
<script type="text/javascript" src="../testsuite.js"></script>
17+
<link rel="stylesheet" href="../../../external/qunit.css">
18+
<script src="../../../external/qunit.js"></script>
19+
<script src="../../jquery.simulate.js"></script>
20+
<script src="../testsuite.js"></script>
1821

19-
<script type="text/javascript">
20-
$.ui.accordion.prototype.options.animated = false;
22+
<script>
23+
$.ui.accordion.prototype.options.animated = false;
2124

22-
function state(accordion) {
23-
var args = $.makeArray(arguments).slice(1);
24-
var result = [];
25-
$.each(args, function(i, n) {
26-
result.push( accordion.find(".ui-accordion-content").eq(i).filter(function() {
27-
return $(this).css("display") != "none"
28-
}).length ? 1 : 0 );
29-
});
30-
same(args, result)
31-
}
32-
function equalHeights(accordion, min, max) {
33-
var sizes = [];
34-
accordion.find(".ui-accordion-content").each(function() {
35-
sizes.push($(this).outerHeight());
36-
});
37-
ok( sizes[0] >= min && sizes[0] <= max, "must be within " + min + " and " + max + ", was " + sizes[0] );
38-
same(sizes[0], sizes[1]);
39-
same(sizes[0], sizes[2]);
40-
}
25+
function state(accordion) {
26+
var args = $.makeArray(arguments).slice(1);
27+
var result = [];
28+
$.each(args, function(i, n) {
29+
result.push( accordion.find(".ui-accordion-content").eq(i).filter(function() {
30+
return $(this).css("display") != "none"
31+
}).length ? 1 : 0 );
32+
});
33+
same(args, result)
34+
}
35+
function equalHeights(accordion, min, max) {
36+
var sizes = [];
37+
accordion.find(".ui-accordion-content").each(function() {
38+
sizes.push($(this).outerHeight());
39+
});
40+
ok( sizes[0] >= min && sizes[0] <= max, "must be within " + min + " and " + max + ", was " + sizes[0] );
41+
same(sizes[0], sizes[1]);
42+
same(sizes[0], sizes[2]);
43+
}
4144
</script>
42-
<script type="text/javascript" src="accordion_core.js"></script>
43-
<script type="text/javascript" src="accordion_defaults.js"></script>
44-
<script type="text/javascript" src="accordion_events.js"></script>
45-
<script type="text/javascript" src="accordion_methods.js"></script>
46-
<script type="text/javascript" src="accordion_options.js"></script>
47-
<script type="text/javascript" src="accordion_tickets.js"></script>
48-
49-
<script type="text/javascript" src="../swarminject.js"></script>
45+
<script src="accordion_core.js"></script>
46+
<script src="accordion_defaults.js"></script>
47+
<script src="accordion_events.js"></script>
48+
<script src="accordion_methods.js"></script>
49+
<script src="accordion_options.js"></script>
50+
<script src="accordion_tickets.js"></script>
51+
52+
<script src="../swarminject.js"></script>
5053
<style>
51-
#main { font-size: 10pt; font-family: 'trebuchet ms', verdana, arial; }
52-
#list, #list1 *, #navigation, #navigation * { margin: 0; padding: 0; font-size: 12px; }
54+
#main { font-size: 10pt; font-family: "trebuchet ms", verdana, arial; }
55+
#list, #list1 *, #navigation, #navigation * { margin: 0; padding: 0; font-size: 12px; }
5356
</style>
5457
</head>
5558
<body>

‎tests/unit/accordion/accordion_defaults.js

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,15 @@
55
var accordion_defaults = {
66
active: 0,
77
animated: false,
8-
autoHeight: true,
9-
clearStyle: false,
108
collapsible: false,
119
disabled: false,
1210
event: "click",
13-
fillSpace: false,
1411
header: "> li > :first-child,> :not(li):even",
15-
heightStyle: null,
16-
icons: { "header": "ui-icon-triangle-1-e",
17-
"activeHeader": null,
18-
"headerSelected": "ui-icon-triangle-1-s" },
19-
navigation: false,
20-
navigationFilter: function() {}
12+
heightStyle: "auto",
13+
icons: {
14+
"header": "ui-icon-triangle-1-e",
15+
"activeHeader": "ui-icon-triangle-1-s"
16+
}
2117
};
2218

23-
commonWidgetTests('accordion', { defaults: accordion_defaults });
19+
commonWidgetTests( "accordion", { defaults: accordion_defaults } );

‎tests/unit/accordion/accordion_defaults_deprecated.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/*
2+
* accordion_defaults.js
3+
*/
4+
5+
var accordion_defaults = {
6+
active: 0,
7+
animated: false,
8+
autoHeight: true,
9+
clearStyle: false,
10+
collapsible: false,
11+
disabled: false,
12+
event: "click",
13+
fillSpace: false,
14+
header: "> li > :first-child,> :not(li):even",
15+
heightStyle: null,
16+
icons: {
17+
"header": "ui-icon-triangle-1-e",
18+
"activeHeader": null,
19+
"headerSelected": "ui-icon-triangle-1-s"
20+
},
21+
navigation: false,
22+
navigationFilter: function() {}
23+
};
24+
25+
commonWidgetTests( "accordion", { defaults: accordion_defaults } );

‎tests/unit/accordion/accordion_deprecated.html

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<title>jQuery UI Accordion Test Suite</title>
6+
7+
<link rel="stylesheet" href="../../../themes/base/jquery.ui.accordion.css">
8+
9+
<script src="../../../jquery-1.4.4.js"></script>
10+
<script src="../../../ui/jquery.ui.core.js"></script>
11+
<script src="../../../ui/jquery.ui.widget.js"></script>
12+
<script src="../../../ui/jquery.ui.accordion.js"></script>
13+
14+
<link rel="stylesheet" href="../../../external/qunit.css">
15+
<script src="../../../external/qunit.js"></script>
16+
<script src="../../jquery.simulate.js"></script>
17+
<script src="../testsuite.js"></script>
18+
19+
<script>
20+
$.ui.accordion.prototype.options.animated = false;
21+
22+
function state(accordion) {
23+
var args = $.makeArray(arguments).slice(1);
24+
var result = [];
25+
$.each(args, function(i, n) {
26+
result.push( accordion.find(".ui-accordion-content").eq(i).filter(function() {
27+
return $(this).css("display") != "none"
28+
}).length ? 1 : 0 );
29+
});
30+
same(args, result)
31+
}
32+
function equalHeights(accordion, min, max) {
33+
var sizes = [];
34+
accordion.find(".ui-accordion-content").each(function() {
35+
sizes.push($(this).outerHeight());
36+
});
37+
ok( sizes[0] >= min && sizes[0] <= max, "must be within " + min + " and " + max + ", was " + sizes[0] );
38+
same(sizes[0], sizes[1]);
39+
same(sizes[0], sizes[2]);
40+
}
41+
</script>
42+
<script src="accordion_core.js"></script>
43+
<script src="accordion_defaults_deprecated.js"></script>
44+
<script src="accordion_events.js"></script>
45+
<script src="accordion_methods.js"></script>
46+
<script src="accordion_options.js"></script>
47+
<script src="accordion_tickets.js"></script>
48+
<script src="accordion_deprecated.js"></script>
49+
50+
<script src="../swarminject.js"></script>
51+
<style>
52+
#main { font-size: 10pt; font-family: "trebuchet ms", verdana, arial; }
53+
#list, #list1 *, #navigation, #navigation * { margin: 0; padding: 0; font-size: 12px; }
54+
</style>
55+
</head>
56+
<body>
57+
58+
<h1 id="qunit-header">jQuery UI Accordion Test Suite</h1>
59+
<h2 id="qunit-banner"></h2>
60+
<h2 id="qunit-userAgent"></h2>
61+
<ol id="qunit-tests">
62+
</ol>
63+
64+
<div id="main" style="position: absolute; top: -10000px; left: -10000px;">
65+
66+
<div>
67+
<div id="list1" class="foo">
68+
<h3 class="bar"><a class="anchor">There is one obvious advantage:</a></h3>
69+
<div class="foo">
70+
<p>
71+
You've seen it coming!
72+
<br/>
73+
Buy now and get nothing for free!
74+
<br/>
75+
Well, at least no free beer. Perhaps a bear, if you can afford it.
76+
</p>
77+
</div>
78+
<h3 class="bar"><a class="anchor">Now that you've got...</a></h3>
79+
<div class="foo">
80+
<p>
81+
your bear, you have to admit it!
82+
<br/>
83+
No, we aren't selling bears.
84+
</p>
85+
<p>
86+
We could talk about renting one.
87+
</p>
88+
</div>
89+
<h3 class="bar"><a class="anchor">Rent one bear, ...</a></h3>
90+
<div class="foo">
91+
<p>
92+
get two for three beer.
93+
</p>
94+
<p>
95+
And now, for something completely different.
96+
</p>
97+
</div>
98+
</div>
99+
</div>
100+
101+
<div id="navigationWrapper">
102+
<ul id="navigation">
103+
<li>
104+
<h2><a href="?p=1.1.1">Guitar</a></h2>
105+
<ul>
106+
<li><a href="?p=1.1.1.1">Electric</a></li>
107+
<li><a href="?p=1.1.1.2">Acoustic</a></li>
108+
<li><a href="?p=1.1.1.3">Amps</a></li>
109+
<li><a href="?p=1.1.1.4">Effects</a></li>
110+
<li><a href="?p=1.1.1.5">Accessories</a></li>
111+
</ul>
112+
</li>
113+
<li>
114+
<h2><a href="?p=1.1.2"><span>Bass</span></a></h2>
115+
<ul>
116+
<li><a href="?p=1.1.2.1">Electric</a></li>
117+
<li><a href="?p=1.1.2.2">Acoustic</a></li>
118+
<li><a href="?p=1.1.2.3">Amps</a></li>
119+
<li><a href="?p=1.1.2.4">Effects</a></li>
120+
<li><a href="?p=1.1.2.5">Accessories</a></li>
121+
<li><a href="?p=1.1.2.5">Accessories</a></li>
122+
<li><a href="?p=1.1.2.5">Accessories</a></li>
123+
</ul>
124+
</li>
125+
<li>
126+
<h2><a href="?p=1.1.3">Drums</a></h2>
127+
<ul>
128+
<li><a href="?p=1.1.3.2">Acoustic Drums</a></li>
129+
<li><a href="?p=1.1.3.3">Electronic Drums</a></li>
130+
<li><a href="?p=1.1.3.6">Accessories</a></li>
131+
</ul>
132+
</li>
133+
</ul>
134+
</div>
135+
136+
</div>
137+
138+
</body>
139+
</html>

0 commit comments

Comments
 (0)