mirror of
https://github.com/whoisclebs/lodash.git
synced 2026-02-12 11:57:49 +00:00
Allow unit tests to run when testing custom builds without noConflict.
Former-commit-id: 2aee7eb872144583df1f22743f5d3f7102d14eae
This commit is contained in:
@@ -58,12 +58,14 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
['lodash', 'underscore'], function(lodash, underscore) {
|
['lodash', 'underscore'], function(lodash, underscore) {
|
||||||
lodashModule = lodash.noConflict();
|
if (lodash.noConflict) {
|
||||||
lodashModule.moduleName = 'lodash';
|
lodashModule = lodash.noConflict();
|
||||||
|
lodashModule.moduleName = 'lodash';
|
||||||
underscoreModule = underscore.noConflict();
|
}
|
||||||
underscoreModule.moduleName = 'underscore';
|
if (underscore.noConflict) {
|
||||||
|
underscoreModule = underscore.noConflict();
|
||||||
|
underscoreModule.moduleName = 'underscore';
|
||||||
|
}
|
||||||
require(['test.js']);
|
require(['test.js']);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user