Skip to content

Commit fdedf16

Browse files
scottgonzalezscottgonzalez
committed
Tabs: Test cleanup.
1 parent fd1fd61 commit fdedf16

File tree

3 files changed

+227
-211
lines changed

3 files changed

+227
-211
lines changed

‎tests/unit/tabs/tabs.html‎

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

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

9-
<script type="text/javascript" src="../../../jquery-1.5.1.js"></script>
9+
<script src="../../../jquery-1.5.1.js"></script>
1010
<script>
11-
$.uiBackCompat = false;
11+
$.uiBackCompat = false;
1212
</script>
13-
<script type="text/javascript" src="../../../external/jquery.cookie.js"></script>
14-
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
15-
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
16-
<script type="text/javascript" src="../../../ui/jquery.ui.tabs.js"></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.tabs.js"></script>
1716

18-
<link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
19-
<script type="text/javascript" src="../../../external/qunit.js"></script>
20-
<script type="text/javascript" src="../../jquery.simulate.js"></script>
21-
<script type="text/javascript" src="../testsuite.js"></script>
22-
23-
<script type="text/javascript" src="tabs_core.js"></script>
24-
<script type="text/javascript" src="tabs_defaults.js"></script>
25-
<script type="text/javascript" src="tabs_events.js"></script>
26-
<script type="text/javascript" src="tabs_methods.js"></script>
27-
<script type="text/javascript" src="tabs_options.js"></script>
28-
<script type="text/javascript" src="tabs_tickets.js"></script>
29-
30-
<script type="text/javascript">
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>
21+
22+
<script src="tabs_defaults.js"></script>
23+
<script src="tabs_core.js"></script>
24+
<script src="tabs_events.js"></script>
25+
<script src="tabs_methods.js"></script>
26+
<script src="tabs_options.js"></script>
27+
<script src="tabs_tickets.js"></script>
28+
29+
<script>
3130
// disable this stale testsuite for testswarm only
3231
var url = window.location.search;
3332
url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + 9 ) );
@@ -37,88 +36,94 @@
3736
test("tabs", function() { ok(true, "disabled tabs testsuite"); });
3837
}
3938
</script>
40-
<script type="text/javascript" src="../swarminject.js"></script>
39+
<script src="../swarminject.js"></script>
4140
</head>
4241
<body>
4342

4443
<h1 id="qunit-header">jQuery UI Tabs Test Suite</h1>
4544
<h2 id="qunit-banner"></h2>
4645
<div id="qunit-testrunner-toolbar"></div>
4746
<h2 id="qunit-userAgent"></h2>
48-
<ol id="qunit-tests">
49-
</ol>
50-
47+
<ol id="qunit-tests"></ol>
5148
<div id="qunit-fixture">
5249

