Tests: Added ability to run tests against minified files via ?min=1

diff --git a/build/build.xml b/build/build.xml
index aef5e5fb314c98f5638313fc1d3bf455081f5965..1e5ab842b92b0a5960559fbd7ee144074158dc21 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -148,6 +148,13 @@
                        <fileset dir="${ui.dir}/themes/base/images" />
                </copy>
 
+               <!-- make a copy of the minified files for use in tests -->
+               <copy todir="dist" file="${min.dir}/jquery-ui.min.js" />
+               <copy todir="dist/theme" file="${dist.dir}/themes/base/minified/jquery-ui.min.css" />
+               <copy todir="dist/theme/images" >
+                       <fileset dir="${ui.dir}/themes/base/images" />
+               </copy>
+
                <echo message="Minified ui/ built." />
        </target>
 

diff --git a/tests/resource_loader.js b/tests/resource_loader.js
new file mode 100644 (file)
index 0000000..c8dec48
--- /dev/null
+++ b/tests/resource_loader.js
@@ -0,0 +1,39 @@
+(function( $ ) {
+
+var parts = document.location.search.slice( 1 ).split( "&" ),
+       length = parts.length,
+       i = 0,
+       current,
+       min;
+
+for ( ; i < length; i++ ) {
+       current = parts[ i ].split( "=" );
+       if ( current[ 0 ] === "min" ) {
+               min = current[ 1 ];
+               break;
+       }
+}
+
+function includeStyle( url ) {
+       document.write( "<link rel='stylesheet' href='../../../" + url + "'>" );
+}
+
+function includeScript( url ) {
+       document.write( "<script src='../../../" + url + "'></script>" );
+}
+
+window.loadResources = min ?
+       function() {
+               includeStyle( "build/dist/theme/jquery-ui.min.css" );
+               includeScript( "build/dist/jquery-ui.min.js" );
+       } :
+       function( resources ) {
+               $.each( resources.css || [], function( i, resource ) {
+                       includeStyle( "themes/base/jquery." + resource + ".css" );
+               });
+               $.each( resources.js || [], function( i, resource ) {
+                       includeScript( resource );
+               });
+       };
+
+})( jQuery );

diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html
index b3c3b59aca5266309204e6de5d91652f42b6c8b8..ed9b1aa1d3a0adac4daae59506b8176d91f3169d 100644 (file)
--- a/tests/unit/accordion/accordion.html
+++ b/tests/unit/accordion/accordion.html
@@ -4,16 +4,21 @@
        <meta charset="utf-8">
        <title>jQuery UI Accordion Test Suite</title>
 
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.accordion.css">
-
        <script src="../../jquery.js"></script>
        <script>
        $.uiBackCompat = false;
        </script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
