Skip to content

Commit dcac8c1

Browse files
scottgonzalezscottgonzalez
committed
Tests: Added ability to run tests against minified files via ?min=1
1 parent 94b852f commit dcac8c1

File tree

25 files changed

+309
-128
lines changed

25 files changed

+309
-128
lines changed

‎build/build.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,13 @@
148148
<fileset dir="${ui.dir}/themes/base/images" />
149149
</copy>
150150

151+
<!-- make a copy of the minified files for use in tests -->
152+
<copy todir="dist" file="${min.dir}/jquery-ui.min.js" />
153+
<copy todir="dist/theme" file="${dist.dir}/themes/base/minified/jquery-ui.min.css" />
154+
<copy todir="dist/theme/images" >
155+
<fileset dir="${ui.dir}/themes/base/images" />
156+
</copy>
157+
151158
<echo message="Minified ui/ built." />
152159
</target>
153160

‎tests/resource_loader.js

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
(function( $ ) {
2+
3+
var parts = document.location.search.slice( 1 ).split( "&" ),
4+
length = parts.length,
5+
i = 0,
6+
current,
7+
min;
8+
9+
for ( ; i < length; i++ ) {
10+
current = parts[ i ].split( "=" );
11+
if ( current[ 0 ] === "min" ) {
12+
min = current[ 1 ];
13+
break;
14+
}
15+
}
16+
17+
function includeStyle( url ) {
18+
document.write( "<link rel='stylesheet' href='../../../" + url + "'>" );
19+
}
20+
21+
function includeScript( url ) {
22+
document.write( "<script src='../../../" + url + "'></script>" );
23+
}
24+
25+
window.loadResources = min ?
26+
function() {
27+
includeStyle( "build/dist/theme/jquery-ui.min.css" );
28+
includeScript( "build/dist/jquery-ui.min.js" );
29+
} :
30+
function( resources ) {
31+
$.each( resources.css || [], function( i, resource ) {
32+
includeStyle( "themes/base/jquery." + resource + ".css" );
33+
});
34+
$.each( resources.js || [], function( i, resource ) {
35+
includeScript( resource );
36+
});
37+
};
38+
39+
})( jQuery );

‎tests/unit/accordion/accordion.html

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,21 @@
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">
8-
<link rel="stylesheet" href="../../../themes/base/jquery.ui.accordion.css">
9-
107
<script src="../../jquery.js"></script>
118
<script>
129
$.uiBackCompat = false;
1310
</script>
14-
<script src="../../../ui/jquery.ui.core.js"></script>
15-
<script src="../../../ui/jquery.ui.widget.js"></script>
16-
<script src="../../../ui/jquery.ui.accordion.js"></script>
11+
<script src="../../resource_loader.js"></script>
12+
<script>
13+
loadResources({
14+
css: [ "ui.core", "ui.accordion" ],
15+
js: [
16+
"ui/jquery.ui.core.js",
17+
"ui/jquery.ui.widget.js",
18+
"ui/jquery.ui.accordion.js"
19+
]
20+
});
21+
</script>
1722

1823
<link rel="stylesheet" href="../../../external/qunit.css">
1924
<script src="../../../external/qunit.js"></script>

‎tests/unit/accordion/accordion_deprecated.html

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,18 @@
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">
8-
<link rel="stylesheet" href="../../../themes/base/jquery.ui.accordion.css">
9-
107
<script src="../../jquery.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.accordion.js"></script>
8+
<script src="../../resource_loader.js"></script>
9+
<script>
10+
loadResources({
11+
css: [ "ui.core", "ui.accordion" ],
12+
js: [
13+
"ui/jquery.ui.core.js",
14+
"ui/jquery.ui.widget.js",
15+
"ui/jquery.ui.accordion.js"
16+
]
17+
});
18+
</script>
1419

1520
<link rel="stylesheet" href="../../../external/qunit.css">
1621
<script src="../../../external/qunit.js"></script>

‎tests/unit/autocomplete/autocomplete.html

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,20 @@
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">
8-
<link rel="stylesheet" href="../../../themes/base/jquery.ui.autocomplete.css">
9-
107
<script src="../../jquery.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.position.js"></script>
14-
<script src="../../../ui/jquery.ui.menu.js"></script>
15-
<script src="../../../ui/jquery.ui.autocomplete.js"></script>
8+
<script src="../../resource_loader.js"></script>
9+
<script>
10+
loadResources({
11+
css: [ "ui.core", "ui.menu", "ui.autocomplete" ],
12+
js: [
13+
"ui/jquery.ui.core.js",
14+
"ui/jquery.ui.widget.js",
15+
"ui/jquery.ui.position.js",
16+
"ui/jquery.ui.menu.js",
17+
"ui/jquery.ui.autocomplete.js"
18+
]
19+
});
20+
</script>
1621

1722
<link rel="stylesheet" href="../../../external/qunit.css">
1823
<script src="../../../external/qunit.js"></script>

‎tests/unit/button/button.html

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

