From 1330acbf2284e3c87ec7387055fd75712f92780e Mon Sep 17 00:00:00 2001 From: coderaiser Date: Thu, 21 Jun 2018 17:51:15 +0300 Subject: [PATCH] fix(cloudcmd) env variables override (#179) --- bin/cloudcmd.js | 2 +- server/env.js | 3 ++- test/server/env.js | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/bin/cloudcmd.js b/bin/cloudcmd.js index 638ff452..e2dd3e8f 100755 --- a/bin/cloudcmd.js +++ b/bin/cloudcmd.js @@ -10,7 +10,7 @@ const config = require(DIR_SERVER + 'config'); const env = require(DIR_SERVER + 'env'); const choose = (a, b) => { - if (!a) + if (a === undefined) return b; return a; diff --git a/server/env.js b/server/env.js index 4a07ee1d..1baeccc8 100644 --- a/server/env.js +++ b/server/env.js @@ -10,7 +10,8 @@ module.exports.bool = (name) => { if (value === 'true') return true; - return false; + if (value === 'false') + return false; }; function parse(name) { diff --git a/test/server/env.js b/test/server/env.js index d5376ab3..7d0fad6e 100644 --- a/test/server/env.js +++ b/test/server/env.js @@ -36,3 +36,13 @@ test('env: bool: true', (t) => { t.end(); }); +test('env: bool: undefined', (t) => { + const {cloudcmd_terminal} = process.env; + process.env.cloudcmd_terminal = undefined; + + t.equal(env.bool('terminal'), undefined, 'should be undefined'); + + process.env.cloudcmd_terminal = cloudcmd_terminal; + t.end(); +}); +