Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-02 08:07:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make tests work with es6 transpiled code.

Browse Source
This commit is contained in:
John-David Dalton
2014-06-15 16:18:07 -07:00
parent 5d3a9d817a
commit e152f54903
5 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/index.html
View File

@@ -258,6 +258,15 @@
function loadModulesAndTests() {
require(getConfig(), ['lodash', 'shimmed', 'underscore'], function(lodash, shimmed, underscore) {
ui.isStrict || (ui.isStrict = 'default' in lodash);
lodash = lodash['default'] || lodash;
lodashModule = lodash;
lodashModule.moduleName = 'lodash';
shimmed = shimmed && (shimmed['default'] || shimmmed);
underscore = underscore && (underscore['default'] || underscore);
if (shimmed && shimmed.noConflict) {
shimmedModule = shimmed.noConflict();
shimmedModule.moduleName = 'shimmed';
@@ -266,16 +275,12 @@
underscoreModule = underscore.noConflict();
underscoreModule.moduleName = 'underscore';
}
if (lodash) {
lodashModule = lodash;
lodashModule.moduleName = 'lodash';
}
if (ui.isModularize) {
window._ = lodash;
}
if (ui.isModularize) {
require(getConfig(), ['lodash/internals/baseEach'], function(baseEach) {
lodash._baseEach = baseEach;
lodash._baseEach = baseEach['default'] || baseEach;
loadTests();
});
} else {
@@ -289,7 +294,7 @@
if (window.requirejs) {
addBizarroMethods();
require(getConfig(), ['lodash'], function(lodash) {
lodashBizarro = lodash.noConflict();
lodashBizarro = (lodash['default'] || lodash).noConflict();
delete requirejs.s.contexts._;
removeBizarroMethods();