7-
<link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
8-
<link rel="stylesheet" href="../../../themes/base/jquery.ui.button.css">
9-
107
<script src="../../jquery.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>
8+
<script src="../../resource_loader.js"></script>
9+
<script>
10+
loadResources({
11+
css: [ "ui.core", "ui.button" ],
12+
js: [
13+
"ui/jquery.ui.core.js",
14+
"ui/jquery.ui.widget.js",
15+
"ui/jquery.ui.button.js"
16+
]
17+
});
18+
</script>
1419

1520
<link rel="stylesheet" href="../../../external/qunit.css">
1621
<script src="../../../external/qunit.js"></script>

‎tests/unit/core/core.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@
55
<title>jQuery UI Core Test Suite</title>
66

77
<script src="../../jquery.js"></script>
8-
<script src="../../../ui/jquery.ui.core.js"></script>
9-
<script src="../../../ui/jquery.ui.widget.js"></script>
8+
<script src="../../resource_loader.js"></script>
9+
<script>
10+
loadResources({
11+
js: [ "ui/jquery.ui.core.js" ]
12+
});
13+
</script>
1014

1115
<link rel="stylesheet" href="../../../external/qunit.css">
1216
<script src="../../../external/qunit.js"></script>

‎tests/unit/datepicker/datepicker.html

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,20 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Datepicker Test Suite</title>
66

7-
<link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
8-
<link rel="stylesheet" href="../../../themes/base/jquery.ui.datepicker.css">
9-
107
<script src="../../jquery.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.datepicker.js"></script>
14-
<script src="../../../ui/i18n/jquery.ui.datepicker-fr.js"></script>
15-
<script src="../../../ui/i18n/jquery.ui.datepicker-he.js"></script>
16-
<script src="../../../ui/i18n/jquery.ui.datepicker-zh-CN.js"></script>
8+
<script src="../../resource_loader.js"></script>
9+
<script>
10+
loadResources({
11+
css: [ "ui.core", "ui.datepicker" ],
12+
js: [
13+
"ui/jquery.ui.core.js",
14+
"ui/jquery.ui.datepicker.js",
15+
"ui/i18n/jquery.ui.datepicker-fr.js",
16+
"ui/i18n/jquery.ui.datepicker-he.js",
17+
"ui/i18n/jquery.ui.datepicker-zh-CN.js"
18+
]
19+
});
20+
</script>
1721

1822
<link rel="stylesheet" href="../../../external/qunit.css">
1923
<script src="../../../external/qunit.js"></script>

‎tests/unit/dialog/dialog.html

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,23 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Dialog Test Suite</title>
66

7-
<link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
8-
<link rel="stylesheet" href="../../../themes/base/jquery.ui.dialog.css">
9-
107
<script src="../../jquery.js"></script>
118
<script src="../../../external/jquery.bgiframe-2.1.2.js"></script>
12-
<script src="../../../ui/jquery.ui.core.js"></script>
13-
<script src="../../../ui/jquery.ui.widget.js"></script>
14-
<script src="../../../ui/jquery.ui.mouse.js"></script>
15-
<script src="../../../ui/jquery.ui.draggable.js"></script>
16-
<script src="../../../ui/jquery.ui.position.js"></script>
17-
<script src="../../../ui/jquery.ui.resizable.js"></script>
18-
<script src="../../../ui/jquery.ui.dialog.js"></script>
9+
<script src="../../resource_loader.js"></script>
10+
<script>
11+
loadResources({
12+
css: [ "ui.core", "ui.dialog" ],
13+
js: [
14+
"ui/jquery.ui.core.js",
15+
"ui/jquery.ui.widget.js",
16+
"ui/jquery.ui.position.js",
17+
"ui/jquery.ui.mouse.js",
18+
"ui/jquery.ui.draggable.js",
19+
"ui/jquery.ui.resizable.js",
20+
"ui/jquery.ui.dialog.js"
21+
]
22+
});
23+
</script>
1924

2025
<link rel="stylesheet" href="../../../external/qunit.css">
2126
<script src="../../../external/qunit.js"></script>

‎tests/unit/draggable/draggable.html

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,18 @@
55
<title>jQuery UI Draggable Test Suite</title>
66

77
<script src="../../jquery.js"></script>
8-
<script src="../../../ui/jquery.ui.core.js"></script>
9-
<script src="../../../ui/jquery.ui.widget.js"></script>
10-
<script src="../../../ui/jquery.ui.mouse.js"></script>
11-
<script src="../../../ui/jquery.ui.draggable.js"></script>
8+
<script src="../../resource_loader.js"></script>
9+
<script>
10+
loadResources({
11+
css: [ "ui.core" ],
12+
js: [
13+
"ui/jquery.ui.core.js",
14+
"ui/jquery.ui.widget.js",
15+
"ui/jquery.ui.mouse.js",
16+
"ui/jquery.ui.draggable.js"
17+
]
18+
});
19+
</script>
1220

1321
<link rel="stylesheet" href="../../../external/qunit.css">
1422
<script src="../../../external/qunit.js"></script>

