Integration-Tests - Overwrite variables

Author: Chris Wiechmann

apibuilder4elastic/test/trafficMonitorAPI/asAdmin/jms/test_search_jms_AsAdmin.js

@@ -4,7 +4,7 @@ const getDate = require('../../../util');
 const path = require('path');
 const fs = require('fs');
 const nock = require('nock');
-const envLoader = require('dotenv');
+const dotenv = require('dotenv');
 
 describe('Endpoints', function () {
 	this.timeout(30000);
@@ -29,8 +29,10 @@ describe('Endpoints', function () {
 	before(() => {
 		return new Promise(function(resolve, reject){
 			const envFilePath = path.join(__dirname, '../../../.env');
-			if (fs.existsSync(envFilePath)) {
-				envLoader.config({ path: envFilePath });
+			// Make sure the existing environment variables are overwritten (https://github.com/motdotla/dotenv#what-happens-to-environment-variables-that-were-already-set)
+			const envConfig = dotenv.parse(fs.readFileSync(envFilePath));
+			for (const k in envConfig) {
+				process.env[k] = envConfig[k];
 			}
 			server = startApiBuilder();
 			server.apibuilder.config.testElasticIndex = indexName;

apibuilder4elastic/test/trafficMonitorAPI/asAdmin/payload/test_payload.js

@@ -3,7 +3,7 @@ const { startApiBuilder, stopApiBuilder, requestAsync, sendToElasticsearch, getR
 const path = require('path');
 const fs = require('fs');
 const nock = require('nock');
-const envLoader = require('dotenv');
+const dotenv = require('dotenv');
 
 describe('Payload', function () {
 	this.timeout(30000);
@@ -29,8 +29,10 @@ describe('Payload', function () {
 	before(() => {
 		return new Promise(function(resolve, reject){
 			const envFilePath = path.join(__dirname, '../../../.env');
-			if (fs.existsSync(envFilePath)) {
-				envLoader.config({ path: envFilePath });
+			// Make sure the existing environment variables are overwritten (https://github.com/motdotla/dotenv#what-happens-to-environment-variables-that-were-already-set)
+			const envConfig = dotenv.parse(fs.readFileSync(envFilePath));
+			for (const k in envConfig) {
+				process.env[k] = envConfig[k];
 			}
 			process.env.PAYLOAD_FOLDER = payloadFolder;
 			// Should be limited to bytes => This is a large payload, that should be limited.