From cc1e46f4f0335427a85ade07e8e08a5c02ece245 Mon Sep 17 00:00:00 2001 From: David Diaz Date: Thu, 17 May 2018 09:17:40 -0600 Subject: [PATCH] Fix: Env variables I am making a couple of small changes to how external environment variables are used. From now own everything comming from the outside, namely the .env file and the params flag are assigned to the '_' variable within the internal environment. This is mostly to namespace things and make it clear where they are coming from. --- bin/cli/base.js | 2 +- src/request.js | 2 -- src/requestList.js | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/bin/cli/base.js b/bin/cli/base.js index e1e7f68..dae23b5 100644 --- a/bin/cli/base.js +++ b/bin/cli/base.js @@ -21,7 +21,7 @@ class Base extends Command { const env = dotenv.config().parsed || {}; params = dotenv.parse(params.reduce((a, p) => a + '\n' + p, '')); - const envParams = { params: Object.assign(env, params) }; + const envParams = { _: Object.assign(env, params) }; const configFileDir = path.dirname( path.resolve(process.cwd(), configFile) diff --git a/src/request.js b/src/request.js index 2c07777..0c455da 100644 --- a/src/request.js +++ b/src/request.js @@ -1,10 +1,8 @@ const request = require('request-promise-native'); -const RequestList = require('./requestList'); const RequestCache = require('./requestCache'); const Plugins = require('./plugins'); const { - httpVerbs, requestRegex, replacementRegex, UpperCaseKeys, diff --git a/src/requestList.js b/src/requestList.js index eb0ddec..f247be3 100644 --- a/src/requestList.js +++ b/src/requestList.js @@ -1,6 +1,5 @@ const Request = require('./request'); const RequestCache = require('./requestCache'); -const httpVerbs = require('./shared').httpVerbs; class RequestList { constructor(config = { REQUESTS: [] }) {