From 5c36b757238224cf2800b402409086f5eaea86a7 Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Fri, 27 Mar 2020 09:29:29 +1100
Subject: [PATCH] More integration test cleanup

---
 .../default-test-integration-session-2.json   |  4 ---
 ...ion-session.json => test-integration.json} |  1 -
 integration_test/common.js                    | 27 +++++++++++++------
 3 files changed, 19 insertions(+), 13 deletions(-)
 delete mode 100644 config/default-test-integration-session-2.json
 rename config/{default-test-integration-session.json => test-integration.json} (53%)

diff --git a/config/default-test-integration-session-2.json b/config/default-test-integration-session-2.json
deleted file mode 100644
index a8a83dedc..000000000
--- a/config/default-test-integration-session-2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "storageProfile": "test-integration-session-2",
-  "localServerPort": "8082"
-}
diff --git a/config/default-test-integration-session.json b/config/test-integration.json
similarity index 53%
rename from config/default-test-integration-session.json
rename to config/test-integration.json
index 2feee3707..d2b1f6973 100644
--- a/config/default-test-integration-session.json
+++ b/config/test-integration.json
@@ -1,5 +1,4 @@
 {
-  "storageProfile": "test-integration-session",
   "openDevTools": false,
   "updatesEnabled": false
 }
diff --git a/integration_test/common.js b/integration_test/common.js
index 53f3aef25..83565e361 100644
--- a/integration_test/common.js
+++ b/integration_test/common.js
@@ -50,17 +50,28 @@ module.exports = {
     return new Promise(resolve => setTimeout(resolve, ms));
   },
 
-  async startApp(env = 'test-integration-session') {
+  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 app1 = new Application({
       path: path.join(__dirname, '..', 'node_modules', '.bin', 'electron'),
       args: ['.'],
-      env: {
-        NODE_ENV: env,
-        USE_STUBBED_NETWORK: true,
-        ELECTRON_ENABLE_LOGGING: true,
-        ELECTRON_ENABLE_STACK_DUMPING: true,
-        ELECTRON_DISABLE_SANDBOX: 1,
-      },
+      env,
       startTimeout: 10000,
       requireName: 'electronRequire',
       // chromeDriverLogPath: '../chromedriverlog.txt',