clean up

Author: motdotla

lib/main.js

@@ -245,8 +245,12 @@ function _configVault (options) {
 function configDotenv (options) {
   const dotenvPath = path.resolve(process.cwd(), '.env')
   let encoding = 'utf8'
-  let debug = parseBoolean(process.env.DOTENV_CONFIG_DEBUG || (options && options.debug))
-  let quiet = parseBoolean(process.env.DOTENV_CONFIG_QUIET || (options && options.quiet))
+  let processEnv = process.env
+  if (options && options.processEnv != null) {
+    processEnv = options.processEnv
+  }
+  let debug = parseBoolean(processEnv.DOTENV_CONFIG_DEBUG || (options && options.debug))
+  let quiet = parseBoolean(processEnv.DOTENV_CONFIG_QUIET || (options && options.quiet))
 
   if (options && options.encoding) {
     encoding = options.encoding
@@ -286,16 +290,11 @@ function configDotenv (options) {
     }
   }
 
-  let processEnv = process.env
-  if (options && options.processEnv != null) {
-    processEnv = options.processEnv
-  }
-
   const populated = DotenvModule.populate(processEnv, parsedAll, options)
 
   // handle user settings DOTENV_CONFIG_ options inside .env file(s)
   debug = parseBoolean(processEnv.DOTENV_CONFIG_DEBUG || debug)
-  quiet = parseBoolean(process.env.DOTENV_CONFIG_QUIET || quiet)
+  quiet = parseBoolean(processEnv.DOTENV_CONFIG_QUIET || quiet)
 
   if (debug || !quiet) {
     const keysCount = Object.keys(populated).length

tests/test-config.js

@@ -9,6 +9,7 @@ const dotenv = require('../lib/main')
 let logStub
 
 t.beforeEach(() => {
+  logStub = null
   delete process.env.BASIC // reset
 })