refactor: test

Author: alexander-akait

test/e2e/web-socket-server-url.test.js

@@ -1532,12 +1532,13 @@ describe('web socket server URL', () => {
       });
     });
 
-    it(`should work when "port" option is "auto" ("${webSocketServer}")`, async () => {
+    it(`should work when "host" option is IPv4 ("${webSocketServer}")`, async () => {
+      const hostname = internalIp.v4.sync();
       const compiler = webpack(config);
       const devServerOptions = {
         webSocketServer,
-        port: 'auto',
-        host: '0.0.0.0',
+        port: port1,
+        host: hostname,
       };
       const server = new Server(devServerOptions, compiler);
 
@@ -1553,8 +1554,6 @@ describe('web socket server URL', () => {
         });
       });
 
-      const resolvedFreePort = server.options.port;
-
       const { page, browser } = await runBrowser();
 
       const pageErrors = [];
@@ -1573,8 +1572,8 @@ describe('web socket server URL', () => {
       if (webSocketServer === 'ws') {
         const client = page._client;
 
-        client.on('Network.webSocketCreated', (request) => {
-          webSocketRequests.push(request);
+        client.on('Network.webSocketCreated', (test) => {
+          webSocketRequests.push(test);
         });
       } else {
         page.on('request', (request) => {
@@ -1584,14 +1583,14 @@ describe('web socket server URL', () => {
         });
       }
 
-      await page.goto(`http://127.0.0.1:${resolvedFreePort}/main`, {
+      await page.goto(`http://${hostname}:${port1}/main`, {
         waitUntil: 'networkidle0',
       });
 
       const webSocketRequest = webSocketRequests[0];
 
       expect(webSocketRequest.url).toContain(
-        `${websocketURLProtocol}://127.0.0.1:${resolvedFreePort}/ws`
+        `${websocketURLProtocol}://${hostname}:${port1}/ws`
       );
       expect(consoleMessages.map((message) => message.text())).toMatchSnapshot(
         'console messages'
@@ -1612,13 +1611,13 @@ describe('web socket server URL', () => {
       });
     });
 
-    it(`should work when "host" option is IPv4 ("${webSocketServer}")`, async () => {
+    it(`should work when "host" option is "local-ip" ("${webSocketServer}")`, async () => {
       const hostname = internalIp.v4.sync();
       const compiler = webpack(config);
       const devServerOptions = {
         webSocketServer,
         port: port1,
-        host: hostname,
+        host: 'local-ip',
       };
       const server = new Server(devServerOptions, compiler);
 
@@ -1691,13 +1690,13 @@ describe('web socket server URL', () => {
       });
     });
 
-    it(`should work when "host" option is "local-ip" ("${webSocketServer}")`, async () => {
+    it(`should work when "host" option is "local-ipv4" ("${webSocketServer}")`, async () => {
       const hostname = internalIp.v4.sync();
       const compiler = webpack(config);
       const devServerOptions = {
         webSocketServer,
         port: port1,
-        host: 'local-ip',
+        host: 'local-ipv4',
       };
       const server = new Server(devServerOptions, compiler);
 
@@ -1770,13 +1769,12 @@ describe('web socket server URL', () => {
       });
     });
 
-    it(`should work when "host" option is "local-ipv4" ("${webSocketServer}")`, async () => {
-      const hostname = internalIp.v4.sync();
+    it(`should work when "port" option is "auto" ("${webSocketServer}")`, async () => {
       const compiler = webpack(config);
       const devServerOptions = {
         webSocketServer,
-        port: port1,
-        host: 'local-ipv4',
+        port: 'auto',
+        host: '0.0.0.0',
       };
       const server = new Server(devServerOptions, compiler);
 
@@ -1792,6 +1790,8 @@ describe('web socket server URL', () => {
         });
       });
 
+      const resolvedFreePort = server.options.port;
+
       const { page, browser } = await runBrowser();
 
       const pageErrors = [];
@@ -1810,8 +1810,8 @@ describe('web socket server URL', () => {
       if (webSocketServer === 'ws') {
         const client = page._client;
 
-        client.on('Network.webSocketCreated', (test) => {
-          webSocketRequests.push(test);
+        client.on('Network.webSocketCreated', (request) => {
+          webSocketRequests.push(request);
         });
       } else {
         page.on('request', (request) => {
@@ -1821,14 +1821,14 @@ describe('web socket server URL', () => {
         });
       }
 
-      await page.goto(`http://${hostname}:${port1}/main`, {
+      await page.goto(`http://127.0.0.1:${resolvedFreePort}/main`, {
         waitUntil: 'networkidle0',
       });
 
       const webSocketRequest = webSocketRequests[0];
 
       expect(webSocketRequest.url).toContain(
-        `${websocketURLProtocol}://${hostname}:${port1}/ws`
+        `${websocketURLProtocol}://127.0.0.1:${resolvedFreePort}/ws`
       );
       expect(consoleMessages.map((message) => message.text())).toMatchSnapshot(
         'console messages'