53-
<div id="tabs1">
54-
<ul>
55-
<li><a href="#fragment-1"><span>1</span></a></li>
56-
<li><a href="#fragment-2"><span>2</span></a></li>
57-
<li><a href="#fragment-3"><span>3</span></a></li>
58-
</ul>
59-
<div id="fragment-1"></div>
60-
<div id="fragment-2"></div>
61-
<div id="fragment-3"></div>
62-
</div>
63-
<div id="tabs2">
64-
<ul>
65-
<li><a href="#colon:test"><span>1</span></a></li>
66-
<li><a href="#inline-style"><span>2</span></a></li>
67-
<li><a href="data/test.html#test"><span>3</span></a></li>
68-
<li><a href="data/test.html" title="∫ßáö Սե"><span>4</span></a></li>
69-
</ul>
70-
<div id="colon:test"></div>
71-
<div style="height: 300px;" id="inline-style"></div>
72-
</div>
73-
<div id="tabs3">
74-
<div>
75-
<ul id="tabs3-list">
76-
<li><a href="#tabs3-1">1</a></li>
77-
</ul>
78-
</div>
79-
</div>
80-
<div id="tabs4">
81-
<ul id="tabs4-list">
82-
<li><a href="#tabs4-1">1</a></li>
83-
</ul>
84-
<ol>
85-
<li><a href="#tabs4-1">1</a></li>
86-
</ol>
87-
</div>
88-
<div id="tabs4a">
89-
<ol id="tabs4a-list">
90-
<li><a href="#tabs4a-1">1</a></li>
91-
</ol>
50+
<div id="tabs1">
51+
<ul>
52+
<li><a href="#fragment-1"><span>1</span></a></li>
53+
<li><a href="#fragment-2"><span>2</span></a></li>
54+
<li><a href="#fragment-3"><span>3</span></a></li>
55+
</ul>
56+
<div id="fragment-1"></div>
57+
<div id="fragment-2"></div>
58+
<div id="fragment-3"></div>
59+
</div>
60+
61+
<div id="tabs2">
62+
<ul>
63+
<li><a href="#colon:test"><span>1</span></a></li>
64+
<li><a href="#inline-style"><span>2</span></a></li>
65+
<li><a href="data/test.html#test"><span>3</span></a></li>
66+
<li><a href="data/test.html" title="∫ßáö Սե"><span>4</span></a></li>
67+
</ul>
68+
<div id="colon:test"></div>
69+
<div style="height: 300px;" id="inline-style"></div>
70+
</div>
71+
72+
<div id="tabs3">
73+
<div>
74+
<ul id="tabs3-list">
75+
<li><a href="#tabs3-1">1</a></li>
76+
</ul>
77+
</div>
78+
</div>
79+
80+
<div id="tabs4">
81+
<ul id="tabs4-list">
82+
<li><a href="#tabs4-1">1</a></li>
83+
</ul>
84+
<ol>
85+
<li><a href="#tabs4-1">1</a></li>
86+
</ol>
87+
</div>
88+
89+
<div id="tabs4a">
90+
<ol id="tabs4a-list">
91+
<li><a href="#tabs4a-1">1</a></li>
92+
</ol>
93+
<ul>
94+
<li><a href="#tabs4a-1">1</a></li>
95+
</ul>
96+
</div>
97+
98+
<div id="tabs5">
99+
<div>
100+
<ul id="tabs5-list"></ul>
101+
</div>
102+
</div>
103+
104+
<div id="tabs6">
105+
<ul id="tabs6-list">
106+
<li><a href="#tabs6-1">1</a>
92107
<ul>
93-
<li><a href="#tabs4a-1">1</a></li>
108+
<li><a href="#item6-3">3</a></li>
109+
<li><a href="#item6-4">4</a></li>
94110
</ul>
95-
</div>
96-
<div id="tabs5">
97-
<div>
98-
<ul id="tabs5-list"></ul>
99-
</div>
100-
</div>
101-
<div id="tabs6">
102-
<ul id="tabs6-list">
103-
<li><a href="#tabs6-1">1</a>
104-
<ul>
105-
<li><a href="#item6-3">3</a></li>
106-
<li><a href="#item6-4">4</a></li>
107-
</ul>
108-
</li>
109-
<li><a href="#tabs6-2">2</a></li>
110-
</ul>
111-
<div id="tabs6-1"></div>
112-
<div id="tabs6-2"></div>
113-
</div>
114-
<div id="tabs7">
115-
<ul id="tabs7-list">
116-
<li><a href="#tabs7-1">1</a></li>
117-
<li><a href="#tabs7-2">2</a></li>
118-
</ul>
119-
<div id="tabs7-2"></div>
120-
<div id="tabs7-1"></div>
121-
</div>
122-
</div>
111+
</li>
112+
<li><a href="#tabs6-2">2</a></li>
113+
</ul>
114+
<div id="tabs6-1"></div>
115+
<div id="tabs6-2"></div>
116+
</div>
117+
118+
<div id="tabs7">
119+
<ul id="tabs7-list">
120+
<li><a href="#tabs7-1">1</a></li>
121+
<li><a href="#tabs7-2">2</a></li>
122+
</ul>
123+
<div id="tabs7-2"></div>
124+
<div id="tabs7-1"></div>
125+
</div>
126+
127+
</div>
123128
</body>
124129
</html>

‎tests/unit/tabs/tabs_core.js‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,33 @@
1-
/*
2-
* tabs_core.js
3-
*/
4-
var el;
1+
(function( $ ) {
52

6-
(function($) {
3+
module( "tabs: core" );
74

8-
module("tabs: core");
9-
10-
test('navigation markup', function() {
11-
el = $('#tabs3').tabs();
12-
ok($('#tabs3-list').hasClass('ui-tabs-nav'), 'custom markup; allow list to be any descendant');
13-
el.tabs('destroy');
14-
15-
el = $('#tabs4').tabs();
16-
ok($('#tabs4-list').hasClass('ui-tabs-nav'), 'first list found becomes nav - ul');
17-
el.tabs('destroy');
5+
test( "markup structure", function() {
6+
expect( 3 );
7+
var el = $( "#tabs1" ).tabs();
8+
ok( el.hasClass( "ui-tabs" ), "main element is .ui-tabs" );
9+
ok( el.find( "ul" ).hasClass( "ui-tabs-nav" ), "list item is .ui-tabs-nav" );
10+
equal( el.find( ".ui-tabs-panel" ).length, 3,
11+
".ui-tabs-panel elements exist, correct number" );
12+
});
1813

19-
el = $('#tabs4a').tabs();
20-
ok($('#tabs4a-list').hasClass('ui-tabs-nav'), 'first list found becomes nav - ol');
21-
el.tabs('destroy');
14+
$.each({
15+
"deep ul": "#tabs3",
16+
"multiple lists, ul first": "#tabs4",
17+
"multiple lists, ol first": "#tabs5",
18+
"empty list": "#tabs6"
19+
}, function( type, selector ) {
20+
test( "markup structure: " + type, function() {
21+
expect( 2 );
22+
var el = $( selector ).tabs();
23+
ok( el.hasClass( "ui-tabs" ), "main element is .ui-tabs" );
24+
ok( $( selector + "-list" ).hasClass( "ui-tabs-nav" ),
25+
"list item is .ui-tabs-nav" );
26+
});
27+
});
2228

23-
el = $('#tabs5').tabs();
24-
ok($('#tabs5-list').hasClass('ui-tabs-nav'), 'empty list can be used');
25-
el.tabs('destroy');
29+
test( "accessibility", function() {
30+
// TODO: add tests
2631
});
2732

28-
})(jQuery);
33+
}( jQuery ) );

0 commit comments

Comments
 (0)