Properly handle case of config files with the same filename in differ…

…ent directories. Refs #3846
balderdashy · Oct 10, 2016 · 8e3774b · 8e3774b
1 parent ba85568
commit 8e3774b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/lib/hooks/moduleloader/index.js b/lib/hooks/moduleloader/index.js
@@ -249,6 +249,7 @@ module.exports = function(sails) {
             excludeDirs: /(locales|env)$/,
             filter    : new RegExp('(.+)\\.(' + sails.config.moduleloader.configExt.join('|') + ')$'),
             flatten   : true,
+            keepDirectoryPath: true,
             identity  : false
           }, cb);
         },
@@ -272,6 +273,7 @@ module.exports = function(sails) {
             filter    : new RegExp('(.+)\\.(' + sails.config.moduleloader.configExt.join('|') + ')$'),
             optional  : true,
             flatten   : true,
+            keepDirectoryPath: true,
             identity  : false
           }, cb);
         }],
@@ -287,6 +289,7 @@ module.exports = function(sails) {
             filter    : new RegExp('^' + env + '\\.(' + sails.config.moduleloader.configExt.join('|') + ')$'),
             optional  : true,
             flatten   : true,
+            keepDirectoryPath: true,
             identity  : false
           }, cb);
         }]

diff --git a/test/integration/hook.userconfig.test.js b/test/integration/hook.userconfig.test.js
@@ -22,7 +22,8 @@ describe('hooks :: ', function() {
       appHelper.teardown();
       async.series([
         function(cb) {fs.outputFile(path.resolve(__dirname,'../../testApp/config/abc.js'), 'module.exports = {"foo":"goo"};', cb);},
-        function(cb) {fs.outputFile(path.resolve(__dirname,'../../testApp/config/foo/bar.js'), 'module.exports = {"foo":"bar", "abc":123};', cb);},
+        function(cb) {fs.outputFile(path.resolve(__dirname,'../../testApp/config/foo/bar.js'), 'module.exports = {"foo":"bar", "abc":123, "betty": "boop"};', cb);},
+        function(cb) {fs.outputFile(path.resolve(__dirname,'../../testApp/config/lara/bar.js'), 'module.exports = {"horse":"neigh", "pig": "oink", "betty": "spaghetti"};', cb);},
         function(cb) {fs.outputFile(path.resolve(__dirname,'../../testApp/config/env/development.js'), 'module.exports = {"cat":"meow"};', cb);},
         function(cb) {fs.outputFile(path.resolve(__dirname,'../../testApp/config/env/development/config.js'), 'module.exports = {"owl":"hoot"};', cb);},
         function(cb) {fs.outputFile(path.resolve(__dirname,'../../testApp/config/env/test-development.js'), 'module.exports = {"duck":"quack"};', cb);},
@@ -44,6 +45,9 @@ describe('hooks :: ', function() {
           if (err) { return callback(err); }
           assert.equal(sails.config.foo, 'bar');
           assert.equal(sails.config.abc, 123);
+          assert.equal(sails.config.horse, 'neigh');
+          assert.equal(sails.config.pig, 'oink');
+          assert.equal(sails.config.betty, 'spaghetti');
           assert.equal(typeof(sails.config.bar), 'undefined');
           return done();
         });
@@ -61,7 +65,7 @@ describe('hooks :: ', function() {
       var sails;
       before(function(done) {
         sails = Sails();
-        sails.load({hooks:{grunt:false}, dontFlattenConfig: true}, done);
+        sails.load({hooks:{grunt:false}}, done);
       });
 
       it('should load config from config/env/development.js', function() {
@@ -91,7 +95,7 @@ describe('hooks :: ', function() {
       var sails;
       before(function(done) {
         sails = Sails();
-        sails.load({hooks:{grunt:false}, dontFlattenConfig: true, environment: 'test-development'}, done);
+        sails.load({hooks:{grunt:false}, environment: 'test-development'}, done);
       });
 
       it('should load config from config/env/test-development.js', function() {