test: fix

Author: alexander-akait

test/server/webSocketServer-option.test.js

@@ -13,7 +13,7 @@ const BaseServer = require('../../lib/servers/BaseServer');
 const port = require('../ports-map')['webSocketServer-option'];
 
 describe('webSocketServer', () => {
-  describe.only('server', () => {
+  describe('server', () => {
     let mockedTestServer;
     let testServer;
     let server;
@@ -56,6 +56,7 @@ describe('webSocketServer', () => {
             class MockServer {
               // eslint-disable-next-line no-empty-function
               onConnection() {}
+              close() {}
             }
         );
       });
@@ -199,7 +200,7 @@ describe('webSocketServer', () => {
                 constructor(serv) {
                   super(serv);
 
-                  this.socket = sockjs.createServer({
+                  this.implementation = sockjs.createServer({
                     // Use provided up-to-date sockjs-client
                     sockjs_url: '/__webpack_dev_server__/sockjs.bundle.js',
                     // Limit useless logs
@@ -214,23 +215,33 @@ describe('webSocketServer', () => {
                     },
                   });
 
-                  this.socket.installHandlers(this.server.server, {
+                  this.implementation.installHandlers(this.server.server, {
                     prefix: 'ws',
                   });
 
                   customServerUsed = true;
                 }
 
-                send(connection, message) {
-                  connection.write(message);
+                close(callback) {
+                  [...this.server.sockets].forEach((socket) => {
+                    this.closeConnection(socket);
+                  });
+
+                  if (callback) {
+                    callback();
+                  }
                 }
 
-                close(connection) {
+                closeConnection(connection) {
                   connection.close();
                 }
 
+                send(connection, message) {
+                  connection.write(message);
+                }
+
                 onConnection(f) {
-                  this.socket.on('connection', (connection) => {
+                  this.implementation.on('connection', (connection) => {
                     f(connection, connection.headers);
                   });
                 }
@@ -278,21 +289,22 @@ describe('webSocketServer', () => {
               webSocketServer: class MySockJSServer extends BaseServer {
                 constructor(serv) {
                   super(serv);
-
-                  this.socket = sockjs.createServer({
+                  this.implementation = sockjs.createServer({
                     // Use provided up-to-date sockjs-client
                     sockjs_url: '/__webpack_dev_server__/sockjs.bundle.js',
                     // Limit useless logs
                     log: (severity, line) => {
                       if (severity === 'error') {
                         this.server.logger.error(line);
+                      } else if (severity === 'info') {
+                        this.server.logger.log(line);
                       } else {
                         this.server.logger.debug(line);
                       }
                     },
                   });
 
-                  this.socket.installHandlers(this.server.server, {
+                  this.implementation.installHandlers(this.server.server, {
                     prefix: '/ws',
                   });
                 }
@@ -301,12 +313,22 @@ describe('webSocketServer', () => {
                   connection.write(message);
                 }
 
-                close(connection) {
+                close(callback) {
+                  [...this.server.sockets].forEach((socket) => {
+                    this.closeConnection(socket);
+                  });
+
+                  if (callback) {
+                    callback();
+                  }
+                }
+
+                closeConnection(connection) {
                   connection.close();
                 }
 
                 onConnection(f) {
-                  this.socket.on('connection', (connection) => {
+                  this.implementation.on('connection', (connection) => {
                     f(connection);
                   });
                 }
@@ -377,7 +399,7 @@ describe('webSocketServer', () => {
               webSocketServer: class MySockJSServer extends BaseServer {
                 constructor(serv) {
                   super(serv);
-                  this.socket = sockjs.createServer({
+                  this.implementation = sockjs.createServer({
                     // Use provided up-to-date sockjs-client
                     sockjs_url: '/__webpack_dev_server__/sockjs.bundle.js',
                     // Limit useless logs
@@ -392,7 +414,7 @@ describe('webSocketServer', () => {
                     },
                   });
 
-                  this.socket.installHandlers(this.server.server, {
+                  this.implementation.installHandlers(this.server.server, {
                     prefix: '/ws',
                   });
                 }
@@ -401,12 +423,22 @@ describe('webSocketServer', () => {
                   connection.write(message);
                 }
 
-                close(connection) {
+                close(callback) {
+                  [...this.server.sockets].forEach((socket) => {
+                    this.closeConnection(socket);
+                  });
+
+                  if (callback) {
+                    callback();
+                  }
+                }
+
+                closeConnection(connection) {
                   connection.close();
                 }
 
                 onConnection(f) {
-                  this.socket.on('connection', (connection) => {
+                  this.implementation.on('connection', (connection) => {
                     f(connection, {
                       host: null,
                     });
@@ -530,7 +562,7 @@ describe('webSocketServer', () => {
         expect(mockServerInstance.onConnection.mock.calls).toMatchSnapshot();
         // the only call to send() here should be an invalid header message
         expect(mockServerInstance.send.mock.calls).toMatchSnapshot();
-        expect(mockServerInstance.close.mock.calls).toMatchSnapshot();
+        expect(mockServerInstance.closeConnection.mock.calls).toMatchSnapshot();
         // onConnectionClose should never get called since the client should be closed first
         expect(mockServerInstance.onConnectionClose.mock.calls.length).toEqual(
           0