fix: webpack v4 test

Author: alexander-akait

test/e2e/progress.test.js

@@ -51,8 +51,8 @@ describe('progress', () => {
       .on('console', (message) => {
         consoleMessages.push(message);
       })
-      .on('request', (request) => {
-        if (/\.hot-update\.json$/.test(request.url())) {
+      .on('request', (requestObj) => {
+        if (/\.hot-update\.(json|js)$/.test(requestObj.url())) {
           doHotUpdate = true;
         }
       });
@@ -76,7 +76,7 @@ describe('progress', () => {
     await browser.close();
 
     const progressConsoleMessage = consoleMessages.filter((message) =>
-      /^\[webpack-dev-server\] \[[a-zA-Z]+\] [0-9]{1,3}% - /.test(
+      /^\[webpack-dev-server\] (\[[a-zA-Z]+\] )?[0-9]{1,3}% - /.test(
         message.text()
       )
     );

test/server/utils/DevServerPlugin.test.js

@@ -25,6 +25,7 @@ describe('DevServerPlugin util', () => {
     };
     const compiler = webpack(webpackOptions);
     const devServerOptions = {
+      hot: true,
       client: {
         transport: 'sockjs',
         webSocketURL: {},
@@ -38,7 +39,9 @@ describe('DevServerPlugin util', () => {
     };
 
     const plugin = new DevServerPlugin(devServerOptions);
+
     plugin.apply(compiler);
+
     getEntries(compiler).then((entries) => {
       expect(typeof entries).toEqual('function');
 
@@ -52,11 +55,11 @@ describe('DevServerPlugin util', () => {
               expect(entrySecondRun.main.import.length).toEqual(1);
               expect(entrySecondRun.main.import[0]).toEqual('./src-2.js');
             } else {
-              expect(entryFirstRun.length).toEqual(2);
-              expect(entryFirstRun[1]).toEqual('./src-1.js');
+              expect(entryFirstRun.length).toEqual(3);
+              expect(entryFirstRun[2]).toEqual('./src-1.js');
 
-              expect(entrySecondRun.length).toEqual(2);
-              expect(entrySecondRun[1]).toEqual('./src-2.js');
+              expect(entrySecondRun.length).toEqual(3);
+              expect(entrySecondRun[2]).toEqual('./src-2.js');
             }
             done();
           })
@@ -78,6 +81,7 @@ describe('DevServerPlugin util', () => {
     const compiler = webpack(webpackOptions);
 
     const devServerOptions = {
+      hot: true,
       client: {
         transport: 'sockjs',
         webSocketURL: {},
@@ -105,11 +109,11 @@ describe('DevServerPlugin util', () => {
               expect(entrySecondRun.main.import.length).toEqual(1);
               expect(entrySecondRun.main.import[0]).toEqual('./src-2.js');
             } else {
-              expect(entryFirstRun.length).toEqual(2);
-              expect(entryFirstRun[1]).toEqual('./src-1.js');
+              expect(entryFirstRun.length).toEqual(3);
+              expect(entryFirstRun[2]).toEqual('./src-1.js');
 
-              expect(entrySecondRun.length).toEqual(2);
-              expect(entrySecondRun[1]).toEqual('./src-2.js');
+              expect(entrySecondRun.length).toEqual(3);
+              expect(entrySecondRun[2]).toEqual('./src-2.js');
             }
             done();
           })