fix: Resolving overwritten system variables.

mrsteele · Jul 24, 2017 · 2e2d8b2 · 2e2d8b2
1 parent 4b44ddb
commit 2e2d8b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/index.js b/src/index.js
@@ -47,7 +47,7 @@ class Dotenv {
     }
 
     Object.keys(blueprint).map(key => {
-      const value = (env[key] || env[key] === '') ? env[key] : vars[key]
+      const value = vars.hasOwnProperty(key) ? vars[key] : env[key]
       if (!value && options.safe) {
         throw new Error(`Missing environment variable: ${key}`)
       } else {

diff --git a/test/main.spec.js b/test/main.spec.js
@@ -99,8 +99,8 @@ function runTests (Obj, name) {
         PATH.should.contain('/')
       })
 
-      it('should allow local variables to override systemvars', () => {
-        envTest({path: envSystemvars, systemvars: true})['process.env.PATH'].should.equal('""')
+      it('should not allow local variables to override systemvars', () => {
+        envTest({path: envSystemvars, systemvars: true})['process.env.PATH'].should.not.equal('""')
       })
     })