test: refactor

test/cli/basic.test.js

@@ -66,40 +66,33 @@ describe("basic", () => {
     });
 
     it("should accept the promise function of webpack.config.js", async () => {
-      try {
-        await testBin([
-          "--config",
-          path.resolve(
-            __dirname,
-            "../fixtures/promise-config/webpack.config.js"
-          ),
-          "--port",
-          port,
-        ]);
-      } catch (error) {
-        expect(error.stdout).toContain("main.js");
-        expect(normalizeStderr(error.stderr, { ipv6: true })).toMatchSnapshot(
-          "stderr"
-        );
-      }
+      const { exitCode, stderr } = await testBin([
+        "--config",
+        path.resolve(
+          __dirname,
+          "../fixtures/cli-promise-config/webpack.config.js"
+        ),
+        "--port",
+        port,
+      ]);
+
+      expect(exitCode).toEqual(0);
+      expect(normalizeStderr(stderr, { ipv6: true })).toMatchSnapshot("stderr");
     });
 
     it("should work using multi compiler mode", async () => {
-      try {
-        await testBin([
-          "--config",
-          path.resolve(
-            __dirname,
-            "../fixtures/universal-compiler-config/webpack.config.js"
-          ),
-          "--port",
-          port,
-        ]);
-      } catch (error) {
-        expect(normalizeStderr(error.stderr, { ipv6: true })).toMatchSnapshot(
-          "stderr"
-        );
-      }
+      const { exitCode, stderr } = await testBin([
+        "--config",
+        path.resolve(
+          __dirname,
+          "../fixtures/cli-universal-compiler-config/webpack.config.js"
+        ),
+        "--port",
+        port,
+      ]);
+
+      expect(exitCode).toEqual(0);
+      expect(normalizeStderr(stderr, { ipv6: true })).toMatchSnapshot("stderr");
     });
 
     it("should exit the process when SIGINT is detected", (done) => {
@@ -229,7 +222,7 @@ describe("basic", () => {
         "--port",
         port,
         "--config",
-        "./test/fixtures/dev-server/default-config.js",
+        "./test/fixtures/cli-single-entry/webpack.config.js",
       ]);
 
       expect(exitCode).toEqual(0);
@@ -243,7 +236,7 @@ describe("basic", () => {
           "--port",
           port,
           "--config",
-          "./test/fixtures/dev-server/multi-entry.js",
+          "./test/fixtures/cli-multi-entry/webpack.config.js",
           "--stats",
           "verbose",
         ]);
@@ -261,7 +254,7 @@ describe("basic", () => {
           "--port",
           port,
           "--config",
-          "./test/fixtures/dev-server/empty-entry.js",
+          "./test/fixtures/cli-empty-entry/webpack.config.js",
         ]);
 
         expect(exitCode).toEqual(0);
@@ -274,7 +267,7 @@ describe("basic", () => {
         "--port",
         port,
         "--config",
-        "./test/fixtures/entry-as-descriptor/webpack.config",
+        "./test/fixtures/cli-entry-as-descriptor/webpack.config",
         "--stats",
         "detailed",
       ]);
@@ -329,7 +322,7 @@ describe("basic", () => {
           "--port",
           port,
           "--config",
-          "./test/fixtures/dev-server/target-config.js",
+          "./test/fixtures/cli-target-config/webpack.config.js",
         ]);
 
         expect(exitCode).toEqual(0);

test/fixtures/cli-colors-default-stats/webpack.config.js

@@ -6,5 +6,5 @@ module.exports = {
   mode: "development",
   context: __dirname,
   entry: "./foo.js",
-  plugins: [ExitOnDonePlugin],
+  plugins: [new ExitOnDonePlugin()],
 };

test/fixtures/cli-colors-disabled/webpack.config.js

@@ -9,5 +9,5 @@ module.exports = {
   },
   context: __dirname,
   entry: "./foo.js",
-  plugins: [ExitOnDonePlugin],
+  plugins: [new ExitOnDonePlugin()],
 };

test/fixtures/cli-colors-enabled/webpack.config.js

@@ -9,5 +9,5 @@ module.exports = {
   },
   context: __dirname,
   entry: "./foo.js",
-  plugins: [ExitOnDonePlugin],
+  plugins: [new ExitOnDonePlugin()],
 };

test/fixtures/dev-server/empty-entry.js → test/fixtures/cli-empty-entry/webpack.config.js

@@ -6,8 +6,5 @@ module.exports = {
   mode: "development",
   stats: { orphanModules: true, preset: "detailed" },
   entry: {},
-  devServer: {
-    webSocketServer: "ws",
-  },
-  plugins: [ExitOnDonePlugin],
+  plugins: [new ExitOnDonePlugin()],
 };

test/fixtures/entry-as-descriptor/webpack.config.js → test/fixtures/cli-entry-as-descriptor/webpack.config.js

@@ -10,8 +10,5 @@ module.exports = {
       import: "./foo.js",
     },
   },
