Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-07-05 21:57:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #824 from lirantal/bugfix/localjs-env-params-used-for-tests

Browse Source 
Fixed issue where if local.js exists then grunt test will run on that…
This commit is contained in:
Liran Tal
2015-08-19 22:15:15 +03:00
parent a1570c41cf d18832641a
commit 2e8d659e70
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/config.js
View File

@@ -159,9 +159,14 @@ var initGlobalConfig = function () {
var environmentConfig = require(path.join(process.cwd(), 'config/env/', process.env.NODE_ENV)) || {};
// Merge config files
var envConf = _.merge(defaultConfig, environmentConfig);
var config = _.merge(defaultConfig, environmentConfig);
var config = _.merge(envConf, (fs.existsSync(path.join(process.cwd(), 'config/env/local.js')) && require(path.join(process.cwd(), 'config/env/local.js'))) || {});
// We only extend the config object with the local.js custom/local environment if we are on
// production or development environment. If test environment is used we don't merge it with local.js
// to avoid running test suites on a prod/dev environment (which delete records and make modifications)
if (process.env.NODE_ENV !== 'test') {
config = _.merge(config, (fs.existsSync(path.join(process.cwd(), 'config/env/local.js')) && require(path.join(process.cwd(), 'config/env/local.js'))) || {});
}
// Initialize global globbed files
initGlobalConfigFiles(config, assets);