From f10b4394dc07188f1f6c43552af608bead4a389d Mon Sep 17 00:00:00 2001
From: Hannah Wolfe <erisds@gmail.com>
Date: Wed, 29 Apr 2020 18:52:59 +0100
Subject: [PATCH] Updated new local config to not affect tests

- if you have local config, e.g. a subdirectory in your URL, this would affect the tests
- tests should always only use test config
---
 core/server/config/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/server/config/index.js b/core/server/config/index.js
index 1e8b2e62a7..57119134fa 100644
--- a/core/server/config/index.js
+++ b/core/server/config/index.js
@@ -33,7 +33,9 @@ _private.loadNconf = function loadNconf(options) {
     });
 
     nconf.file('custom-env', path.join(customConfigPath, 'config.' + env + '.json'));
-    nconf.file('local-env', path.join(customConfigPath, 'config.local.json'));
+    if (env !== 'testing') {
+        nconf.file('local-env', path.join(customConfigPath, 'config.local.json'));
+    }
     nconf.file('default-env', path.join(baseConfigPath, 'env', 'config.' + env + '.json'));
     nconf.file('defaults', path.join(baseConfigPath, 'defaults.json'));