test(server): refactor Server.test.js (#1920)

Author: hiroppy

test/Server.test.js

@@ -12,66 +12,65 @@ opn.mockImplementation(() => {
     catch: jest.fn(),
   };
 });
+jest.mock('sockjs/lib/transport');
+// eslint-disable-next-line import/newline-after-import
+const sockjs = require('sockjs/lib/transport');
 const Server = require('../lib/Server');
 const config = require('./fixtures/simple-config/webpack.config');
 const testServer = require('./helpers/test-server');
 
 describe('Server', () => {
+  describe('sockjs', () => {
+    it('add decorateConnection', () => {
+      expect(typeof sockjs.Session.prototype.decorateConnection).toEqual(
+        'function'
+      );
+    });
+  });
+
   describe('addEntries', () => {
-    it('add hot option', () => {
-      return new Promise((res) => {
-        // eslint-disable-next-line
-        const Server = require('../lib/Server');
-        const compiler = webpack(config);
-        const server = new Server(compiler, {
-          hot: true,
-        });
+    it('add hot option', (done) => {
+      const compiler = webpack(config);
+      const server = new Server(compiler, {
+        hot: true,
+      });
 
-        expect(
-          server.middleware.context.compiler.options.entry.map((p) => {
-            return relative('.', p).split(sep);
-          })
-        ).toMatchSnapshot();
-        expect(
-          server.middleware.context.compiler.options.plugins
-        ).toMatchSnapshot();
-
-        compiler.hooks.done.tap('webpack-dev-server', () => {
-          server.close(() => {
-            res();
-          });
-        });
+      expect(
+        server.middleware.context.compiler.options.entry.map((p) => {
+          return relative('.', p).split(sep);
+        })
+      ).toMatchSnapshot();
+      expect(
+        server.middleware.context.compiler.options.plugins
+      ).toMatchSnapshot();
 
-        compiler.run(() => {});
+      compiler.hooks.done.tap('webpack-dev-server', () => {
+        server.close(done);
       });
+
+      compiler.run(() => {});
     });
 
-    it('add hotOnly option', () => {
-      return new Promise((res) => {
-        // eslint-disable-next-line
-        const Server = require('../lib/Server');
-        const compiler = webpack(config);
-        const server = new Server(compiler, {
-          hotOnly: true,
-        });
+    it('add hotOnly option', (done) => {
+      const compiler = webpack(config);
+      const server = new Server(compiler, {
+        hotOnly: true,
+      });
 
-        expect(
-          server.middleware.context.compiler.options.entry.map((p) => {
-            return relative('.', p).split(sep);
-          })
-        ).toMatchSnapshot();
-        expect(
-          server.middleware.context.compiler.options.plugins
-        ).toMatchSnapshot();
-
-        compiler.hooks.done.tap('webpack-dev-server', () => {
-          server.close(() => {
-            res();
-          });
-        });
+      expect(
+        server.middleware.context.compiler.options.entry.map((p) => {
+          return relative('.', p).split(sep);
+        })
+      ).toMatchSnapshot();
+      expect(
+        server.middleware.context.compiler.options.plugins
+      ).toMatchSnapshot();
 
-        compiler.run(() => {});
+      compiler.hooks.done.tap('webpack-dev-server', () => {
+        server.close(done);
       });
+
+      compiler.run(() => {});
     });
   });
 
@@ -85,10 +84,7 @@ describe('Server', () => {
       jest.unmock('express');
     });
 
-    it("should success even if mine.types doesn't exist", () => {
-      // eslint-disable-next-line
-      const Server = require('../lib/Server');
-
+    it("should success even if mine.types doesn't exist", (done) => {
       jest.mock('express', () => {
         const data = jest.requireActual('express');
         const { static: st } = data;
@@ -105,22 +101,18 @@ describe('Server', () => {
         });
       });
 
-      return new Promise((res) => {
-        const compiler = webpack(config);
-        const server = new Server(compiler);
-
-        compiler.hooks.done.tap('webpack-dev-server', (s) => {
-          const output = server.getStats(s);
-          expect(output.errors.length).toEqual(0);
+      const compiler = webpack(config);
+      const server = new Server(compiler);
 
-          server.close(() => {
-            res();
-          });
-        });
+      compiler.hooks.done.tap('webpack-dev-server', (s) => {
+        const output = server.getStats(s);
+        expect(output.errors.length).toEqual(0);
 
-        compiler.run(() => {});
-        server.listen(8080, 'localhost');
+        server.close(done);
       });
+
+      compiler.run(() => {});
+      server.listen(8080, 'localhost');
     });
   });
 
@@ -137,86 +129,60 @@ describe('Server', () => {
         },
       ];
 
-      return new Promise((resolve, reject) => {
-        (function iterate(stats, i) {
-          if (i === allStats.length) {
-            return resolve();
-          }
-
-          // Iterate to cover each case.
-          Promise.resolve()
-            .then(
-              () =>
-                new Promise((res) => {
-                  const compiler = webpack(config);
-                  const server = new Server(compiler, { stats });
-
-                  compiler.hooks.done.tap('webpack-dev-server', (s) => {
-                    expect(Object.keys(server.getStats(s))).toMatchSnapshot();
-
-                    server.close(() => {
-                      res();
-                    });
-                  });
-
-                  compiler.run(() => {});
-                  server.listen(8080, 'localhost');
-                })
-            )
-            .then(() => {
-              i += 1;
-              iterate(allStats[i], i);
-            })
-            .catch((e) => {
-              reject(e);
+      return allStats.reduce((p, stats) => {
+        return p.then(() => {
+          return new Promise((resolve) => {
+            const compiler = webpack(config);
+            const server = new Server(compiler, { stats });
+
+            compiler.hooks.done.tap('webpack-dev-server', (s) => {
+              expect(Object.keys(server.getStats(s))).toMatchSnapshot();
+
+              server.close(resolve);
             });
-        })(allStats[0], 0);
-      });
-    });
 
-    it('should respect warningsFilter', () => {
-      return new Promise((res) => {
-        const compiler = webpack(config);
-        const server = new Server(compiler, {
-          stats: { warningsFilter: 'test' },
+            compiler.run(() => {});
+            server.listen(8080, 'localhost');
+          });
         });
+      }, Promise.resolve());
+    });
 
-        compiler.hooks.done.tap('webpack-dev-server', (s) => {
-          s.compilation.warnings = ['test', 'another warning'];
+    it('should respect warningsFilter', (done) => {
+      const compiler = webpack(config);
+      const server = new Server(compiler, {
+        stats: { warningsFilter: 'test' },
+      });
 
-          const output = server.getStats(s);
+      compiler.hooks.done.tap('webpack-dev-server', (s) => {
+        s.compilation.warnings = ['test', 'another warning'];
 
-          expect(output.warnings.length).toBe(1);
-          expect(output.warnings[0]).toBe('another warning');
+        const output = server.getStats(s);
 
-          server.close(() => {
-            res();
-          });
-        });
+        expect(output.warnings.length).toBe(1);
+        expect(output.warnings[0]).toBe('another warning');
 
-        compiler.run(() => {});
-        server.listen(8080, 'localhost');
+        server.close(done);
       });
-    });
 
-    it('should open', () => {
-      return new Promise((res) => {
-        const compiler = webpack(config);
-        const server = new Server(compiler, {
-          open: true,
-        });
+      compiler.run(() => {});
+      server.listen(8080, 'localhost');
+    });
 
-        compiler.hooks.done.tap('webpack-dev-server', () => {
-          expect(opn.mock.calls[0]).toEqual(['http://localhost:8080/', {}]);
-          expect(opn.mock.invocationCallOrder[0]).toEqual(1);
-          server.close(() => {
-            res();
-          });
-        });
+    it('should open', (done) => {
+      const compiler = webpack(config);
+      const server = new Server(compiler, {
+        open: true,
+      });
 
-        compiler.run(() => {});
-        server.listen(8080, 'localhost');
+      compiler.hooks.done.tap('webpack-dev-server', () => {
+        expect(opn.mock.calls[0]).toEqual(['http://localhost:8080/', {}]);
+        expect(opn.mock.invocationCallOrder[0]).toEqual(1);
+        server.close(done);
       });
+
+      compiler.run(() => {});
+      server.listen(8080, 'localhost');
     });
   });