Skip to content

Commit 4adb902

Browse files
scottgonzalezscottgonzalez
committed
Tests: Cleanup.
1 parent 6867e0b commit 4adb902

File tree

18 files changed

+476
-498
lines changed

18 files changed

+476
-498
lines changed

‎tests/unit/autocomplete/autocomplete.html‎

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

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

910
<script src="../../jquery.js"></script>

‎tests/unit/button/button.html‎

Lines changed: 44 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,66 @@
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 Button Test Suite</title>
66

7-
<link type="text/css" href="../../../themes/base/jquery.ui.button.css" rel="stylesheet" />
7+
<link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
8+
<link rel="stylesheet" href="../../../themes/base/jquery.ui.button.css">
89

910
<script src="../../jquery.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.button.js"></script>
11+
<script src="../../../ui/jquery.ui.core.js"></script>
12+
<script src="../../../ui/jquery.ui.widget.js"></script>
13+
<script src="../../../ui/jquery.ui.button.js"></script>
1314

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>
18-
19-
<script type="text/javascript" src="button_core.js"></script>
20-
<script type="text/javascript" src="button_defaults.js"></script>
21-
<script type="text/javascript" src="button_events.js"></script>
22-
<script type="text/javascript" src="button_methods.js"></script>
23-
<script type="text/javascript" src="button_options.js"></script>
24-
<script type="text/javascript" src="button_tickets.js"></script>
25-
26-
<script type="text/javascript" src="../swarminject.js"></script>
15+
<link rel="stylesheet" href="../../../external/qunit.css">
16+
<script src="../../../external/qunit.js"></script>
17+
<script src="../../jquery.simulate.js"></script>
18+
<script src="../testsuite.js"></script>
19+
20+
<script src="button_core.js"></script>
21+
<script src="button_defaults.js"></script>
22+
<script src="button_events.js"></script>
23+
<script src="button_methods.js"></script>
24+
<script src="button_options.js"></script>
25+
<script src="button_tickets.js"></script>
26+
27+
<script src="../swarminject.js"></script>
2728
</head>
2829
<body>
2930

3031
<h1 id="qunit-header">jQuery UI Button Test Suite</h1>
3132
<h2 id="qunit-banner"></h2>
3233
<div id="qunit-testrunner-toolbar"></div>
3334
<h2 id="qunit-userAgent"></h2>
34-
<ol id="qunit-tests">
35-
</ol>
36-
35+
<ol id="qunit-tests"></ol>
3736
<div id="qunit-fixture">
3837

38+
<div><button id="button" class="foo">Label</button></div>
3939

40-
<div><button id="button" class="foo">Label</button></div>
41-
42-
<div id="radio0" style="margin-top: 2em;">
43-
<input type="radio" id="radio01" name="radio" checked="checked" /><label for="radio01">Choice 1</label>
44-
<input type="radio" id="radio02" name="radio" /><label for="radio02">Choice 2</label>
45-
<input type="radio" id="radio03" name="radio" /><label for="radio03">Choice 3</label>
40+
<div id="radio0" style="margin-top: 2em;">
41+
<input type="radio" id="radio01" name="radio" checked="checked"><label for="radio01">Choice 1</label>
42+
<input type="radio" id="radio02" name="radio"><label for="radio02">Choice 2</label>
43+
<input type="radio" id="radio03" name="radio"><label for="radio03">Choice 3</label>
44+
</div>
45+
<form>
46+
<div id="radio1" style="margin-top: 2em;">
47+
<input type="radio" id="radio11" name="radio"><label for="radio11">Choice 1</label>
48+
<input type="radio" id="radio12" name="radio" checked="checked"><label for="radio12">Choice 2</label>
49+
<input type="radio" id="radio13" name="radio"><label for="radio13">Choice 3</label>
4650
</div>
47-
<form>
48-
<div id="radio1" style="margin-top: 2em;">
49-
<input type="radio" id="radio11" name="radio" /><label for="radio11">Choice 1</label>
50-
<input type="radio" id="radio12" name="radio" checked="checked" /><label for="radio12">Choice 2</label>
51-
<input type="radio" id="radio13" name="radio" /><label for="radio13">Choice 3</label>
52-
</div>
53-
</form>
54-
<form>
55-
<div id="radio2" style="margin-top: 2em;">
56-
<input type="radio" id="radio21" name="radio" /><label for="radio21">Choice 1</label>
57-
<input type="radio" id="radio22" name="radio" /><label for="radio22">Choice 2</label>
58-
<input type="radio" id="radio23" name="radio" checked="checked" /><label for="radio23">Choice 3</label>
59-
</div>
60-
</form>
61-
62-
<input type="checkbox" id="check" /><label for="check">Toggle</label>
51+
</form>
52+
<form>
53+
<div id="radio2" style="margin-top: 2em;">
54+
<input type="radio" id="radio21" name="radio"><label for="radio21">Choice 1</label>
55+
<input type="radio" id="radio22" name="radio"><label for="radio22">Choice 2</label>
56+
<input type="radio" id="radio23" name="radio" checked="checked"><label for="radio23">Choice 3</label>
57+
</div>
58+
</form>
6359

