From fa387b5dfa6bf3edc68f6b7169251aeb007b9376 Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Fri, 27 Mar 2020 09:48:37 +1100
Subject: [PATCH] Linting and review fix

---
 CONTRIBUTING.md            |  3 +++
 app/config.js              | 13 +++++--------
 app/user_config.js         | 10 +++++++---
 integration_test/common.js | 34 +++++++++++++---------------------
 4 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9e01cf225..7a13f984f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -91,6 +91,7 @@ This profile will change [userData](https://electron.atom.io/docs/all/#appgetpat
 directory from `%appData%/Session` to `%appData%/Session-{environment}-{instance}`.
 
 There are a few scripts which you can use:
+
 ```
 yarn start - Start development
 yarn start-multi - Start second instance of development
@@ -100,9 +101,11 @@ yarn start-prod-multi - Start another instance of production
 
 For more than 2 clients, you may run the above command with `NODE_APP_INSTANCE` set before them.
 For example, running:
+
 ```
 NODE_APP_INSTANCE=alice yarn start
 ```
+
 Will run the development environment with the `alice` instance and thus create a seperate storage profile.
 
 If a fixed profile is needed (in the case of tests), you can specify it using `storageProfile` in the config file. If the change is local then put it in `local-{instance}.json` otherwise put it in `default-{instance}.json` or `{env}-{instance}.json`.
diff --git a/app/config.js b/app/config.js
index 6156d7f41..5ae3c9f8e 100644
--- a/app/config.js
+++ b/app/config.js
@@ -38,13 +38,10 @@ const config = require('config');
 config.environment = environment;
 
 // Log resulting env vars in use by config
-[
-  'NODE_ENV',
-  'NODE_APP_INSTANCE',
-  'NODE_CONFIG_DIR',
-  'NODE_CONFIG',
-].forEach(s => {
-  console.log(`${s} ${config.util.getEnv(s)}`);
-});
+['NODE_ENV', 'NODE_APP_INSTANCE', 'NODE_CONFIG_DIR', 'NODE_CONFIG'].forEach(
+  s => {
+    console.log(`${s} ${config.util.getEnv(s)}`);
+  }
+);
 
 module.exports = config;
diff --git a/app/user_config.js b/app/user_config.js
index 20b5b70c3..2324c8008 100644
--- a/app/user_config.js
+++ b/app/user_config.js
@@ -7,8 +7,12 @@ const { start } = require('./base_config');
 const config = require('./config');
 
 let storageProfile;
-const { NODE_ENV: environment, NODE_APP_INSTANCE:instance } = process.env;
-const isValidInstance = instance && instance.length > 0;
+
+// Node makes sure all environment variables are strings
+const { NODE_ENV: environment, NODE_APP_INSTANCE: instance } = process.env;
+
+// We need to make sure instance is not empty
+const isValidInstance = instance === 'string' && instance.length > 0;
 const isProduction = environment === 'production' && !isValidInstance;
 
 // Use seperate data directories for each different environment and app instances
@@ -18,7 +22,7 @@ if (config.has(storageProfile)) {
 } else if (!isProduction) {
   storageProfile = environment;
   if (isValidInstance) {
-    storageProfile = storageProfile.concat(`-${instance}`)
+    storageProfile = storageProfile.concat(`-${instance}`);
   }
 }
 
diff --git a/integration_test/common.js b/integration_test/common.js
index 83565e361..0a2daca5b 100644
--- a/integration_test/common.js
+++ b/integration_test/common.js
@@ -51,27 +51,22 @@ module.exports = {
   },
 
   async startApp(environment = 'test-integration-session') {
-    const env = {
-      NODE_ENV: environment,
-      USE_STUBBED_NETWORK: true,
-      ELECTRON_ENABLE_LOGGING: true,
-      ELECTRON_ENABLE_STACK_DUMPING: true,
-      ELECTRON_DISABLE_SANDBOX: 1,
-    };
-
-    // If it's specifically integration environment then we should extract the instance from it.
-    // This will still allow its storage to be found in Session-{environment}
-    // It just makes it easier to manage the config file
-    if (environment.includes('test-integration-')) {
-      const instance = environment.replace('test-integration-', '');
-      env.NODE_ENV = 'test-integration';
-      env.NODE_APP_INSTANCE = instance;
-    }
+    const env = environment.startsWith('test-integration')
+      ? 'test-integration'
+      : environment;
+    const instance = environment.replace('test-integration-', '');
 
     const app1 = new Application({
       path: path.join(__dirname, '..', 'node_modules', '.bin', 'electron'),
       args: ['.'],
-      env,
+      env: {
+        NODE_ENV: env,
+        NODE_APP_INSTANCE: instance,
+        USE_STUBBED_NETWORK: true,
+        ELECTRON_ENABLE_LOGGING: true,
+        ELECTRON_ENABLE_STACK_DUMPING: true,
+        ELECTRON_DISABLE_SANDBOX: 1,
+      },
       startTimeout: 10000,
       requireName: 'electronRequire',
       // chromeDriverLogPath: '../chromedriverlog.txt',
@@ -131,10 +126,7 @@ module.exports = {
   },
 
   async startAndAssureCleanedApp(env = 'test-integration-session') {
-    const userData = path.join(
-      this.USER_DATA_ROOT_FOLDER,
-      `Session-${env}`
-    );
+    const userData = path.join(this.USER_DATA_ROOT_FOLDER, `Session-${env}`);
 
     await this.rmFolder(userData);