test: refactor

Author: alexander-akait

globalSetupTest.js

@@ -17,7 +17,9 @@ async function validatePorts() {
 
     arr.forEach((port) => {
       const check = tcpPortUsed.check(port, 'localhost').then((inUse) => {
-        if (inUse) throw new Error(`${port} has already used. [${key}]`);
+        if (inUse) {
+          throw new Error(`${port} has already used. [${key}]`);
+        }
       });
 
       samples.push(check);

jest.config.js

@@ -9,10 +9,7 @@ module.exports = {
     '<rootDir>/client/',
   ],
   testPathIgnorePatterns: ['<rootDir>/bin/this/process-arguments.js'],
-  moduleFileExtensions: ['js', 'json'],
-  testMatch: ['**/test/**/*.test.js'],
   snapshotResolver: '<rootDir>/test/helpers/snapshotResolver.js',
   setupFilesAfterEnv: ['<rootDir>/setupTest.js'],
   globalSetup: '<rootDir>/globalSetupTest.js',
-  testSequencer: '<rootDir>/test/testSequencer.js',
 };

lib/Server.js

@@ -789,7 +789,7 @@ class Server {
     function runPortFinder() {
       return new Promise((resolve, reject) => {
         // default port
-        portfinder.basePort = 8080;
+        portfinder.basePort = process.env.WEBPACK_DEV_SERVER_BASE_PORT || 8080;
         portfinder.getPort((error, foundPort) => {
           if (error) {
             return reject(error);
@@ -802,7 +802,8 @@ class Server {
 
     // Try to find unused port and listen on it for 3 times,
     // if port is not specified in options.
-    const defaultPortRetry = parseInt(process.env.DEFAULT_PORT_RETRY, 10) || 3;
+    const defaultPortRetry =
+      parseInt(process.env.WEBPACK_DEV_SERVER_PORT_RETRY, 10) || 3;
 
     return pRetry(runPortFinder, { retries: defaultPortRetry });
   }

package-lock.json

@@ -67,7 +67,6 @@
     "@babel/runtime": "^7.14.5",
     "@commitlint/cli": "^12.1.3",
     "@commitlint/config-conventional": "^12.1.4",
-    "@jest/test-sequencer": "^27.0.4",
     "acorn": "^8.2.4",
     "babel-jest": "^27.0.2",
     "babel-loader": "^8.2.2",

package.json

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`basic basic should work using "--host localhost --port 9999": stderr 1`] = `
+exports[`basic basic should work using "--host localhost --port <port>": stderr 1`] = `
 "<i> [webpack-dev-server] Project is running at:
 <i> [webpack-dev-server] Loopback: http://localhost:<port>/, http://127.0.0.1:<port>/
 <i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"

test/cli/__snapshots__/basic.test.js.snap.webpack4

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`basic basic should work using "--host localhost --port 9999": stderr 1`] = `
+exports[`basic basic should work using "--host localhost --port <port>": stderr 1`] = `
 "<i> [webpack-dev-server] Project is running at:
 <i> [webpack-dev-server] Loopback: http://localhost:<port>/, http://127.0.0.1:<port>/
 <i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"

test/cli/__snapshots__/basic.test.js.snap.webpack5

@@ -8,6 +8,7 @@ const schema = require('../../lib/options.json');
 const cliOptions = require('../../bin/cli-flags');
 const { testBin, normalizeStderr } = require('../helpers/test-bin');
 const isWebpack5 = require('../helpers/isWebpack5');
+const port = require('../ports-map')['cli-basic'];
 
 const isMacOS = process.platform === 'darwin';
 const webpack5Test = isWebpack5 ? it : it.skip;
@@ -48,12 +49,12 @@ describe('basic', () => {
       expect(normalizeStderr(stderr, { ipv6: true })).toMatchSnapshot('stderr');
     });
 
-    it('should work using "--host localhost --port 9999"', async () => {
+    it('should work using "--host localhost --port <port>"', async () => {
       const { exitCode, stderr } = await testBin([
         '--host',
         'localhost',
         '--port',
-        9999,
+        port,
       ]);
 
       expect(exitCode).toEqual(0);

test/cli/basic.test.js

@@ -1,10 +1,11 @@
 'use strict';
 
 const { testBin, normalizeStderr } = require('../helpers/test-bin');
+const port = require('../ports-map')['cli-port-option'];
 
 describe('"port" CLI option', () => {
   it('should work using "--port <string>"', async () => {
-    const { exitCode, stderr } = await testBin(['--port', '8080']);
+    const { exitCode, stderr } = await testBin(['--port', port]);
 
     expect(exitCode).toEqual(0);
     expect(normalizeStderr(stderr, { ipv6: true })).toMatchSnapshot('stderr');

test/cli/port-option.test.js

@@ -7,7 +7,7 @@
 const http = require('http');
 const express = require('express');
 const sockjs = require('sockjs');
-const port = require('../../ports-map').sockJSClient;
+const port = require('../../ports-map')['sockjs-client'];
 
 jest.setMock('../../../client-src/utils/log', {
   log: {

test/client/clients/SockJSClient.test.js

@@ -7,7 +7,7 @@
 const http = require('http');
 const express = require('express');
 const ws = require('ws');
-const port = require('../../ports-map').WebsocketClient;
+const port = require('../../ports-map')['web-socket-client'];
 
 jest.setMock('../../../client-src/utils/log', {
   log: {