64-
<div><input id="submit" type="submit" value="Label" /></div>
65-
</div>
60+
<input type="checkbox" id="check"><label for="check">Toggle</label>
6661

62+
<div><input id="submit" type="submit" value="Label"></div>
63+
64+
</div>
6765
</body>
6866
</html>

‎tests/unit/core/core.html‎

Lines changed: 106 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
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 Core Test Suite</title>
66

77
<script src="../../jquery.js"></script>
8-
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
9-
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
10-
11-
<link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
12-
<script type="text/javascript" src="../../../external/qunit.js"></script>
13-
<script type="text/javascript" src="../../jquery.simulate.js"></script>
14-
<script type="text/javascript" src="../testsuite.js"></script>
15-
16-
<script type="text/javascript" src="core.js"></script>
17-
<script type="text/javascript" src="selector.js"></script>
18-
19-
<script type="text/javascript" src="../swarminject.js"></script>
20-
21-
<style type="text/css">
22-
.zindex {z-index: 100}
23-
.absolute {position: absolute}
8+
<script src="../../../ui/jquery.ui.core.js"></script>
9+
<script src="../../../ui/jquery.ui.widget.js"></script>
10+
11+
<link rel="stylesheet" href="../../../external/qunit.css">
12+
<script src="../../../external/qunit.js"></script>
13+
<script src="../../jquery.simulate.js"></script>
14+
<script src="../testsuite.js"></script>
15+
16+
<script src="core.js"></script>
17+
<script src="selector.js"></script>
18+
19+
<script src="../swarminject.js"></script>
20+
<style>
21+
.zindex {
22+
z-index: 100;
23+
}
24+
.absolute {
25+
position: absolute;
26+
}
2427
</style>
2528
</head>
2629
<body>
@@ -29,98 +32,96 @@ <h1 id="qunit-header">jQuery UI Core Test Suite</h1>
2932
<h2 id="qunit-banner"></h2>
3033
<div id="qunit-testrunner-toolbar"></div>
3134
<h2 id="qunit-userAgent"></h2>
32-
<ol id="qunit-tests">
33-
</ol>
34-
35+
<ol id="qunit-tests"></ol>
3536
<div id="qunit-fixture">
3637

