Tests: Fix AMD loading in IE8

It appears that we must load require.js via a standard script tag in order
for it to work properly in IE8.
This commit is contained in:
Scott González 2015-04-17 12:13:38 -04:00
parent 45797b9b41
commit 6231b161b9
27 changed files with 44 additions and 25 deletions

View File

@ -239,7 +239,8 @@ grunt.initConfig({
"ui/*.js", "ui/*.js",
"Gruntfile.js", "Gruntfile.js",
"build/**/*.js", "build/**/*.js",
"tests/unit/**/*.js" "tests/unit/**/*.js",
"tests/lib/**/*.js"
] ]
}, },
csslint: { csslint: {

View File

@ -6,7 +6,6 @@
"expr": true, "expr": true,
"immed": true, "immed": true,
"noarg": true, "noarg": true,
"onevar": true,
"quotmark": "double", "quotmark": "double",
"smarttabs": true, "smarttabs": true,
"trailing": true, "trailing": true,
@ -31,6 +30,8 @@
"notStrictEqual": false, "notStrictEqual": false,
"ok": false, "ok": false,
"QUnit": true, "QUnit": true,
"require": true,
"requirejs": true,
"start": false, "start": false,
"strictEqual": false, "strictEqual": false,
"stop": false, "stop": false,

View File

@ -1,6 +1,6 @@
( function() { ( function() {
window.requirejs = { requirejs.config({
paths: { paths: {
"globalize": "../../../external/globalize/globalize", "globalize": "../../../external/globalize/globalize",
"globalize/ja-JP": "../../../external/globalize/globalize.culture.ja-JP", "globalize/ja-JP": "../../../external/globalize/globalize.culture.ja-JP",
@ -20,7 +20,19 @@ window.requirejs = {
"qunit-assert-classes": [ "qunit" ], "qunit-assert-classes": [ "qunit" ],
"qunit-assert-close": [ "qunit" ] "qunit-assert-close": [ "qunit" ]
} }
}; });
// Create a module that disables back compat for UI modules
define( "jquery-no-back-compat", [ "jquery" ], function( $ ) {
$.uiBackCompat = false;
return $;
} );
// Create a dummy bridge if we're not actually testing in PhantomJS
if ( !/PhantomJS/.test( navigator.userAgent ) ) {
define( "phantom-bridge", function() {} );
}
// Load all modules in series // Load all modules in series
function requireModules( dependencies, callback, modules ) { function requireModules( dependencies, callback, modules ) {
@ -83,7 +95,7 @@ function jqueryUrl() {
} }
return url; return url;
}; }
function swarmInject() { function swarmInject() {
var url = parseUrl().swarmURL; var url = parseUrl().swarmURL;
@ -134,26 +146,7 @@ function swarmInject() {
} }
} }
// Load requirejs, then load the tests
script = document.createElement( "script" );
script.src = "../../../external/requirejs/require.js";
script.onload = function() {
// Create a module that disables back compat for UI modules
define( "jquery-no-back-compat", [ "jquery" ], function( $ ) {
$.uiBackCompat = false;
return $;
} );
// Create a dummy bridge if we're not actually testing in PhantomJS
if ( !/PhantomJS/.test( navigator.userAgent ) ) {
define( "phantom-bridge", function() {} );
}
requireTests( modules, noBackCompat ); requireTests( modules, noBackCompat );
};
document.documentElement.appendChild( script );
} )(); } )();
} )(); } )();

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Accordion Test Suite</title> <title>jQuery UI Accordion Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core accordion"></script> <script src="../../lib/css.js" data-modules="core accordion"></script>
<script src="../../lib/bootstrap.js" data-widget="accordion"></script> <script src="../../lib/bootstrap.js" data-widget="accordion"></script>
<style> <style>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Autocomplete Test Suite</title> <title>jQuery UI Autocomplete Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core menu autocomplete"></script> <script src="../../lib/css.js" data-modules="core menu autocomplete"></script>
<script src="../../lib/bootstrap.js" data-widget="autocomplete"></script> <script src="../../lib/bootstrap.js" data-widget="autocomplete"></script>
</head> </head>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Button Test Suite</title> <title>jQuery UI Button Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core button"></script> <script src="../../lib/css.js" data-modules="core button"></script>
<script src="../../lib/bootstrap.js" data-widget="button"></script> <script src="../../lib/bootstrap.js" data-widget="button"></script>
</head> </head>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Core Test Suite</title> <title>jQuery UI Core Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js"></script> <script src="../../lib/css.js"></script>
<script src="../../lib/bootstrap.js" data-modules="core selector"></script> <script src="../../lib/bootstrap.js" data-modules="core selector"></script>
<style> <style>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Datepicker Test Suite</title> <title>jQuery UI Datepicker Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core datepicker"></script> <script src="../../lib/css.js" data-modules="core datepicker"></script>
<script src="../../lib/bootstrap.js" data-widget="datepicker"></script> <script src="../../lib/bootstrap.js" data-widget="datepicker"></script>
</head> </head>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Dialog Test Suite</title> <title>jQuery UI Dialog Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core button dialog"></script> <script src="../../lib/css.js" data-modules="core button dialog"></script>
<script src="../../lib/bootstrap.js" data-widget="dialog" data-deprecated="true"></script> <script src="../../lib/bootstrap.js" data-widget="dialog" data-deprecated="true"></script>
</head> </head>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Dialog Test Suite</title> <title>jQuery UI Dialog Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core button dialog"></script> <script src="../../lib/css.js" data-modules="core button dialog"></script>
<script src="../../lib/bootstrap.js" data-widget="dialog" data-no-back-compat="true"></script> <script src="../../lib/bootstrap.js" data-widget="dialog" data-no-back-compat="true"></script>
</head> </head>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Draggable Test Suite</title> <title>jQuery UI Draggable Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core"></script> <script src="../../lib/css.js" data-modules="core"></script>
<script src="../../lib/bootstrap.js" data-widget="draggable"></script> <script src="../../lib/bootstrap.js" data-widget="draggable"></script>
<style> <style>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Droppable Test Suite</title> <title>jQuery UI Droppable Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core"></script> <script src="../../lib/css.js" data-modules="core"></script>
<script src="../../lib/bootstrap.js" data-widget="droppable" data-deprecated="true"></script> <script src="../../lib/bootstrap.js" data-widget="droppable" data-deprecated="true"></script>
</head> </head>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Droppable Test Suite</title> <title>jQuery UI Droppable Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core"></script> <script src="../../lib/css.js" data-modules="core"></script>
<script src="../../lib/bootstrap.js" data-widget="droppable" <script src="../../lib/bootstrap.js" data-widget="droppable"
data-no-back-compat="true"></script> data-no-back-compat="true"></script>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Effects Test Suite</title> <title>jQuery UI Effects Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js"></script> <script src="../../lib/css.js"></script>
<script src="../../lib/bootstrap.js" data-modules="core scale"> <script src="../../lib/bootstrap.js" data-modules="core scale">
</script> </script>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Menu Test Suite</title> <title>jQuery UI Menu Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core menu"></script> <script src="../../lib/css.js" data-modules="core menu"></script>
<script src="../../lib/bootstrap.js" data-widget="menu"></script> <script src="../../lib/bootstrap.js" data-widget="menu"></script>
<style> <style>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Position Test Suite</title> <title>jQuery UI Position Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js"></script> <script src="../../lib/css.js"></script>
<script src="../../lib/bootstrap.js" data-modules="core"></script> <script src="../../lib/bootstrap.js" data-modules="core"></script>
</head> </head>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Progressbar Test Suite</title> <title>jQuery UI Progressbar Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core progressbar"></script> <script src="../../lib/css.js" data-modules="core progressbar"></script>
<script src="../../lib/bootstrap.js" data-widget="progressbar"></script> <script src="../../lib/bootstrap.js" data-widget="progressbar"></script>
</head> </head>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Resizable Test Suite</title> <title>jQuery UI Resizable Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core resizable"></script> <script src="../../lib/css.js" data-modules="core resizable"></script>
<script src="../../lib/bootstrap.js" data-widget="resizable"></script> <script src="../../lib/bootstrap.js" data-widget="resizable"></script>
<style> <style>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Selectable Test Suite</title> <title>jQuery UI Selectable Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core selectable"></script> <script src="../../lib/css.js" data-modules="core selectable"></script>
<script src="../../lib/bootstrap.js" data-widget="selectable"></script> <script src="../../lib/bootstrap.js" data-widget="selectable"></script>
</head> </head>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Selectmenu Test Suite</title> <title>jQuery UI Selectmenu Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core menu selectmenu"></script> <script src="../../lib/css.js" data-modules="core menu selectmenu"></script>
<script src="../../lib/bootstrap.js" data-widget="selectmenu"></script> <script src="../../lib/bootstrap.js" data-widget="selectmenu"></script>
</head> </head>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Slider Test Suite</title> <title>jQuery UI Slider Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core slider"></script> <script src="../../lib/css.js" data-modules="core slider"></script>
<script src="../../lib/bootstrap.js" data-widget="slider"></script> <script src="../../lib/bootstrap.js" data-widget="slider"></script>
</head> </head>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Sortable Test Suite</title> <title>jQuery UI Sortable Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core"></script> <script src="../../lib/css.js" data-modules="core"></script>
<script src="../../lib/bootstrap.js" data-widget="sortable"></script> <script src="../../lib/bootstrap.js" data-widget="sortable"></script>
<style> <style>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Spinner Test Suite</title> <title>jQuery UI Spinner Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core button spinner"></script> <script src="../../lib/css.js" data-modules="core button spinner"></script>
<script src="../../lib/bootstrap.js" data-widget="spinner"></script> <script src="../../lib/bootstrap.js" data-widget="spinner"></script>
</head> </head>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Tabs Test Suite</title> <title>jQuery UI Tabs Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core tabs"></script> <script src="../../lib/css.js" data-modules="core tabs"></script>
<script src="../../lib/bootstrap.js" data-widget="tabs"></script> <script src="../../lib/bootstrap.js" data-widget="tabs"></script>
<style> <style>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Tooltip Test Suite</title> <title>jQuery UI Tooltip Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core tooltip"></script> <script src="../../lib/css.js" data-modules="core tooltip"></script>
<script src="../../lib/bootstrap.js" data-widget="tooltip" data-deprecated="true"></script> <script src="../../lib/bootstrap.js" data-widget="tooltip" data-deprecated="true"></script>
</head> </head>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Tooltip Test Suite</title> <title>jQuery UI Tooltip Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core tooltip"></script> <script src="../../lib/css.js" data-modules="core tooltip"></script>
<script src="../../lib/bootstrap.js" data-widget="tooltip" data-no-back-compat="true"></script> <script src="../../lib/bootstrap.js" data-widget="tooltip" data-no-back-compat="true"></script>
</head> </head>

View File

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>jQuery UI Widget Test Suite</title> <title>jQuery UI Widget Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core"></script> <script src="../../lib/css.js" data-modules="core"></script>
<script src="../../lib/bootstrap.js" data-modules="core extend animation classes"> <script src="../../lib/bootstrap.js" data-modules="core extend animation classes">
</script> </script>