Merge pull request #6600 from ErisDS/config-fix

Always override database config + exit tests on error

core/server/config/index.js

@@ -104,6 +104,12 @@ ConfigManager.prototype.set = function (config) {
     // local copy with properties that have been explicitly set.
     _.merge(this._config, config);
 
+    // Special case for the database config, which should be overridden not merged
+
+    if (config && config.database) {
+        this._config.database = config.database;
+    }
+
     // Special case for the them.navigation JSON object, which should be overridden not merged
     if (config && config.theme && config.theme.navigation) {
         this._config.theme.navigation = config.theme.navigation;

core/test/functional/routes/admin_spec.js

@@ -49,6 +49,7 @@ describe('Admin Routing', function () {
         }).catch(function (e) {
             console.log('Ghost Error: ', e);
             console.log(e.stack);
+            done(e);
         });
     });
 

core/test/functional/routes/channel_spec.js

@@ -36,6 +36,7 @@ describe('Channel Routes', function () {
         }).catch(function (e) {
             console.log('Ghost Error: ', e);
             console.log(e.stack);
+            done(e);
         });
     });
 

core/test/functional/routes/frontend_spec.js

@@ -46,6 +46,7 @@ describe('Frontend Routing', function () {
         }).catch(function (e) {
             console.log('Ghost Error: ', e);
             console.log(e.stack);
+            done(e);
         });
     });