diff --git a/test/wiredep_test.js b/test/wiredep_test.js index 120b7a0..d723a9b 100644 --- a/test/wiredep_test.js +++ b/test/wiredep_test.js @@ -6,33 +6,9 @@ var fs = require('fs-extra'); var path = require('path'); var assert = require('chai').assert; -var wiredep; - -require.uncache = function (moduleName) { - var mod = require.resolve(moduleName); - if (mod && ((mod = require.cache[mod]) !== undefined)) { - (function run(mod) { - mod.children.forEach(function (child) { - run(child); - }); - delete require.cache[mod.id]; - })(mod); - } - - Object.keys(module.constructor._pathCache).forEach(function(cacheKey) { - if (cacheKey.indexOf(moduleName)>0) { - delete module.constructor._pathCache[cacheKey]; - } - }); -}; +var wiredep = require('../wiredep'); describe('wiredep', function () { - beforeEach(function () { - wiredep = require('../wiredep'); - }) - afterEach(function () { - require.uncache('../wiredep'); - }) before(function() { fs.copySync('test/fixture', '.tmp'); process.chdir('.tmp'); diff --git a/wiredep.js b/wiredep.js index c5f1e3e..68b2aca 100644 --- a/wiredep.js +++ b/wiredep.js @@ -82,7 +82,7 @@ function wiredep(opts) { } function mergeFileTypesWithDefaults(optsFileTypes) { - var fileTypes = $._.clone(fileTypesDefault, true); + var fileTypes = $._.cloneDeep(fileTypesDefault); $._(optsFileTypes).each(function (fileTypeConfig, fileType) { // fallback to the default type for all html-like extensions (php, twig, hbs, etc)