Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-06 22:40:14 -05:00
Code Issues Activity

Updated new local config to not affect tests

Browse source 
- if you have local config, e.g. a subdirectory in your URL, this would affect the tests
- tests should always only use test config
This commit is contained in:
Hannah Wolfe 2020-04-29 18:52:59 +01:00
parent 1c0db1dc87
commit f10b4394dc
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/server/config/index.js
View file

@ -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'));