test: fix

Author: alexander-akait

package-lock.json

@@ -48,6 +48,7 @@ describe('bundle', () => {
 
       expect(() => {
         let evalStep = 0;
+
         acorn.parse(text, {
           ecmaVersion: 5,
           onToken: (token) => {

test/client/bundle.test.js

@@ -5,15 +5,15 @@ const express = require('express');
 const sockjs = require('sockjs');
 const port = require('../../ports-map').sockJSClient;
 
-jest.setMock('../../../client-src/utils/log', {
+jest.setMock('../../../client-src/modules/logger', {
   log: {
     error: jest.fn(),
   },
 });
 
 describe('SockJSClient', () => {
   const SockJSClient = require('../../../client-src/clients/SockJSClient');
-  const { log } = require('../../../client-src/utils/log');
+  const { log } = require('../../../client-src/modules/logger');
   let consoleMock;
   let socketServer;
   let server;
@@ -62,24 +62,31 @@ describe('SockJSClient', () => {
       });
 
       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]);
 
       setTimeout(() => {
         expect(data).toMatchSnapshot();
+
         done();
       }, 3000);
     });
+
     it('should change the protocol from chrome-extension to http', (done) => {
       const client = new SockJSClient('chrome-extension://localhost');
+
       expect(client.sock.url).toEqual('http://localhost');
+
       done();
     });
+
     it('should change the protocol from file to http', (done) => {
       const client = new SockJSClient('file://localhost');
       expect(client.sock.url).toEqual('http://localhost');
+
       done();
     });
   });

test/client/clients/SockJSClient.test.js

@@ -5,15 +5,16 @@ const express = require('express');
 const ws = require('ws');
 const port = require('../../ports-map').WebsocketClient;
 
-jest.setMock('../../../client-src/utils/log', {
+jest.setMock('../../../client-src/modules/logger', {
   log: {
     error: jest.fn(),
   },
 });
 
 describe('WebsocketClient', () => {
   const WebsocketClient = require('../../../client-src/clients/WebsocketClient');
-  const { log } = require('../../../client-src/utils/log');
+  const { log } = require('../../../client-src/modules/logger');
+
   let socketServer;
   let server;
 
@@ -55,24 +56,32 @@ describe('WebsocketClient', () => {
       });
 
       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]);
 
       setTimeout(() => {
         expect(data).toMatchSnapshot();
+
         done();
       }, 3000);
     });
+
     it('should change the protocol from chrome-extension to http', (done) => {
       const client = new WebsocketClient('chrome-extension://localhost/');
+
       expect(client.client.url).toEqual('ws://localhost/');
+
       done();
     });
+
     it('should change the protocol from file to http', (done) => {
       const client = new WebsocketClient('file://localhost/');
+
       expect(client.client.url).toEqual('ws://localhost/');
+
       done();
     });
   });

test/client/clients/WebsocketClient.test.js

@@ -14,39 +14,36 @@ describe('index', () => {
     global.__resourceQuery = 'foo';
 
     // log
-    jest.setMock('../../../client-src/modules/logger', {
+    jest.setMock('../../client-src/utils/log.js', {
       log: {
         info: jest.fn(),
         warn: jest.fn(),
         error: jest.fn(),
       },
     });
-    log = require('../../client-src/modules/logger');
+    log = require('../../client-src/utils/log');
 
     // socket
-    jest.setMock('../../client-src/default/socket.js', jest.fn());
+    jest.setMock('../../client-src/socket.js', jest.fn());
     socket = require('../../client-src/socket');
 
     // overlay
-    jest.setMock('../../client-src/default/overlay.js', {
+    jest.setMock('../../client-src/overlay.js', {
       clear: jest.fn(),
       showMessage: jest.fn(),
     });
     overlay = require('../../client-src/overlay');
 
     // reloadApp
-    jest.setMock('../../client-src/default/utils/reloadApp.js', jest.fn());
+    jest.setMock('../../client-src/utils/reloadApp.js', jest.fn());
     reloadApp = require('../../client-src/utils/reloadApp');
 
     // sendMessage
-    jest.setMock('../../client-src/default/utils/sendMessage.js', jest.fn());
+    jest.setMock('../../client-src/utils/sendMessage.js', jest.fn());
     sendMessage = require('../../client-src/utils/sendMessage');
 
     // createSocketUrl
-    jest.setMock(
-      '../../client-src/default/utils/createSocketUrl.js',
-      () => 'mock-url'
-    );
+    jest.setMock('../../client-src/utils/createSocketUrl.js', () => 'mock-url');
 
     // issue: https://github.com/jsdom/jsdom/issues/2112
     delete window.location;

test/client/index.test.js

@@ -17,9 +17,8 @@ describe('createSocketUrl', () => {
   ];
 
   samples.forEach((url) => {
-    jest.doMock(
-      '../../../client-src/default/utils/getCurrentScriptSource.js',
-      () => () => url
+    jest.doMock('../../../client-src/utils/getCurrentScriptSource', () => () =>
+      url
     );
 
     const createSocketUrl = require('../../../client-src/utils/createSocketUrl');
@@ -50,7 +49,7 @@ describe('createSocketUrl', () => {
 
   samples2.forEach(([scriptSrc, loc, expected]) => {
     jest.doMock(
-      '../../../client-src/default/utils/getCurrentScriptSource.js',
+      '../../../client-src/utils/getCurrentScriptSource.js',
       () => () => scriptSrc
     );
 

test/client/utils/createSocketUrl.test.js

@@ -10,7 +10,7 @@ describe('DevServer', () => {
     testBin(null, './test/fixtures/dev-server/default-config.js')
       .then((output) => {
         expect(output.exitCode).toEqual(0);
-        expect(output.stdout).toContain('client/default/index.js?');
+        expect(output.stdout).toContain('client/index.js?');
         done();
       })
       .catch(done);
@@ -22,7 +22,7 @@ describe('DevServer', () => {
       testBin('--stats=verbose', './test/fixtures/dev-server/multi-entry.js')
         .then((output) => {
           expect(output.exitCode).toEqual(0);
-          expect(output.stdout).toContain('client/default/index.js?');
+          expect(output.stdout).toContain('client/index.js?');
           expect(output.stdout).toContain('foo.js');
           done();
         })
@@ -36,7 +36,7 @@ describe('DevServer', () => {
       testBin(null, './test/fixtures/dev-server/empty-entry.js')
         .then((output) => {
           expect(output.exitCode).toEqual(0);
-          expect(output.stdout).toContain('client/default/index.js?');
+          expect(output.stdout).toContain('client/index.js?');
           done();
         })
         .catch(done);
@@ -61,7 +61,7 @@ describe('DevServer', () => {
     testBin('--target web', './test/fixtures/dev-server/default-config.js')
       .then((output) => {
         expect(output.exitCode).toEqual(0);
-        expect(output.stdout).toContain('client/default/index.js?');
+        expect(output.stdout).toContain('client/index.js?');
         expect(output.stdout).toContain('foo.js');
         done();
       })
@@ -72,7 +72,7 @@ describe('DevServer', () => {
     testBin('--target node', './test/fixtures/dev-server/default-config.js')
       .then((output) => {
         expect(output.exitCode).toEqual(0);
-        expect(output.stdout).not.toContain('client/default/index.js?');
+        expect(output.stdout).not.toContain('client/index.js?');
         expect(output.stdout).toContain('foo.js');
         done();
       })
@@ -118,7 +118,7 @@ describe('DevServer', () => {
       testBin(null, './test/fixtures/dev-server/target-config.js')
         .then((output) => {
           expect(output.exitCode).toEqual(0);
-          expect(output.stdout).toContain('client/default/index.js');
+          expect(output.stdout).toContain('client/index.js');
           done();
         })
         .catch(done);

test/e2e/DevServer.test.js

@@ -34,22 +34,6 @@ describe('routes util', () => {
       });
     });
 
-    it('should handle GET request to inline bundle', (done) => {
-      req.get('/webpack-dev-server.js').then(({ res }) => {
-        expect(res.headers['content-type']).toEqual('application/javascript');
-        expect(res.statusCode).toEqual(200);
-        done();
-      });
-    });
-
-    it('should handle HEAD request to inline bundle', (done) => {
-      req.head('/webpack-dev-server.js').then(({ res }) => {
-        expect(res.headers['content-type']).toEqual('application/javascript');
-        expect(res.statusCode).toEqual(200);
-        done();
-      });
-    });
-
     it('should handle GET request to invalidate endpoint', (done) => {
       req.get('/webpack-dev-server/invalidate').then(({ res }) => {
         expect(res.headers['content-type']).not.toEqual('text/html');