Ensure mixinPrereqs is called before Backbone is loaded.

This commit is contained in:
John-David Dalton
2016-01-15 23:36:56 -08:00
parent 6ecc675670
commit 0edbd96bb5

View File

@@ -145,24 +145,22 @@
QUnit.config.autostart = false; QUnit.config.autostart = false;
require(getConfig(), ['underscore', 'backbone'], function(lodash) { require(getConfig(), ['underscore'], function(lodash) {
mixinPrereqs(lodash); mixinPrereqs(lodash);
require(getConfig(), ['backbone'], function() {
if (ui.isModularize) { require(getConfig(), [
window._ = lodash; 'test/setup/dom-setup',
} 'test/setup/environment',
require(getConfig(), [ 'test/noconflict',
'test/setup/dom-setup', 'test/events',
'test/setup/environment', 'test/model',
'test/noconflict', 'test/collection',
'test/events', 'test/router',
'test/model', 'test/view',
'test/collection', 'test/sync'
'test/router', ], function() {
'test/view', QUnit.start();
'test/sync' });
], function() {
QUnit.start();
}); });
}); });
}()); }());