From 1ee2088343f0db99f86208dc5988c0829ca1103b Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Fri, 3 Apr 2020 03:46:39 -0700 Subject: [PATCH 1/4] Fix integration tests slipping into release Per Mikunj --- js/modules/loki_file_server_api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/modules/loki_file_server_api.js b/js/modules/loki_file_server_api.js index 47adf81eb..b522444bb 100644 --- a/js/modules/loki_file_server_api.js +++ b/js/modules/loki_file_server_api.js @@ -4,7 +4,6 @@ /* global log: false */ const LokiAppDotNetAPI = require('./loki_app_dot_net_api'); -const StubAppDotNetAPI = require('../../integration_test/stubs/stub_app_dot_net_api.js'); const DEVICE_MAPPING_USER_ANNOTATION_TYPE = 'network.loki.messenger.devicemapping'; @@ -60,6 +59,7 @@ class LokiFileServerInstance { async establishConnection(serverUrl, options) { // why don't we extend this? if (process.env.USE_STUBBED_NETWORK) { + const StubAppDotNetAPI = require('../../integration_test/stubs/stub_app_dot_net_api.js'); this._server = new StubAppDotNetAPI(this.ourKey, serverUrl); } else { this._server = new LokiAppDotNetAPI(this.ourKey, serverUrl); From b517ad5286b8223563d0acf46a8562829f16d347 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Fri, 3 Apr 2020 03:49:32 -0700 Subject: [PATCH 2/4] put integration code under guard --- js/modules/loki_public_chat_api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/modules/loki_public_chat_api.js b/js/modules/loki_public_chat_api.js index 20aa2338d..a2acaa68b 100644 --- a/js/modules/loki_public_chat_api.js +++ b/js/modules/loki_public_chat_api.js @@ -2,7 +2,6 @@ const EventEmitter = require('events'); const nodeFetch = require('node-fetch'); const LokiAppDotNetAPI = require('./loki_app_dot_net_api'); -const StubAppDotNetAPI = require('../../integration_test/stubs/stub_app_dot_net_api.js'); class LokiPublicChatFactoryAPI extends EventEmitter { constructor(ourKey) { @@ -61,6 +60,7 @@ class LokiPublicChatFactoryAPI extends EventEmitter { // after verification then we can start up all the pollers if (process.env.USE_STUBBED_NETWORK) { + const StubAppDotNetAPI = require('../../integration_test/stubs/stub_app_dot_net_api.js'); thisServer = new StubAppDotNetAPI(this.ourKey, serverUrl); } else { thisServer = new LokiAppDotNetAPI(this.ourKey, serverUrl); From 70c4b9b3c750f71f1bcaafbd206f2827324e1045 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Fri, 3 Apr 2020 03:53:02 -0700 Subject: [PATCH 3/4] lint --- js/modules/loki_file_server_api.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/modules/loki_file_server_api.js b/js/modules/loki_file_server_api.js index b522444bb..b6050a6be 100644 --- a/js/modules/loki_file_server_api.js +++ b/js/modules/loki_file_server_api.js @@ -59,6 +59,7 @@ class LokiFileServerInstance { async establishConnection(serverUrl, options) { // why don't we extend this? if (process.env.USE_STUBBED_NETWORK) { + // eslint-disable-next-line global-require const StubAppDotNetAPI = require('../../integration_test/stubs/stub_app_dot_net_api.js'); this._server = new StubAppDotNetAPI(this.ourKey, serverUrl); } else { From 3553edcefc93421fcd70e0b3f6f9fe5b789e49ea Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Fri, 3 Apr 2020 03:53:36 -0700 Subject: [PATCH 4/4] lint --- js/modules/loki_public_chat_api.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/modules/loki_public_chat_api.js b/js/modules/loki_public_chat_api.js index a2acaa68b..aa89828a4 100644 --- a/js/modules/loki_public_chat_api.js +++ b/js/modules/loki_public_chat_api.js @@ -60,6 +60,7 @@ class LokiPublicChatFactoryAPI extends EventEmitter { // after verification then we can start up all the pollers if (process.env.USE_STUBBED_NETWORK) { + // eslint-disable-next-line global-require const StubAppDotNetAPI = require('../../integration_test/stubs/stub_app_dot_net_api.js'); thisServer = new StubAppDotNetAPI(this.ourKey, serverUrl); } else {