-  plugins: [ExitOnDonePlugin],
-  infrastructureLogging: {
-    level: "warn",
-  },
+  plugins: [new ExitOnDonePlugin()],
 };

test/fixtures/cli-multi-entry/bar.js

@@ -0,0 +1,3 @@
+"use strict";
+
+console.log("I am bar");

test/fixtures/cli-multi-entry/foo.js

@@ -0,0 +1,3 @@
+"use strict";
+
+console.log("I am foo");

test/fixtures/dev-server/multi-entry.js → test/fixtures/cli-multi-entry/webpack.config.js

@@ -11,8 +11,5 @@ module.exports = {
     foo: resolve(__dirname, "./foo.js"),
     bar: resolve(__dirname, "./bar.js"),
   },
-  devServer: {
-    webSocketServer: "ws",
-  },
-  plugins: [ExitOnDonePlugin],
+  plugins: [new ExitOnDonePlugin()],
 };

test/fixtures/promise-config/webpack.config.js → test/fixtures/cli-promise-config/webpack.config.js

@@ -1,11 +1,13 @@
 "use strict";
 
 const { join } = require("path");
+const ExitOnDonePlugin = require("../../helpers/ExitOnDonePlugin");
 
 module.exports = () =>
   new Promise((resolve) => {
     resolve({
       mode: "development",
       entry: join(__dirname, "foo.js"),
+      plugins: [new ExitOnDonePlugin()],
     });
   });

test/fixtures/cli-single-entry/foo.js

@@ -0,0 +1,3 @@
+"use strict";
+
+console.log("I am foo");

test/fixtures/dev-server/default-config.js → test/fixtures/cli-single-entry/webpack.config.js

@@ -7,8 +7,5 @@ module.exports = {
   mode: "development",
   stats: "detailed",
   entry: resolve(__dirname, "./foo.js"),
-  devServer: {
-    webSocketServer: "ws",
-  },
-  plugins: [ExitOnDonePlugin],
+  plugins: [new ExitOnDonePlugin()],
 };

test/fixtures/cli-target-config/foo.js

@@ -0,0 +1,3 @@
+"use strict";
+
+console.log("I am foo");

test/fixtures/dev-server/target-config.js → test/fixtures/cli-target-config/webpack.config.js

@@ -8,13 +8,5 @@ module.exports = {
   stats: "detailed",
   entry: resolve(__dirname, "./foo.js"),
   target: ["web"],
-  output: {
-    chunkLoading: false,
-    wasmLoading: false,
-    workerChunkLoading: false,
-  },
-  devServer: {
-    webSocketServer: "ws",
-  },
-  plugins: [ExitOnDonePlugin],
+  plugins: [new ExitOnDonePlugin()],
 };

test/fixtures/cli-universal-compiler-config/client.js

@@ -0,0 +1,3 @@
+"use strict";
+
+console.log("Hello from the client");

test/fixtures/cli-universal-compiler-config/server.js

@@ -0,0 +1,3 @@
+"use strict";
+
+console.log("Hello from the server");

test/fixtures/cli-universal-compiler-config/webpack.config.js

@@ -0,0 +1,28 @@
+"use strict";
+
+const ExitOnDonePlugin = require("../../helpers/ExitOnDonePlugin");
+
+module.exports = [
+  {
+    mode: "development",
+    context: __dirname,
+    stats: "none",
+    entry: "./client.js",
+    output: {
+      path: "/",
+      filename: "client.js",
+    },
+  },
+  {
+    mode: "development",
+    context: __dirname,
+    target: "node",
+    stats: "none",
+    entry: "./server.js",
+    output: {
+      path: "/",
+      filename: "server.js",
+    },
+    plugins: [new ExitOnDonePlugin()],
+  },
+];

test/fixtures/cli/webpack.config.js

@@ -7,5 +7,5 @@ module.exports = {
   stats: "detailed",
   context: __dirname,
   entry: "./foo.js",
-  plugins: [ExitOnDonePlugin],
+  plugins: [new ExitOnDonePlugin()],
 };

test/fixtures/universal-compiler-config/webpack.config.js

@@ -10,6 +10,9 @@ module.exports = [
       path: "/",
       filename: "client.js",
     },
+    infrastructureLogging: {
+      level: "warn",
+    },
   },
   {
     mode: "development",
@@ -21,5 +24,8 @@ module.exports = [
       path: "/",
       filename: "server.js",
     },
+    infrastructureLogging: {
+      level: "warn",
+    },
   },
 ];

test/helpers/ExitOnDonePlugin.js

@@ -1,13 +1,16 @@
 "use strict";
 
-module.exports = {
+module.exports = class ExitOnDonePlugin {
+  // eslint-disable-next-line class-methods-use-this
   apply(compiler) {
     compiler.hooks.done.tap("webpack-dev-server", (stats) => {
       let exitCode = 0;
+
       if (stats.hasErrors()) {
         exitCode = 1;
       }
+
       setTimeout(() => process.exit(exitCode));
     });
-  },
+  }
 };