Allow unit tests to run when testing custom builds without noConflict.

Former-commit-id: 2aee7eb872144583df1f22743f5d3f7102d14eae
This commit is contained in:
John-David Dalton
2012-09-05 07:12:35 -07:00
parent 13abbb81af
commit 3939fcf6e7

View File

@@ -58,12 +58,14 @@
}
},
['lodash', 'underscore'], function(lodash, underscore) {
lodashModule = lodash.noConflict();
lodashModule.moduleName = 'lodash';
underscoreModule = underscore.noConflict();
underscoreModule.moduleName = 'underscore';
if (lodash.noConflict) {
lodashModule = lodash.noConflict();
lodashModule.moduleName = 'lodash';
}
if (underscore.noConflict) {
underscoreModule = underscore.noConflict();
underscoreModule.moduleName = 'underscore';
}
require(['test.js']);
});