Merge pull request #322 from kgoerlitz/master

Fix #321 - TypeError: Property description must be an object: undefined

lib/config.js

@@ -1417,7 +1417,10 @@ util.extendDeep = function(mergeInto) {
 
       // Copy property descriptor otherwise, preserving accessors
       else {
-        Object.defineProperty(mergeInto, prop, Object.getOwnPropertyDescriptor(Object(mergeFrom), prop));
+        var descriptor = Object.getOwnPropertyDescriptor(Object(mergeFrom), prop);
+        if (descriptor) {
+          Object.defineProperty(mergeInto, prop, descriptor);
+        }
       }
     }
   });

test/8-config-extending.js

@@ -0,0 +1,46 @@
+
+// Dependencies
+var vows = require('vows'),
+    assert = require('assert'),
+        path = require('path');
+
+// Change the configuration directory for testing
+process.env.NODE_CONFIG_DIR = __dirname + '/8-config';
+
+// Hardcode $NODE_ENV=test for testing
+delete process.env.NODE_ENV;
+
+// Test for multi-instance applications
+delete process.env.NODE_APP_INSTANCE;
+
+process.env.NODE_CONFIG_STRICT_MODE = false;
+
+var CONFIG = requireUncached('../lib/config');
+
+
+vows.describe('Tests for config extending')
+.addBatch({
+    'Extending a base configuration with another configuration': {
+        'Extending a configuration with another configuration should work without error': function () {
+
+            process.env.NODE_CONFIG_DIR = __dirname + '/8-config';
+            var base_config = require(process.env.NODE_CONFIG_DIR + path.sep + 'base-config.json');
+            CONFIG.util.attachProtoDeep(base_config);
+
+            assert.doesNotThrow(function () {
+                result = CONFIG.util.extendDeep(base_config, CONFIG);
+            }, 'Extending a configuration with another configuration has an error');
+
+        }
+    }
+})
+.export(module);
+
+//
+// Because require'ing config creates and caches a global singleton,
+// We have to invalidate the cache to build new object based on the environment variables above
+function requireUncached(module) {
+    delete require.cache[require.resolve(module)];
+    return require(module);
+}
+

test/8-config/base-config.json

@@ -0,0 +1,4 @@
+{
+    "testValue": "base configuration value",
+    "anotherValue": "Another value" 
+}

test/8-config/default.json

@@ -0,0 +1,3 @@
+{
+    "testValue": "override configuration value"
+}