test(client): update client tests for stability

Author: knagaitsev

test/client/clients/SockJSClient.test.js

@@ -34,47 +34,42 @@ describe('SockJSClient', () => {
     });
   });
 
-  afterAll(() => {
-    consoleMock.mockRestore();
-  });
+  it('should open, receive message, and close', (done) => {
+    socketServer.on('connection', (connection) => {
+      connection.write('hello world');
 
-  describe('client', () => {
-    it('should open, receive message, and close', (done) => {
-      socketServer.on('connection', (connection) => {
-        connection.write('hello world');
-
-        setTimeout(() => {
-          connection.close();
-        }, 1000);
-      });
+      setTimeout(() => {
+        connection.close();
+      }, 1000);
+    });
 
-      const client = new SockJSClient(`http://localhost:${port}/ws`);
-      const data = [];
+    const client = new SockJSClient(`http://localhost:${port}/ws`);
+    const data = [];
 
-      client.onOpen(() => {
-        data.push('open');
-      });
-      client.onClose(() => {
-        data.push('close');
-      });
-      client.onMessage((msg) => {
-        data.push(msg);
-      });
+    client.onOpen(() => {
+      data.push('open');
+    });
+    client.onClose(() => {
+      data.push('close');
+    });
+    client.onMessage((msg) => {
+      data.push(msg);
+    });
 
-      const testError = new Error('test');
-      client.sock.onerror(testError);
+    const testError = new Error('test');
+    client.sock.onerror(testError);
 
-      expect(log.error.mock.calls.length).toEqual(1);
-      expect(log.error.mock.calls[0]).toEqual([testError]);
+    expect(log.error.mock.calls.length).toEqual(1);
+    expect(log.error.mock.calls[0]).toEqual([testError]);
 
-      setTimeout(() => {
-        expect(data).toMatchSnapshot();
-        done();
-      }, 3000);
-    });
+    setTimeout(() => {
+      expect(data).toMatchSnapshot();
+      done();
+    }, 3000);
   });
 
   afterAll((done) => {
+    consoleMock.mockRestore();
     listeningApp.close(() => {
       done();
     });

test/client/clients/WebsocketClient.test.js

@@ -31,40 +31,38 @@ describe('WebsocketClient', () => {
     });
   });
 
-  describe('client', () => {
-    it('should open, receive message, and close', (done) => {
-      socketServer.on('connection', (connection) => {
-        connection.send('hello world');
+  it('should open, receive message, and close', (done) => {
+    socketServer.on('connection', (connection) => {
+      connection.send('hello world');
 
-        setTimeout(() => {
-          connection.close();
-        }, 1000);
-      });
+      setTimeout(() => {
+        connection.close();
+      }, 1000);
+    });
 
-      const client = new WebsocketClient(`http://localhost:${port}/ws-server`);
-      const data = [];
+    const client = new WebsocketClient(`http://localhost:${port}/ws-server`);
+    const data = [];
 
-      client.onOpen(() => {
-        data.push('open');
-      });
-      client.onClose(() => {
-        data.push('close');
-      });
-      client.onMessage((msg) => {
-        data.push(msg);
-      });
+    client.onOpen(() => {
+      data.push('open');
+    });
+    client.onClose(() => {
+      data.push('close');
+    });
+    client.onMessage((msg) => {
+      data.push(msg);
+    });
 
-      const testError = new Error('test');
-      client.client.onerror(testError);
+    const testError = new Error('test');
+    client.client.onerror(testError);
 
-      expect(log.error.mock.calls.length).toEqual(1);
-      expect(log.error.mock.calls[0]).toEqual([testError]);
+    expect(log.error.mock.calls.length).toEqual(1);
+    expect(log.error.mock.calls[0]).toEqual([testError]);
 
-      setTimeout(() => {
-        expect(data).toMatchSnapshot();
-        done();
-      }, 3000);
-    });
+    setTimeout(() => {
+      expect(data).toMatchSnapshot();
+      done();
+    }, 3000);
   });
 
   afterAll((done) => {

test/client/clients/__snapshots__/SockJSClient.test.js.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`SockJSClient client should open, receive message, and close 1`] = `
+exports[`SockJSClient should open, receive message, and close 1`] = `
 Array [
   "open",
   "hello world",

test/client/clients/__snapshots__/WebsocketClient.test.js.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`WebsocketClient client should open, receive message, and close 1`] = `
+exports[`WebsocketClient should open, receive message, and close 1`] = `
 Array [
   "open",
   "hello world",