Merge branch 'shutdown-on-close'

1 files changed, 35 insertions, 37 deletions

diff --git a/test/mocks/ipc.js b/test/mocks/ipc.js
index 5b337ebbc9..c02eb20de4 100644
--- a/test/mocks/ipc.js
+++ b/test/mocks/ipc.js
@@ -18,55 +18,53 @@ export function newMockIpc() {
   const mockIpc: IpcFacade & MockIpc = {
 
     setConnectionString: (_str: string) => {},
-    getAccountData: (accountToken) => {
-      return new Promise(r => r({
-        accountToken: accountToken,
-        expiry: '',
-      }));
-    },
-    getAccount: () => {
-      return new Promise(r => r('1111'));
-    },
-    setAccount: () => {
-      return new Promise(r => r());
-    },
-    setCustomRelay: () => {
-      return new Promise(r => r());
-    },
-    connect: () => {
-      return new Promise(r => r());
-    },
-    disconnect: () => {
-      return new Promise(r => r());
-    },
-    getIp: () => {
-      return new Promise(r => r('1.2.3.4'));
-    },
-    getLocation: () => {
-      return new Promise(r => r({
-        city: '',
-        country: '',
-        latlong: [0, 0],
-      }));
-    },
-    getState: () => {
-      return new Promise(r => r({
-        state: 'unsecured',
-        target_state:'unsecured',
-      }));
-    },
+
+    getAccountData: (accountToken) => Promise.resolve({
+      accountToken: accountToken,
+      expiry: '',
+    }),
+
+    getAccount: () => Promise.resolve('1111'),
+
+    setAccount: () => Promise.resolve(),
+
+    setCustomRelay: () => Promise.resolve(),
+
+    connect: () => Promise.resolve(),
+
+    disconnect: () => Promise.resolve(),
+
+    shutdown: () => Promise.resolve(),
+
+    getIp: () => Promise.resolve('1.2.3.4'),
+
+    getLocation: () => Promise.resolve({
+      city: '',
+      country: '',
+      latlong: [0, 0],
+    }),
+
+    getState: () => Promise.resolve({
+      state: 'unsecured',
+      target_state:'unsecured',
+    }),
+
     registerStateListener: (listener: (BackendState) => void) => {
       stateListeners.push(listener);
     },
+
     sendNewState: (state: BackendState) => {
       for(const l of stateListeners) {
         l(state);
       }
     },
+
     authenticate: (_secret: string) => Promise.resolve(),
+
     setCloseConnectionHandler: (listener: () => void) => {
       connectionCloseListeners.push(listener);
     },
+
     killWebSocket: () => {
       for(const l of connectionCloseListeners) {
         l();