37-
<img src="../images/jqueryui_32x32.png" usemap="#mymap" width="10", height="10">
38-
<map name="mymap">
39-
<area shape="rect" coords="0,0,1,1" id="areaCoordsNoHref">
40-
<area shape="rect" coords="1,1,2,2" href="foo.html" id="areaCoordsHref">
41-
<area shape="rect" coords="0,0,0,0" href="foo.html" id="areaCoordsNoSizeHref">
42-
<area href="foo.html" id="areaNoCoordsHref">
43-
</map>
44-
<map name="mymap2">
45-
<area shape="rect" coords="1,1,2,2" href="foo.html" id="areaNoImg">
46-
</map>
47-
48-
<div>
49-
<input id="visibleAncestor-inputTypeNone" />
50-
<input type="text" id="visibleAncestor-inputTypeText" />
51-
<input type="checkbox" id="visibleAncestor-inputTypeCheckbox" />
52-
<input type="radio" id="visibleAncestor-inputTypeRadio" />
53-
<input type="button" id="visibleAncestor-inputTypeButton" />
54-
<input type="hidden" id="visibleAncestor-inputTypeHidden" />
55-
<button id="visibleAncestor-button">x</button>
56-
<select id="visibleAncestor-select">
57-
<option>option</option>
58-
</select>
59-
<textarea id="visibleAncestor-textarea">x</textarea>
60-
<object id="visibleAncestor-object" codebase="about:blank">xxx</object>
61-
<a href="#" id="visibleAncestor-anchorWithHref">anchor</a>
62-
<a id="visibleAncestor-anchorWithoutHref">anchor</a>
63-
<span id="visibleAncestor-span">x</span>
64-
<div id="visibleAncestor-div">x</div>
65-
<span id="visibleAncestor-spanWithTabindex" tabindex="1">x</span>
66-
<div id="visibleAncestor-divWithNegativeTabindex" tabindex="-1">x</div>
67-
</div>
68-
69-
<div>
70-
<input id="disabledElement-inputTypeNone" disabled="disabled" />
71-
<input type="text" id="disabledElement-inputTypeText" disabled="disabled" />
72-
<input type="checkbox" id="disabledElement-inputTypeCheckbox" disabled="disabled" />
73-
<input type="radio" id="disabledElement-inputTypeRadio" disabled="disabled" />
74-
<input type="button" id="disabledElement-inputTypeButton" disabled="disabled" />
75-
<input type="hidden" id="disabledElement-inputTypeHidden" disabled="disabled" />
76-
<button id="disabledElement-button" disabled="disabled"></button>
77-
<select id="disabledElement-select" disabled="disabled"></select>
78-
<textarea id="disabledElement-textarea" disabled="disabled"></textarea>
79-
</div>
80-
81-
<div>
82-
<div id="displayNoneAncestor" style="display: none;">
83-
<input id="displayNoneAncestor-input" />
84-
<span tabindex="1" id="displayNoneAncestor-span">.</span>
85-
</div>
86-
87-
<div id="visibilityHiddenAncestor" style="visibility: hidden;">
88-
<input id="visibilityHiddenAncestor-input" />
89-
<span tabindex="1" id="visibilityHiddenAncestor-span">.</span>
90-
</div>
91-
92-
<span tabindex="1" id="displayNone-span" style="display: none;">.</span>
93-
<span tabindex="1" id="visibilityHidden-span" style="visibility: hidden;">.</span>
94-
95-
<input id="displayNone-input" style="display: none;" />
96-
<input id="visibilityHidden-input" style="visibility: hidden;" />
97-
</div>
98-
99-
<div>
100-
<input id="inputTabindex0" tabindex="0" />
101-
<input id="inputTabindex10" tabindex="10" />
102-
<input id="inputTabindex-1" tabindex="-1" />
103-
<input id="inputTabindex-50" tabindex="-50" />
104-
105-
<span id="spanTabindex0" tabindex="0">.</span>
106-
<span id="spanTabindex10" tabindex="10">.</span>
107-
<span id="spanTabindex-1" tabindex="-1">.</span>
108-
<span id="spanTabindex-50" tabindex="-50">.</span>
109-
</div>
110-
111-
<div id="zIndex100" style="z-index: 100; position: absolute">
112-
<div id="zIndexAutoWithParent">.</div>
113-
</div>
114-
<div id="zIndex100ViaCSS" class="zindex">
115-
<div id="zIndexAutoWithParentViaCSS">.</div>
38+
<img src="../images/jqueryui_32x32.png" usemap="#mymap" width="10", height="10">
39+
<map name="mymap">
40+
<area shape="rect" coords="0,0,1,1" id="areaCoordsNoHref">
41+
<area shape="rect" coords="1,1,2,2" href="foo.html" id="areaCoordsHref">
42+
<area shape="rect" coords="0,0,0,0" href="foo.html" id="areaCoordsNoSizeHref">
43+
<area href="foo.html" id="areaNoCoordsHref">
44+
</map>
45+
<map name="mymap2">
46+
<area shape="rect" coords="1,1,2,2" href="foo.html" id="areaNoImg">
47+
</map>
48+
49+
<div>
50+
<input id="visibleAncestor-inputTypeNone" />
51+
<input type="text" id="visibleAncestor-inputTypeText" />
52+
<input type="checkbox" id="visibleAncestor-inputTypeCheckbox" />
53+
<input type="radio" id="visibleAncestor-inputTypeRadio" />
54+
<input type="button" id="visibleAncestor-inputTypeButton" />
55+
<input type="hidden" id="visibleAncestor-inputTypeHidden" />
56+
<button id="visibleAncestor-button">x</button>
57+
<select id="visibleAncestor-select">
58+
<option>option</option>
59+
</select>
60+
<textarea id="visibleAncestor-textarea">x</textarea>
61+
<object id="visibleAncestor-object" codebase="about:blank">xxx</object>
62+
<a href="#" id="visibleAncestor-anchorWithHref">anchor</a>
63+
<a id="visibleAncestor-anchorWithoutHref">anchor</a>
64+
<span id="visibleAncestor-span">x</span>
65+
<div id="visibleAncestor-div">x</div>
66+
<span id="visibleAncestor-spanWithTabindex" tabindex="1">x</span>
67+
<div id="visibleAncestor-divWithNegativeTabindex" tabindex="-1">x</div>
68+
</div>
69+
70+
<div>
71+
<input id="disabledElement-inputTypeNone" disabled="disabled" />
72+
<input type="text" id="disabledElement-inputTypeText" disabled="disabled" />
73+
<input type="checkbox" id="disabledElement-inputTypeCheckbox" disabled="disabled" />
74+
<input type="radio" id="disabledElement-inputTypeRadio" disabled="disabled" />
75+
<input type="button" id="disabledElement-inputTypeButton" disabled="disabled" />
76+
<input type="hidden" id="disabledElement-inputTypeHidden" disabled="disabled" />
77+
<button id="disabledElement-button" disabled="disabled"></button>
78+
<select id="disabledElement-select" disabled="disabled"></select>
79+
<textarea id="disabledElement-textarea" disabled="disabled"></textarea>
80+
</div>
81+
82+
<div>
83+
<div id="displayNoneAncestor" style="display: none;">
84+
<input id="displayNoneAncestor-input" />
85+
<span tabindex="1" id="displayNoneAncestor-span">.</span>
11686
</div>
117-
<div id="zIndex100ViaCSSPositioned" class="zindex absolute">
118-
<div id="zIndexAutoWithParentViaCSSPositioned">.</div>
87+
88+
<div id="visibilityHiddenAncestor" style="visibility: hidden;">
89+
<input id="visibilityHiddenAncestor-input" />
90+
<span tabindex="1" id="visibilityHiddenAncestor-span">.</span>
11991
</div>
120-
<div id="zIndexAutoNoParent"></div>
121-
122-
<div id="dimensions" style="float: left; height: 50px; width: 100px; margin: 1px 12px 11px 2px; border-style: solid; border-width: 3px 14px 13px 4px; padding: 5px 16px 15px 6px;"></div>
92+
93+
<span tabindex="1" id="displayNone-span" style="display: none;">.</span>
94+
<span tabindex="1" id="visibilityHidden-span" style="visibility: hidden;">.</span>
95+
96+
<input id="displayNone-input" style="display: none;" />
97+
<input id="visibilityHidden-input" style="visibility: hidden;" />
98+
</div>
99+
100+
<div>
101+
<input id="inputTabindex0" tabindex="0" />
102+
<input id="inputTabindex10" tabindex="10" />
103+
<input id="inputTabindex-1" tabindex="-1" />
104+
<input id="inputTabindex-50" tabindex="-50" />
105+
106+
<span id="spanTabindex0" tabindex="0">.</span>
107+
<span id="spanTabindex10" tabindex="10">.</span>
108+
<span id="spanTabindex-1" tabindex="-1">.</span>
109+
<span id="spanTabindex-50" tabindex="-50">.</span>
123110
</div>
124111

112+
<div id="zIndex100" style="z-index: 100; position: absolute">
113+
<div id="zIndexAutoWithParent">.</div>
114+
</div>
115+
<div id="zIndex100ViaCSS" class="zindex">
116+
<div id="zIndexAutoWithParentViaCSS">.</div>
117+
</div>
118+
<div id="zIndex100ViaCSSPositioned" class="zindex absolute">
119+
<div id="zIndexAutoWithParentViaCSSPositioned">.</div>
120+
</div>
121+
<div id="zIndexAutoNoParent"></div>
122+
123+
<div id="dimensions" style="float: left; height: 50px; width: 100px; margin: 1px 12px 11px 2px; border-style: solid; border-width: 3px 14px 13px 4px; padding: 5px 16px 15px 6px;"></div>
124+
125+
</div>
125126
</body>
126127
</html>

0 commit comments

Comments
 (0)