Fix asyncTests when using an AMD loader.

Former-commit-id: 2a1aa132c9a941205cf495f737f8f9ea2fdc574f
This commit is contained in:
John-David Dalton
2013-07-13 20:22:32 -07:00
parent 8694364aa3
commit 740981376d
4 changed files with 428 additions and 236 deletions

View File

@@ -104,39 +104,42 @@
}
if (!window.require) {
init(_);
} else {
QUnit.config.autostart = false;
// load Lo-Dash as a module
require((function() {
var reModularize = /modularize/;
var baseUrl = reModularize.test(ui.urlParams.build)
? '../modularize/'
: '';
var modulePath = reModularize.test(ui.urlParams.build)
? 'lodash'
: ui.buildPath.replace(/\.js$/, '');
return {
'baseUrl': baseUrl,
'urlArgs': 't=' + (+new Date),
'paths': {
'lodash': modulePath
}
};
}()),
['lodash'], function(lodash) {
init(lodash);
require([
'../vendor/underscore/test/collections.js',
'../vendor/underscore/test/arrays.js',
'../vendor/underscore/test/functions.js',
'../vendor/underscore/test/objects.js',
'../vendor/underscore/test/utility.js'
], function() {
QUnit.start();
});
});
}
// load Lo-Dash as a module
window.require && require(
(function() {
var reModularize = /modularize/;
var baseUrl = reModularize.test(ui.urlParams.build)
? '../modularize/'
: '';
var modulePath = reModularize.test(ui.urlParams.build)
? 'lodash'
: ui.buildPath.replace(/\.js$/, '');
return {
'baseUrl': baseUrl,
'urlArgs': 't=' + (+new Date),
'paths': {
'lodash': modulePath
}
};
}()),
['lodash'], function(lodash) {
init(lodash);
require([
'../vendor/underscore/test/collections.js',
'../vendor/underscore/test/arrays.js',
'../vendor/underscore/test/functions.js',
'../vendor/underscore/test/objects.js',
'../vendor/underscore/test/utility.js',
'../vendor/underscore/test/utility.js'
]);
});
</script>
<script type="text/html" id="template">
<%