Tests: Moved loadResources to TestHelpers.

diff --git a/tests/resource_loader.js b/tests/resource_loader.js
deleted file mode 100644 (file)
index 9a03411..0000000
--- a/tests/resource_loader.js
+++ /dev/null
@@ -1,40 +0,0 @@
-(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() {
-               // TODO: proper include with theme images
-               includeStyle( "dist/jquery-ui.min.css" );
-               includeScript( "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 ec78390199bd9c03ab3477ffc337ef00967525d8..b3b7caeae4b2a0e4fdbe13238e0948ebb814155f 100644 (file)
--- a/tests/unit/accordion/accordion.html
+++ b/tests/unit/accordion/accordion.html
@@ -8,9 +8,12 @@
        <script>
        $.uiBackCompat = false;
        </script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core", "ui.accordion" ],
                js: [
                        "ui/jquery.ui.core.js",
@@ -20,11 +23,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="accordion_test_helpers.js"></script>
        <script src="accordion_common.js"></script>
        <script src="accordion_core.js"></script>

diff --git a/tests/unit/accordion/accordion_deprecated.html b/tests/unit/accordion/accordion_deprecated.html
index f3494c6fc71e49fa4e3fd1d6a2f0542c82fefd39..dfb9fa90ef8d6f5f824656e468f16a4e262f0bbe 100644 (file)
--- a/tests/unit/accordion/accordion_deprecated.html
+++ b/tests/unit/accordion/accordion_deprecated.html
@@ -5,9 +5,12 @@
        <title>jQuery UI Accordion Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core", "ui.accordion" ],
                js: [
                        "ui/jquery.ui.core.js",
@@ -17,11 +20,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="accordion_test_helpers.js"></script>
        <script src="accordion_common_deprecated.js"></script>
        <script src="accordion_core.js"></script>

diff --git a/tests/unit/autocomplete/autocomplete.html b/tests/unit/autocomplete/autocomplete.html
index 259def349648381e09c65197fce8d6074a3cea04..571c62033e01fb9c2c3ff23b72c9eafd7014fad0 100644 (file)
--- a/tests/unit/autocomplete/autocomplete.html
+++ b/tests/unit/autocomplete/autocomplete.html
@@ -5,9 +5,12 @@
        <title>jQuery UI Autocomplete Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core", "ui.menu", "ui.autocomplete" ],
                js: [
                        "ui/jquery.ui.core.js",
@@ -19,11 +22,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="autocomplete_common.js"></script>
        <script src="autocomplete_core.js"></script>
        <script src="autocomplete_events.js"></script>

diff --git a/tests/unit/button/button.html b/tests/unit/button/button.html
index 5f27740c4045c9d436a8760e3b95468ac4368f4e..b79ca1dc6a4f39d4069a06d0b417096b8942ecc9 100644 (file)
--- a/tests/unit/button/button.html
+++ b/tests/unit/button/button.html
@@ -5,9 +5,12 @@
        <title>jQuery UI Button Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core", "ui.button" ],
                js: [
                        "ui/jquery.ui.core.js",
@@ -17,11 +20,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="button_common.js"></script>
        <script src="button_core.js"></script>
        <script src="button_events.js"></script>

diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html
index 3b1dc1fc82b1a0df9ba9a06e72cf9562e9a8c517..3baf852bb424cca93caf8fd7a9ae17adf0286f71 100644 (file)
--- a/tests/unit/core/core.html
+++ b/tests/unit/core/core.html
@@ -5,17 +5,15 @@
        <title>jQuery UI Core Test Suite</title>
 
        <script src="../../jquery.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>
        <script src="../../jquery.simulate.js"></script>
        <script src="../testsuite.js"></script>
+       <script>
+       TestHelpers.loadResources({
+               js: [ "ui/jquery.ui.core.js" ]
+       });
+       </script>
 
        <script src="core.js"></script>
        <script src="selector.js"></script>

diff --git a/tests/unit/datepicker/datepicker.html b/tests/unit/datepicker/datepicker.html
index 592db53ccaf0a12d159c3a222c4fd06e2cc4e419..bfff32d32d4382e93f535393427ae5aaf942156a 100644 (file)
--- a/tests/unit/datepicker/datepicker.html
+++ b/tests/unit/datepicker/datepicker.html
@@ -5,9 +5,12 @@
        <title>jQuery UI Datepicker Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core", "ui.datepicker" ],
                js: [
                        "ui/jquery.ui.core.js",
@@ -19,11 +22,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="datepicker_core.js"></script>
        <script src="datepicker_defaults.js"></script>
        <script src="datepicker_events.js"></script>

diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html
index 1f940400cfd1615c74f255dbf51006df54421a47..d804807f2bddd7568d207a7f571f6937dc6c1b6d 100644 (file)
--- a/tests/unit/dialog/dialog.html
+++ b/tests/unit/dialog/dialog.html
@@ -6,9 +6,12 @@
 
        <script src="../../jquery.js"></script>
        <script src="../../../external/jquery.bgiframe-2.1.2.js"></script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core", "ui.dialog" ],
                js: [
                        "ui/jquery.ui.core.js",
@@ -22,11 +25,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="dialog_common.js"></script>
        <script src="dialog_core.js"></script>
        <script src="dialog_events.js"></script>

diff --git a/tests/unit/draggable/draggable.html b/tests/unit/draggable/draggable.html
index acc50effe417abf9b527afdb0b313cf0ddc630e4..09bc191c9f7058b96281e8414e4e6f8e5878ae17 100644 (file)
--- a/tests/unit/draggable/draggable.html
+++ b/tests/unit/draggable/draggable.html
@@ -5,9 +5,12 @@
        <title>jQuery UI Draggable Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core" ],
                js: [
                        "ui/jquery.ui.core.js",
@@ -18,11 +21,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="draggable_common.js"></script>
        <script src="draggable_core.js"></script>
        <script src="draggable_events.js"></script>

diff --git a/tests/unit/droppable/droppable.html b/tests/unit/droppable/droppable.html
index eb2215763597ff49f9c515b5561d954bc788dc47..49ebf6beb4b589447c399823c763d8f775323268 100644 (file)
--- a/tests/unit/droppable/droppable.html
+++ b/tests/unit/droppable/droppable.html
@@ -5,9 +5,12 @@
        <title>jQuery UI Droppable Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core" ],
                js: [
                        "ui/jquery.ui.core.js",
@@ -19,11 +22,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="droppable_common.js"></script>
        <script src="droppable_core.js"></script>
        <script src="droppable_events.js"></script>

diff --git a/tests/unit/effects/effects.html b/tests/unit/effects/effects.html
index 06023c55d7cb0ba87bfd7b85557304e4c90770db..1fd94182dd633a0fdf98664858f243d6ac0bfb90 100644 (file)
--- a/tests/unit/effects/effects.html
+++ b/tests/unit/effects/effects.html
@@ -8,9 +8,12 @@
        <script>
        $.uiBackCompat = false;
        </script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                js: [
                        "ui/jquery.effects.core.js",
                        "ui/jquery.effects.blind.js",
@@ -30,10 +33,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
        <script src="effects_core.js"></script>
        <script src="effects_scale.js"></script>
 

diff --git a/tests/unit/menu/menu.html b/tests/unit/menu/menu.html
index 54a2ecaa01179226fed841baa169d517feb68995..fca45697fbbe80cab44478a02c035d28099442f7 100644 (file)
--- a/tests/unit/menu/menu.html
+++ b/tests/unit/menu/menu.html
@@ -5,9 +5,12 @@
        <title>jQuery UI Menu Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core", "ui.menu" ],
                js: [
                        "ui/jquery.ui.core.js",
@@ -17,11 +20,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="menu_test_helpers.js"></script>
        <script src="menu_common.js"></script>
        <script src="menu_core.js"></script>

diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html
index 115adc3e9ec7208b656badc3d32fb46df2fc0be2..3ea7750d78f7f8684377e873155fbf45bc72f568 100644 (file)
--- a/tests/unit/position/position.html
+++ b/tests/unit/position/position.html
@@ -8,17 +8,15 @@
        <script>
        $.uiBackCompat = false;
        </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>
        <script src="../../jquery.simulate.js"></script>
        <script src="../testsuite.js"></script>
+       <script>
+       TestHelpers.loadResources({
+               js: [ "ui/jquery.ui.position.js" ]
+       });
+       </script>
 
        <script src="position_core.js"></script>
        <script src="position_core_within.js"></script>

diff --git a/tests/unit/position/position_deprecated.html b/tests/unit/position/position_deprecated.html
index ee9be189dd92402c44f7df6351649035767ff886..c7a9b6bcea02ea454decc72467a9c15a32d862c7 100644 (file)
--- a/tests/unit/position/position_deprecated.html
+++ b/tests/unit/position/position_deprecated.html
@@ -5,17 +5,15 @@
        <title>jQuery UI Position Test Suite</title>
 
        <script src="../../jquery.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>
        <script src="../../jquery.simulate.js"></script>
        <script src="../testsuite.js"></script>
+       <script>
+       TestHelpers.loadResources({
+               js: [ "ui/jquery.ui.position.js" ]
+       });
+       </script>
 
        <script src="position_core.js"></script>
        <script src="position_deprecated.js"></script>

diff --git a/tests/unit/progressbar/progressbar.html b/tests/unit/progressbar/progressbar.html
index f6156d0bbe6a15138da2bc0bfcfeaed537bff9df..70a4abe56c4c60ea3e292da769ab1ff6bf6b4bf0 100644 (file)
--- a/tests/unit/progressbar/progressbar.html
+++ b/tests/unit/progressbar/progressbar.html
@@ -5,9 +5,12 @@
        <title>jQuery UI Progressbar Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core", "ui.progressbar" ],
                js: [
                        "ui/jquery.ui.core.js",
@@ -17,11 +20,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="progressbar_common.js"></script>
        <script src="progressbar_core.js"></script>
        <script src="progressbar_events.js"></script>

diff --git a/tests/unit/resizable/resizable.html b/tests/unit/resizable/resizable.html
index 028087842b435119190e37625f537f35ac2992d8..9baa674938ba91c1bab33d3f3ab46647bdd8db17 100644 (file)
--- a/tests/unit/resizable/resizable.html
+++ b/tests/unit/resizable/resizable.html
@@ -5,9 +5,12 @@
        <title>jQuery UI Resizable Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core", "ui.resizable" ],
                js: [
                        "ui/jquery.ui.core.js",
@@ -18,11 +21,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="resizable_common.js"></script>
        <script src="resizable_core.js"></script>
        <script src="resizable_events.js"></script>

diff --git a/tests/unit/selectable/selectable.html b/tests/unit/selectable/selectable.html
index af4e6d20eb06e2cdc1f473c4da6451fd4c3ce313..7b0ca6ffe7c97ef9d274e9028cb565284b4785ab 100644 (file)
--- a/tests/unit/selectable/selectable.html
+++ b/tests/unit/selectable/selectable.html
@@ -5,9 +5,12 @@
        <title>jQuery UI Selectable Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core", "ui.selectable" ],
                js: [
                        "ui/jquery.ui.core.js",
@@ -18,11 +21,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="selectable_common.js"></script>
        <script src="selectable_core.js"></script>
        <script src="selectable_events.js"></script>

diff --git a/tests/unit/slider/slider.html b/tests/unit/slider/slider.html
index a63196219dbf42995043125df6fde1d4fcc8d6ee..3aec78b4b907c909a8572b49ba309a17281d0b44 100644 (file)
--- a/tests/unit/slider/slider.html
+++ b/tests/unit/slider/slider.html
@@ -5,9 +5,12 @@
        <title>jQuery UI Slider Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core", "ui.slider" ],
                js: [
                        "ui/jquery.ui.core.js",
@@ -18,11 +21,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="slider_common.js"></script>
        <script src="slider_core.js"></script>
        <script src="slider_events.js"></script>

diff --git a/tests/unit/sortable/sortable.html b/tests/unit/sortable/sortable.html
index 4ed4f92ce681848e60821ba7cd8278b501ed7e13..c84c62197925300c80eb645f461e8841c622bc00 100644 (file)
--- a/tests/unit/sortable/sortable.html
+++ b/tests/unit/sortable/sortable.html
@@ -5,9 +5,12 @@
        <title>jQuery UI Sortable Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core", "ui.sortable" ],
                js: [
                        "ui/jquery.ui.core.js",
@@ -18,11 +21,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="sortable_common.js"></script>
        <script src="sortable_core.js"></script>
        <script src="sortable_events.js"></script>

diff --git a/tests/unit/spinner/spinner.html b/tests/unit/spinner/spinner.html
index e495abe1b912a42cce9f1d2c64470cd77bfb2e01..b7f4a532ab8ee59c486c4e3afd31c1fd638bc985 100644 (file)
--- a/tests/unit/spinner/spinner.html
+++ b/tests/unit/spinner/spinner.html
@@ -8,9 +8,12 @@
        <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="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core", "ui.button", "ui.spinner" ],
                js: [
                        "ui/jquery.ui.core.js",
@@ -21,11 +24,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="spinner_test_helpers.js"></script>
        <script src="spinner_common.js"></script>
        <script src="spinner_core.js"></script>

diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html
index a79d30e0ec500f20233091481bb0db71d43abc9d..fc7bfeedf0dde7ca146eb410525d6d25cf383225 100644 (file)
--- a/tests/unit/tabs/tabs.html
+++ b/tests/unit/tabs/tabs.html
@@ -8,9 +8,12 @@
        <script>
        $.uiBackCompat = false;
        </script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core", "ui.tabs" ],
                js: [
                        "ui/jquery.ui.core.js",
@@ -20,11 +23,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="tabs_test_helpers.js"></script>
        <script src="tabs_common.js"></script>
        <script src="tabs_core.js"></script>

diff --git a/tests/unit/tabs/tabs_deprecated.html b/tests/unit/tabs/tabs_deprecated.html
index 9bb8e413e476c83132768f04696f5c537eb36353..0c7611c9dd555328191e5b05b767371f636376d5 100644 (file)
--- a/tests/unit/tabs/tabs_deprecated.html
+++ b/tests/unit/tabs/tabs_deprecated.html
@@ -6,9 +6,12 @@
 
        <script src="../../jquery.js"></script>
        <script src="../../../external/jquery.cookie.js"></script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core", "ui.tabs" ],
                js: [
                        "ui/jquery.ui.core.js",
@@ -18,11 +21,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="tabs_test_helpers.js"></script>
        <script src="tabs_common_deprecated.js"></script>
        <script src="tabs_core.js"></script>

diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js
index 70d035684399d09a53766baa80c3b7a1b488ba7b..6720000f1149a68e3f5e1e1f29e7da847290d78c 100644 (file)
--- a/tests/unit/testsuite.js
+++ b/tests/unit/testsuite.js
@@ -2,12 +2,35 @@
 
 window.TestHelpers = {};
 
+function includeStyle( url ) {
+       document.write( "<link rel='stylesheet' href='../../../" + url + "'>" );
+}
+
+function includeScript( url ) {
+       document.write( "<script src='../../../" + url + "'></script>" );
+}
+
+TestHelpers.loadResources = QUnit.urlParams.min ?
+       function() {
+               // TODO: proper include with theme images
+               includeStyle( "dist/jquery-ui.min.css" );
+               includeScript( "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 );
+               });
+       };
+
 function testJshint( widget ) {
        if ( QUnit.urlParams.nojshint ) {
                return;
        }
 
-       document.write( "<script src='../../../external/jshint.js'></script>" );
+       includeScript( "external/jshint.js" );
        asyncTest( "JSHint", function() {
                expect( 1 );
 
@@ -58,17 +81,15 @@ function testWidgetDefaults( widget, defaults ) {
        });
 }
 
-var privateMethods = [
-       "_createWidget",
-       "destroy",
-       "option",
-       "_trigger"
-];
-
 function testWidgetOverrides( widget ) {
        if ( $.uiBackCompat === false ) {
                test( "$.widget overrides", function() {
-                       $.each( privateMethods, function( i, method ) {
+                       $.each([
+                               "_createWidget",
+                               "destroy",
+                               "option",
+                               "_trigger"
+                       ], function( i, method ) {
                                strictEqual( $.ui[ widget ].prototype[ method ],
                                        $.Widget.prototype[ method ], "should not override " + method );
                        });

diff --git a/tests/unit/tooltip/tooltip.html b/tests/unit/tooltip/tooltip.html
index d1f54d544833702a7a3cbd3c2e82e0a2a805ec44..d20ba857889cdd0cf7df2a96d24d27dd6000dcd8 100644 (file)
--- a/tests/unit/tooltip/tooltip.html
+++ b/tests/unit/tooltip/tooltip.html
@@ -5,9 +5,12 @@
        <title>jQuery UI Tooltip Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core", "ui.tooltip" ],
                js: [
                        "ui/jquery.ui.core.js",
@@ -18,11 +21,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="tooltip_common.js"></script>
        <script src="tooltip_core.js"></script>
        <script src="tooltip_events.js"></script>

diff --git a/tests/unit/widget/widget.html b/tests/unit/widget/widget.html
index 6f4caaa6c62375ef560226d7d1e5a42b2fb10645..15eaee6aa23c33610eea459f02d1d6cd06c1f613 100644 (file)
--- a/tests/unit/widget/widget.html
+++ b/tests/unit/widget/widget.html
@@ -5,9 +5,12 @@
        <title>jQuery UI Widget Test Suite</title>
 
        <script src="../../jquery.js"></script>
-       <script src="../../resource_loader.js"></script>
+       <link rel="stylesheet" href="../../../external/qunit.css">
+       <script src="../../../external/qunit.js"></script>
+       <script src="../../jquery.simulate.js"></script>
+       <script src="../testsuite.js"></script>
        <script>
-       loadResources({
+       TestHelpers.loadResources({
                css: [ "ui.core" ],
                js: [
                        "ui/jquery.ui.widget.js"
@@ -15,11 +18,6 @@
        });
        </script>
 
-       <link rel="stylesheet" href="../../../external/qunit.css">
-       <script src="../../../external/qunit.js"></script>
-       <script src="../../jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-
        <script src="widget_core.js"></script>
        <script src="widget_extend.js"></script>
        <script src="widget_animation.js"></script>