test: update tests

Author: rishabh3112

test/helpers/test-server.js

@@ -18,7 +18,7 @@ function startFullSetup(config, options, done) {
 
   const compiler = webpack(config);
 
-  server = new Server(compiler, options);
+  server = new Server(options, compiler);
 
   let port;
   if (Object.prototype.hasOwnProperty.call(options, 'port')) {

test/server/Server.test.js

@@ -15,6 +15,8 @@ const baseDevConfig = {
   static: false,
 };
 
+const createServer = (compiler, options) => new Server(options, compiler);
+
 describe('Server', () => {
   describe('sockjs', () => {
     it('add decorateConnection', () => {
@@ -48,7 +50,7 @@ describe('Server', () => {
 
     it('add hot option', (done) => {
       const compiler = webpack(config);
-      const server = new Server(
+      const server = createServer(
         compiler,
         Object.assign({}, baseDevConfig, {
           hot: true,
@@ -67,7 +69,7 @@ describe('Server', () => {
 
     it('add hot-only option', (done) => {
       const compiler = webpack(config);
-      const server = new Server(
+      const server = createServer(
         compiler,
         Object.assign({}, baseDevConfig, {
           hot: 'only',
@@ -87,7 +89,7 @@ describe('Server', () => {
 
   it('test server error reporting', () => {
     const compiler = webpack(config);
-    const server = new Server(compiler, baseDevConfig);
+    const server = createServer(compiler, baseDevConfig);
 
     const emitError = () => server.server.emit('error', new Error('Error !!!'));
 
@@ -114,7 +116,7 @@ describe('Server', () => {
       });
 
       const compiler = webpack(config);
-      const server = new Server(compiler, baseDevConfig);
+      const server = createServer(compiler, baseDevConfig);
 
       compiler.hooks.done.tap('webpack-dev-server', (s) => {
         const output = server.getStats(s);
@@ -152,7 +154,7 @@ describe('Server', () => {
         host: 'bad.host',
       };
 
-      server = new Server(compiler, options);
+      server = createServer(compiler, options);
 
       if (!server.checkHost(headers)) {
         throw new Error("Validation didn't fail");
@@ -166,7 +168,7 @@ describe('Server', () => {
       const headers = {
         host: 'localhost',
       };
-      server = new Server(compiler, options);
+      server = createServer(compiler, options);
       if (!server.checkHost(headers)) {
         throw new Error("Validation didn't fail");
       }
@@ -181,7 +183,7 @@ describe('Server', () => {
         host: '127.0.0.1',
       };
 
-      server = new Server(compiler, options);
+      server = createServer(compiler, options);
 
       if (!server.checkHost(headers)) {
         throw new Error("Validation didn't fail");
@@ -200,7 +202,7 @@ describe('Server', () => {
         '[ad42::1de2:54c2:c2fa:1234]:8080',
       ];
 
-      server = new Server(compiler, options);
+      server = createServer(compiler, options);
 
       tests.forEach((test) => {
         const headers = { host: test };
@@ -220,7 +222,7 @@ describe('Server', () => {
         host: 'test.hostname:80',
       };
 
-      server = new Server(compiler, options);
+      server = createServer(compiler, options);
 
       if (server.checkHost(headers)) {
         throw new Error("Validation didn't fail");
@@ -234,7 +236,7 @@ describe('Server', () => {
       const headers = {
         origin: 'https://test.host',
       };
-      server = new Server(compiler, options);
+      server = createServer(compiler, options);
       if (!server.checkOrigin(headers)) {
         throw new Error("Validation didn't fail");
       }
@@ -244,7 +246,7 @@ describe('Server', () => {
       it('should allow hosts in firewall', () => {
         const tests = ['test.host', 'test2.host', 'test3.host'];
         const options = { firewall: tests };
-        server = new Server(compiler, options);
+        server = createServer(compiler, options);
         tests.forEach((test) => {
           const headers = { host: test };
           if (!server.checkHost(headers)) {
@@ -255,7 +257,7 @@ describe('Server', () => {
 
       it('should allow hosts that pass a wildcard in firewall', () => {
         const options = { firewall: ['.example.com'] };
-        server = new Server(compiler, options);
+        server = createServer(compiler, options);
         const tests = [
           'www.example.com',
           'subdomain.example.com',
@@ -278,7 +280,7 @@ describe('Server', () => {
     describe('Testing callback functions on calling invalidate without callback', () => {
       it('should use default `noop` callback', (done) => {
         const compiler = webpack(config);
-        const server = new Server(compiler, baseDevConfig);
+        const server = createServer(compiler, baseDevConfig);
 
         server.invalidate();
         expect(server.middleware.context.callbacks.length).toEqual(1);
@@ -295,7 +297,7 @@ describe('Server', () => {
       it('should use `callback` function', (done) => {
         const compiler = webpack(config);
         const callback = jest.fn();
-        const server = new Server(compiler, baseDevConfig);
+        const server = createServer(compiler, baseDevConfig);
 
         server.invalidate(callback);