‎tests/unit/droppable/droppable.html

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,19 @@
55
<title>jQuery UI Droppable Test Suite</title>
66

77
<script src="../../jquery.js"></script>
8-
<script src="../../../ui/jquery.ui.core.js"></script>
9-
<script src="../../../ui/jquery.ui.widget.js"></script>
10-
<script src="../../../ui/jquery.ui.mouse.js"></script>
11-
<script src="../../../ui/jquery.ui.draggable.js"></script>
12-
<script src="../../../ui/jquery.ui.droppable.js"></script>
8+
<script src="../../resource_loader.js"></script>
9+
<script>
10+
loadResources({
11+
css: [ "ui.core" ],
12+
js: [
13+
"ui/jquery.ui.core.js",
14+
"ui/jquery.ui.widget.js",
15+
"ui/jquery.ui.mouse.js",
16+
"ui/jquery.ui.draggable.js",
17+
"ui/jquery.ui.droppable.js"
18+
]
19+
});
20+
</script>
1321

1422
<link rel="stylesheet" href="../../../external/qunit.css">
1523
<script src="../../../external/qunit.js"></script>

‎tests/unit/effects/effects.html

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,27 @@
88
<script>
99
$.uiBackCompat = false;
1010
</script>
11-
<script src="../../../ui/jquery.effects.core.js"></script>
12-
<script src="../../../ui/jquery.effects.blind.js"></script>
13-
<script src="../../../ui/jquery.effects.bounce.js"></script>
14-
<script src="../../../ui/jquery.effects.clip.js"></script>
15-
<script src="../../../ui/jquery.effects.drop.js"></script>
16-
<script src="../../../ui/jquery.effects.explode.js"></script>
17-
<script src="../../../ui/jquery.effects.fade.js"></script>
18-
<script src="../../../ui/jquery.effects.fold.js"></script>
19-
<script src="../../../ui/jquery.effects.highlight.js"></script>
20-
<script src="../../../ui/jquery.effects.pulsate.js"></script>
21-
<script src="../../../ui/jquery.effects.scale.js"></script>
22-
<script src="../../../ui/jquery.effects.shake.js"></script>
23-
<script src="../../../ui/jquery.effects.slide.js"></script>
24-
<script src="../../../ui/jquery.effects.transfer.js"></script>
11+
<script src="../../resource_loader.js"></script>
12+
<script>
13+
loadResources({
14+
js: [
15+
"ui/jquery.effects.core.js",
16+
"ui/jquery.effects.blind.js",
17+
"ui/jquery.effects.bounce.js",
18+
"ui/jquery.effects.clip.js",
19+
"ui/jquery.effects.drop.js",
20+
"ui/jquery.effects.explode.js",
21+
"ui/jquery.effects.fade.js",
22+
"ui/jquery.effects.fold.js",
23+
"ui/jquery.effects.highlight.js",
24+
"ui/jquery.effects.pulsate.js",
25+
"ui/jquery.effects.scale.js",
26+
"ui/jquery.effects.shake.js",
27+
"ui/jquery.effects.slide.js",
28+
"ui/jquery.effects.transfer.js"
29+
]
30+
});
31+
</script>
2532

2633
<link rel="stylesheet" href="../../../external/qunit.css">
2734
<script src="../../../external/qunit.js"></script>

‎tests/unit/menu/menu.html

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,18 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Menu Test Suite</title>
66

7-
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css">
8-
97
<script src="../../jquery.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.menu.js"></script>
8+
<script src="../../resource_loader.js"></script>
9+
<script>
10+
loadResources({
11+
css: [ "ui.core", "ui.menu" ],
12+
js: [
13+
"ui/jquery.ui.core.js",
14+
"ui/jquery.ui.widget.js",
15+
"ui/jquery.ui.menu.js"
16+
]
17+
});
18+
</script>
1319

1420
<link rel="stylesheet" href="../../../external/qunit.css">
1521
<script src="../../../external/qunit.js"></script>

‎tests/unit/position/position.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
<script>
99
$.uiBackCompat = false;
1010
</script>
11-
<script src="../../../ui/jquery.ui.position.js"></script>
11+
<script src="../../resource_loader.js"></script>
12+
<script>
13+
loadResources({
14+
js: [ "ui/jquery.ui.position.js" ]
15+
});
16+
</script>
1217

1318
<link rel="stylesheet" href="../../../external/qunit.css">
1419
<script src="../../../external/qunit.js"></script>

‎tests/unit/position/position_deprecated.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@
55
<title>jQuery UI Position Test Suite</title>
66

77
<script src="../../jquery.js"></script>
8-
<script src="../../../ui/jquery.ui.position.js"></script>
8+
<script src="../../resource_loader.js"></script>
9+
<script>
10+
loadResources({
11+
js: [ "ui/jquery.ui.position.js" ]
12+
});
13+
</script>
914

1015
<link rel="stylesheet" href="../../../external/qunit.css">
1116
<script src="../../../external/qunit.js"></script>

0 commit comments

Comments
 (0)