-       <script src="../../../ui/jquery.ui.accordion.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core", "ui.accordion" ],
+               js: [
+                       "ui/jquery.ui.core.js",
+                       "ui/jquery.ui.widget.js",
+                       "ui/jquery.ui.accordion.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/accordion/accordion_deprecated.html b/tests/unit/accordion/accordion_deprecated.html
index 3a7ad86f20f24f98a7c440d3e43b0f93de1608b7..f730d8029f0b3461694f29865460fc80bf207dbf 100644 (file)
--- a/tests/unit/accordion/accordion_deprecated.html
+++ b/tests/unit/accordion/accordion_deprecated.html
@@ -4,13 +4,18 @@
        <meta charset="utf-8">
        <title>jQuery UI Accordion Test Suite</title>
 
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.accordion.css">
-
        <script src="../../jquery.js"></script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
-       <script src="../../../ui/jquery.ui.accordion.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core", "ui.accordion" ],
+               js: [
+                       "ui/jquery.ui.core.js",
+                       "ui/jquery.ui.widget.js",
+                       "ui/jquery.ui.accordion.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/autocomplete/autocomplete.html b/tests/unit/autocomplete/autocomplete.html
index e5987350b3718f56db9f6d263762c2727c675aed..70d2ecfd15478ac4a3a6a4087eb7acfe611d1440 100644 (file)
--- a/tests/unit/autocomplete/autocomplete.html
+++ b/tests/unit/autocomplete/autocomplete.html
@@ -4,15 +4,20 @@
        <meta charset="utf-8">
        <title>jQuery UI Autocomplete Test Suite</title>
 
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.autocomplete.css">
-
        <script src="../../jquery.js"></script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
-       <script src="../../../ui/jquery.ui.position.js"></script>
-       <script src="../../../ui/jquery.ui.menu.js"></script>
-       <script src="../../../ui/jquery.ui.autocomplete.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core", "ui.menu", "ui.autocomplete" ],
+               js: [
+                       "ui/jquery.ui.core.js",
+                       "ui/jquery.ui.widget.js",
+                       "ui/jquery.ui.position.js",
+                       "ui/jquery.ui.menu.js",
+                       "ui/jquery.ui.autocomplete.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/button/button.html b/tests/unit/button/button.html
index 7fcf07eec3996031700de153c33d4f83987d1d32..5ec7e316afb3d3c6881a56ea2d58d76c83f01c42 100644 (file)
--- a/tests/unit/button/button.html
+++ b/tests/unit/button/button.html
@@ -4,13 +4,18 @@
        <meta charset="utf-8">
        <title>jQuery UI Button Test Suite</title>
 
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.button.css">
-
        <script src="../../jquery.js"></script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
-       <script src="../../../ui/jquery.ui.button.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core", "ui.button" ],
+               js: [
+                       "ui/jquery.ui.core.js",
+                       "ui/jquery.ui.widget.js",
+                       "ui/jquery.ui.button.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html
index e2d98880683f0954bb07db4d838e74e0b0ff8edb..3b1dc1fc82b1a0df9ba9a06e72cf9562e9a8c517 100644 (file)
--- a/tests/unit/core/core.html
+++ b/tests/unit/core/core.html
@@ -5,8 +5,12 @@
        <title>jQuery UI Core Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               js: [ "ui/jquery.ui.core.js" ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/datepicker/datepicker.html b/tests/unit/datepicker/datepicker.html
index 1080233728066e43aed8cbf2f0eb9d8e0bc18ec1..592db53ccaf0a12d159c3a222c4fd06e2cc4e419 100644 (file)
--- a/tests/unit/datepicker/datepicker.html
+++ b/tests/unit/datepicker/datepicker.html
@@ -4,16 +4,20 @@
        <meta charset="utf-8">
        <title>jQuery UI Datepicker Test Suite</title>
 
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.datepicker.css">
-
        <script src="../../jquery.js"></script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
-       <script src="../../../ui/jquery.ui.datepicker.js"></script>
-       <script src="../../../ui/i18n/jquery.ui.datepicker-fr.js"></script>
-       <script src="../../../ui/i18n/jquery.ui.datepicker-he.js"></script>
-       <script src="../../../ui/i18n/jquery.ui.datepicker-zh-CN.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core", "ui.datepicker" ],
+               js: [
+                       "ui/jquery.ui.core.js",
+                       "ui/jquery.ui.datepicker.js",
+                       "ui/i18n/jquery.ui.datepicker-fr.js",
+                       "ui/i18n/jquery.ui.datepicker-he.js",
+                       "ui/i18n/jquery.ui.datepicker-zh-CN.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html
index b35ae582308bad1fcf585333ba14cac1e6089c23..94b20a225af81a5934dd367dede4f7c22bc92e88 100644 (file)
--- a/tests/unit/dialog/dialog.html
+++ b/tests/unit/dialog/dialog.html
@@ -4,18 +4,23 @@
        <meta charset="utf-8">
        <title>jQuery UI Dialog Test Suite</title>
 
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.dialog.css">
-
        <script src="../../jquery.js"></script>
        <script src="../../../external/jquery.bgiframe-2.1.2.js"></script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
-       <script src="../../../ui/jquery.ui.mouse.js"></script>
-       <script src="../../../ui/jquery.ui.draggable.js"></script>
-       <script src="../../../ui/jquery.ui.position.js"></script>
-       <script src="../../../ui/jquery.ui.resizable.js"></script>
-       <script src="../../../ui/jquery.ui.dialog.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core", "ui.dialog" ],
+               js: [
+                       "ui/jquery.ui.core.js",
+                       "ui/jquery.ui.widget.js",
+                       "ui/jquery.ui.position.js",
+                       "ui/jquery.ui.mouse.js",
+                       "ui/jquery.ui.draggable.js",
+                       "ui/jquery.ui.resizable.js",
+                       "ui/jquery.ui.dialog.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/draggable/draggable.html b/tests/unit/draggable/draggable.html
index e5006bf174ea99b85b35de187dd188f61d194938..5be71f460654c3b33547b2537b80a475abd7ddc4 100644 (file)
--- a/tests/unit/draggable/draggable.html
+++ b/tests/unit/draggable/draggable.html
@@ -5,10 +5,18 @@
        <title>jQuery UI Draggable Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
-       <script src="../../../ui/jquery.ui.mouse.js"></script>
-       <script src="../../../ui/jquery.ui.draggable.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core" ],
+               js: [
+                       "ui/jquery.ui.core.js",
+                       "ui/jquery.ui.widget.js",
+                       "ui/jquery.ui.mouse.js",
+                       "ui/jquery.ui.draggable.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/droppable/droppable.html b/tests/unit/droppable/droppable.html
index 149430bcf6c6d9d713bcebbd5d876374ca6e5f7f..abf94f0c7b95ee8e9492a91c385520ded41b80f2 100644 (file)
--- a/tests/unit/droppable/droppable.html
+++ b/tests/unit/droppable/droppable.html
@@ -5,11 +5,19 @@
        <title>jQuery UI Droppable Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
-       <script src="../../../ui/jquery.ui.mouse.js"></script>
-       <script src="../../../ui/jquery.ui.draggable.js"></script>
-       <script src="../../../ui/jquery.ui.droppable.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core" ],
+               js: [
+                       "ui/jquery.ui.core.js",
+                       "ui/jquery.ui.widget.js",
+                       "ui/jquery.ui.mouse.js",
+                       "ui/jquery.ui.draggable.js",
+                       "ui/jquery.ui.droppable.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/effects/effects.html b/tests/unit/effects/effects.html
index f5dac54c7cf835e0e26189369b276e000ffb2ddf..06023c55d7cb0ba87bfd7b85557304e4c90770db 100644 (file)
--- a/tests/unit/effects/effects.html
+++ b/tests/unit/effects/effects.html
@@ -8,20 +8,27 @@
        <script>
        $.uiBackCompat = false;
        </script>
-       <script src="../../../ui/jquery.effects.core.js"></script>
-       <script src="../../../ui/jquery.effects.blind.js"></script>
-       <script src="../../../ui/jquery.effects.bounce.js"></script>
-       <script src="../../../ui/jquery.effects.clip.js"></script>
-       <script src="../../../ui/jquery.effects.drop.js"></script>
-       <script src="../../../ui/jquery.effects.explode.js"></script>
-       <script src="../../../ui/jquery.effects.fade.js"></script>
-       <script src="../../../ui/jquery.effects.fold.js"></script>
-       <script src="../../../ui/jquery.effects.highlight.js"></script>
-       <script src="../../../ui/jquery.effects.pulsate.js"></script>
-       <script src="../../../ui/jquery.effects.scale.js"></script>
-       <script src="../../../ui/jquery.effects.shake.js"></script>
-       <script src="../../../ui/jquery.effects.slide.js"></script>
-       <script src="../../../ui/jquery.effects.transfer.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               js: [
+                       "ui/jquery.effects.core.js",
+                       "ui/jquery.effects.blind.js",
+                       "ui/jquery.effects.bounce.js",
+                       "ui/jquery.effects.clip.js",
+                       "ui/jquery.effects.drop.js",
+                       "ui/jquery.effects.explode.js",
+                       "ui/jquery.effects.fade.js",
+                       "ui/jquery.effects.fold.js",
+                       "ui/jquery.effects.highlight.js",
+                       "ui/jquery.effects.pulsate.js",
+                       "ui/jquery.effects.scale.js",
+                       "ui/jquery.effects.shake.js",
+                       "ui/jquery.effects.slide.js",
+                       "ui/jquery.effects.transfer.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/menu/menu.html b/tests/unit/menu/menu.html
index 014123144c7e1a7d58f4789096844d3448baa1e8..76f4a7a316f05dae588ded54fe22e7e13de113d8 100644 (file)
--- a/tests/unit/menu/menu.html
+++ b/tests/unit/menu/menu.html
@@ -4,12 +4,18 @@
        <meta charset="utf-8">
        <title>jQuery UI Menu Test Suite</title>
 
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css">
-
        <script src="../../jquery.js"></script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
-       <script src="../../../ui/jquery.ui.menu.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core", "ui.menu" ],
+               js: [
+                       "ui/jquery.ui.core.js",
+                       "ui/jquery.ui.widget.js",
+                       "ui/jquery.ui.menu.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html
index a3a97911ca8f2d6ecb0ca17dec6f3a21ca00290c..17ee20258e3c58e6d1fb42defb36d28dfb68b71e 100644 (file)
--- a/tests/unit/position/position.html
+++ b/tests/unit/position/position.html
@@ -8,7 +8,12 @@
        <script>
        $.uiBackCompat = false;
        </script>
-       <script src="../../../ui/jquery.ui.position.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               js: [ "ui/jquery.ui.position.js" ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/position/position_deprecated.html b/tests/unit/position/position_deprecated.html
index c80490f74f696d3e48519ace467211a1e91a7419..ee9be189dd92402c44f7df6351649035767ff886 100644 (file)
--- a/tests/unit/position/position_deprecated.html
+++ b/tests/unit/position/position_deprecated.html
@@ -5,7 +5,12 @@
        <title>jQuery UI Position Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../../ui/jquery.ui.position.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               js: [ "ui/jquery.ui.position.js" ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/progressbar/progressbar.html b/tests/unit/progressbar/progressbar.html
index b708af265102a6af6974541987444fd26faf661f..8b55f5a890eada145a0f9a5afa2029ce250363a1 100644 (file)
--- a/tests/unit/progressbar/progressbar.html
+++ b/tests/unit/progressbar/progressbar.html
@@ -4,13 +4,18 @@
        <meta charset="utf-8">
        <title>jQuery UI Progressbar Test Suite</title>
 
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.progressbar.css">
-
        <script src="../../jquery.js"></script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
-       <script src="../../../ui/jquery.ui.progressbar.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core", "ui.progressbar" ],
+               js: [
+                       "ui/jquery.ui.core.js",
+                       "ui/jquery.ui.widget.js",
+                       "ui/jquery.ui.progressbar.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/resizable/resizable.html b/tests/unit/resizable/resizable.html
index f1b2f1bc36436f5b711f7dc2b98869c7131ae8aa..4e886d2fd12f74f35cf97d4a11926f1d91f410be 100644 (file)
--- a/tests/unit/resizable/resizable.html
+++ b/tests/unit/resizable/resizable.html
@@ -4,14 +4,19 @@
        <meta charset="utf-8">
        <title>jQuery UI Resizable Test Suite</title>
 
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.resizable.css">
-
        <script src="../../jquery.js"></script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
-       <script src="../../../ui/jquery.ui.mouse.js"></script>
-       <script src="../../../ui/jquery.ui.resizable.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core", "ui.resizable" ],
+               js: [
+                       "ui/jquery.ui.core.js",
+                       "ui/jquery.ui.widget.js",
+                       "ui/jquery.ui.mouse.js",
+                       "ui/jquery.ui.resizable.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/selectable/selectable.html b/tests/unit/selectable/selectable.html
index 4d6150691cafddbc1f949f7a0b58f661e6be431b..4f70e8dd448011bf6d7f5e7a54a9cb134ea34c67 100644 (file)
--- a/tests/unit/selectable/selectable.html
+++ b/tests/unit/selectable/selectable.html
@@ -5,10 +5,18 @@
        <title>jQuery UI Selectable Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
-       <script src="../../../ui/jquery.ui.mouse.js"></script>
-       <script src="../../../ui/jquery.ui.selectable.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core", "ui.selectable" ],
+               js: [
+                       "ui/jquery.ui.core.js",
+                       "ui/jquery.ui.widget.js",
+                       "ui/jquery.ui.mouse.js",
+                       "ui/jquery.ui.selectable.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/slider/slider.html b/tests/unit/slider/slider.html
index 3fe3b35885227fa8036b959d4d913b5ae6facd77..60d124b7ab6a13fbd5e152ff1482d64037e8f3b1 100644 (file)
--- a/tests/unit/slider/slider.html
+++ b/tests/unit/slider/slider.html
@@ -4,13 +4,19 @@
        <meta charset="utf-8">
        <title>jQuery UI Slider Test Suite</title>
 
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.slider.css">
-
        <script src="../../jquery.js"></script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
-       <script src="../../../ui/jquery.ui.mouse.js"></script>
-       <script src="../../../ui/jquery.ui.slider.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core", "ui.slider" ],
+               js: [
+                       "ui/jquery.ui.core.js",
+                       "ui/jquery.ui.widget.js",
+                       "ui/jquery.ui.mouse.js",
+                       "ui/jquery.ui.slider.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/sortable/sortable.html b/tests/unit/sortable/sortable.html
index 40eed66527a6f4d07d1b1cebd065e1472185e713..a20eb7109ee3f58337da0c2121c3f41c2ee7e1f5 100644 (file)
--- a/tests/unit/sortable/sortable.html
+++ b/tests/unit/sortable/sortable.html
@@ -5,10 +5,18 @@
        <title>jQuery UI Sortable Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
-       <script src="../../../ui/jquery.ui.mouse.js"></script>
-       <script src="../../../ui/jquery.ui.sortable.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core", "ui.sortable" ],
+               js: [
+                       "ui/jquery.ui.core.js",
+                       "ui/jquery.ui.widget.js",
+                       "ui/jquery.ui.mouse.js",
+                       "ui/jquery.ui.sortable.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/spinner/spinner.html b/tests/unit/spinner/spinner.html
index 321c16b4cbf11e572aa27feee9eedb1cb44e037c..0c01a5f4848c4b617697a7dae4bb61fdfad2b691 100644 (file)
--- a/tests/unit/spinner/spinner.html
+++ b/tests/unit/spinner/spinner.html
@@ -4,16 +4,22 @@
        <meta charset="utf-8">
        <title>jQuery UI Spinner Test Suite</title>
        
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.spinner.css">
-
        <script src="../../jquery.js"></script>
        <script src="../../../external/jquery.mousewheel-3.0.4.js"></script>
        <script src="../../../external/globalize.js"></script>
        <script src="../../../external/globalize.culture.ja-JP.js"></script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
-       <script src="../../../ui/jquery.ui.button.js"></script>
-       <script src="../../../ui/jquery.ui.spinner.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core", "ui.button", "ui.spinner" ],
+               js: [
+                       "ui/jquery.ui.core.js",
+                       "ui/jquery.ui.widget.js",
+                       "ui/jquery.ui.button.js",
+                       "ui/jquery.ui.spinner.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html
index 688b2642fface53d55faeeedc50632d44f89a339..f2a672b2e4e2c81a4940531a8f7853b200eef322 100644 (file)
--- a/tests/unit/tabs/tabs.html
+++ b/tests/unit/tabs/tabs.html
@@ -4,15 +4,21 @@
        <meta charset="utf-8">
        <title>jQuery UI Tabs Test Suite</title>
 
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.tabs.css">
-
        <script src="../../jquery.js"></script>
        <script>
        $.uiBackCompat = false;
        </script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
-       <script src="../../../ui/jquery.ui.tabs.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core", "ui.tabs" ],
+               js: [
+                       "ui/jquery.ui.core.js",
+                       "ui/jquery.ui.widget.js",
+                       "ui/jquery.ui.tabs.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/tabs/tabs_deprecated.html b/tests/unit/tabs/tabs_deprecated.html
index 322cec1635c935d9070706cedc0ab4bda40dbc8d..92d9be81c928ce4f9bf4789f47bbd36560bd3bc9 100644 (file)
--- a/tests/unit/tabs/tabs_deprecated.html
+++ b/tests/unit/tabs/tabs_deprecated.html
@@ -4,13 +4,19 @@
        <meta charset="utf-8">
        <title>jQuery UI Tabs Test Suite</title>
 
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.tabs.css">
-
        <script src="../../jquery.js"></script>
        <script src="../../../external/jquery.cookie.js"></script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
-       <script src="../../../ui/jquery.ui.tabs.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core", "ui.tabs" ],
+               js: [
+                       "ui/jquery.ui.core.js",
+                       "ui/jquery.ui.widget.js",
+                       "ui/jquery.ui.tabs.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/tooltip/tooltip.html b/tests/unit/tooltip/tooltip.html
index 82070fbfd24f63eaa904bf97f575c215b58fcaee..b5e8558e5dc82dbc7dea0a7cfe8ff0a96e553c77 100644 (file)
--- a/tests/unit/tooltip/tooltip.html
+++ b/tests/unit/tooltip/tooltip.html
@@ -4,13 +4,19 @@
        <meta charset="utf-8">
        <title>jQuery UI Tooltip Test Suite</title>
 
-       <link rel="stylesheet" href="../../../themes/base/jquery.ui.tooltip.css">
-
        <script src="../../jquery.js"></script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
-       <script src="../../../ui/jquery.ui.position.js"></script>
-       <script src="../../../ui/jquery.ui.tooltip.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core", "ui.tooltip" ],
+               js: [
+                       "ui/jquery.ui.core.js",
+                       "ui/jquery.ui.widget.js",
+                       "ui/jquery.ui.position.js",
+                       "ui/jquery.ui.tooltip.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>

diff --git a/tests/unit/widget/widget.html b/tests/unit/widget/widget.html
index 7ae41f2643fe35227257b4f1f79d2dcd05915497..6f4caaa6c62375ef560226d7d1e5a42b2fb10645 100644 (file)
--- a/tests/unit/widget/widget.html
+++ b/tests/unit/widget/widget.html
@@ -5,8 +5,15 @@
        <title>jQuery UI Widget Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../../ui/jquery.ui.core.js"></script>
-       <script src="../../../ui/jquery.ui.widget.js"></script>
+       <script src="../../resource_loader.js"></script>
+       <script>
+       loadResources({
+               css: [ "ui.core" ],
+               js: [
+                       "ui/jquery.ui.widget.js"
+               ]
+       });
+       </script>
 
        <link rel="stylesheet" href="../../../external/qunit.css">
        <script src="../../../external/qunit.js"></script>