fix: logging in client

Author: alexander-akait

client-src/clients/SockJSClient.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const SockJS = require('../modules/sockjs-client');
-const { log } = require('../modules/logger');
+const { log } = require('../utils/log');
 const BaseClient = require('./BaseClient');
 
 module.exports = class SockJSClient extends BaseClient {

client-src/clients/WebsocketClient.js

@@ -1,14 +1,15 @@
 'use strict';
 
-const { log } = require('../modules/logger');
+const { log } = require('../utils/log');
 const BaseClient = require('./BaseClient');
 
 module.exports = class WebsocketClient extends BaseClient {
   constructor(url) {
     super();
+
     const wsUrl = url.replace(/^(?:http|chrome-extension|file)/i, 'ws');
-    this.client = new WebSocket(wsUrl);
 
+    this.client = new WebSocket(wsUrl);
     this.client.onerror = (err) => {
       log.error(err);
     };

test/client/clients/SockJSClient.test.js

@@ -5,15 +5,15 @@ const express = require('express');
 const sockjs = require('sockjs');
 const port = require('../../ports-map').sockJSClient;
 
-jest.setMock('../../../client-src/modules/logger', {
+jest.setMock('../../../client-src/utils/log', {
   log: {
     error: jest.fn(),
   },
 });
 
 describe('SockJSClient', () => {
   const SockJSClient = require('../../../client-src/clients/SockJSClient');
-  const { log } = require('../../../client-src/modules/logger');
+  const { log } = require('../../../client-src/utils/log');
   let consoleMock;
   let socketServer;
   let server;

test/client/clients/WebsocketClient.test.js

@@ -5,15 +5,15 @@ const express = require('express');
 const ws = require('ws');
 const port = require('../../ports-map').WebsocketClient;
 
-jest.setMock('../../../client-src/modules/logger', {
+jest.setMock('../../../client-src/utils/log', {
   log: {
     error: jest.fn(),
   },
 });
 
 describe('WebsocketClient', () => {
   const WebsocketClient = require('../../../client-src/clients/WebsocketClient');
-  const { log } = require('../../../client-src/modules/logger');
+  const { log } = require('../../../client-src/utils/log');
 
   let socketServer;
   let server;

test/e2e/ClientOptions.test.js

@@ -394,24 +394,30 @@ describe('Client console.log', () => {
   ];
 
   transportModes.forEach(async (mode) => {
-    await cases.forEach(async ({ title, options }) => {
+    cases.forEach(async ({ title, options }) => {
       title += ` (${
         Object.keys(mode).length ? mode.transportMode : 'default'
       })`;
+
       options = { ...mode, ...options };
+
       const testOptions = Object.assign({}, baseOptions, options);
-      await it(title, (done) => {
+
+      it(title, (done) => {
         testServer.startAwaitingCompilation(config, testOptions, async () => {
           const res = [];
           const { page, browser } = await runBrowser();
+
           page.goto(`http://localhost:${port2}/main`);
           page.on('console', ({ _text }) => {
             res.push(_text);
           });
+
           // wait for load before closing the browser
           await page.waitForNavigation({ waitUntil: 'load' });
           await page.waitForTimeout(beforeBrowserCloseDelay);
           await browser.close();
+
           // Order doesn't matter, maybe we should improve that in future
           await expect(res.sort()).toMatchSnapshot();
           await testServer.close(done);