From 0edbd96bb582c155edd19d75e658f136fd28cbfa Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Fri, 15 Jan 2016 23:36:56 -0800 Subject: [PATCH] Ensure `mixinPrereqs` is called before Backbone is loaded. --- test/backbone.html | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/test/backbone.html b/test/backbone.html index d41900edb..78682abdb 100644 --- a/test/backbone.html +++ b/test/backbone.html @@ -145,24 +145,22 @@ QUnit.config.autostart = false; - require(getConfig(), ['underscore', 'backbone'], function(lodash) { + require(getConfig(), ['underscore'], function(lodash) { mixinPrereqs(lodash); - - if (ui.isModularize) { - window._ = lodash; - } - require(getConfig(), [ - 'test/setup/dom-setup', - 'test/setup/environment', - 'test/noconflict', - 'test/events', - 'test/model', - 'test/collection', - 'test/router', - 'test/view', - 'test/sync' - ], function() { - QUnit.start(); + require(getConfig(), ['backbone'], function() { + require(getConfig(), [ + 'test/setup/dom-setup', + 'test/setup/environment', + 'test/noconflict', + 'test/events', + 'test/model', + 'test/collection', + 'test/router', + 'test/view', + 'test/sync' + ], function() { + QUnit.start(); + }); }); }); }());