From 34f3219d40b5f198a21e2ce92c4562855c9c948e Mon Sep 17 00:00:00 2001 From: Kirill Nagaitsev Date: Mon, 1 Jul 2019 10:29:51 -0500 Subject: [PATCH] test(server): rearrange bad host test --- .../serverMode-option.test.js.snap | 2 +- test/server/serverMode-option.test.js | 130 +++++++++--------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/test/server/__snapshots__/serverMode-option.test.js.snap b/test/server/__snapshots__/serverMode-option.test.js.snap index a7ad43ca4e..b7bc465557 100644 --- a/test/server/__snapshots__/serverMode-option.test.js.snap +++ b/test/server/__snapshots__/serverMode-option.test.js.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`serverMode option with a bad host header results in an error 1`] = ` +exports[`serverMode option passed to server with a bad host header results in an error 1`] = ` Array [ "open", "{\\"type\\":\\"error\\",\\"data\\":\\"Invalid Host/Origin header\\"}", diff --git a/test/server/serverMode-option.test.js b/test/server/serverMode-option.test.js index 21b2b81d79..246b80a11e 100644 --- a/test/server/serverMode-option.test.js +++ b/test/server/serverMode-option.test.js @@ -229,80 +229,80 @@ describe('serverMode option', () => { }).toThrow(/serverMode must be a string/); }); }); - }); - describe('with a bad host header', () => { - beforeAll((done) => { - server = testServer.start( - config, - { - port, - serverMode: class MySockJSServer extends BaseServer { - constructor(serv) { - super(serv); - this.socket = 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.log.error(line); - } else { - this.server.log.debug(line); - } - }, - }); - - this.socket.installHandlers(this.server.listeningApp, { - prefix: this.server.sockPath, - }); - } - - send(connection, message) { - connection.write(message); - } - - close(connection) { - connection.close(); - } - - onConnection(f) { - this.socket.on('connection', (connection) => { - f(connection, { - host: null, + describe('with a bad host header', () => { + beforeAll((done) => { + server = testServer.start( + config, + { + port, + serverMode: class MySockJSServer extends BaseServer { + constructor(serv) { + super(serv); + this.socket = 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.log.error(line); + } else { + this.server.log.debug(line); + } + }, }); - }); - } - onConnectionClose(connection, f) { - connection.on('close', f); - } + this.socket.installHandlers(this.server.listeningApp, { + prefix: this.server.sockPath, + }); + } + + send(connection, message) { + connection.write(message); + } + + close(connection) { + connection.close(); + } + + onConnection(f) { + this.socket.on('connection', (connection) => { + f(connection, { + host: null, + }); + }); + } + + onConnectionClose(connection, f) { + connection.on('close', f); + } + }, }, - }, - done - ); - }); + done + ); + }); - it('results in an error', (done) => { - const data = []; - const client = new SockJS(`http://localhost:${port}/sockjs-node`); + it('results in an error', (done) => { + const data = []; + const client = new SockJS(`http://localhost:${port}/sockjs-node`); - client.onopen = () => { - data.push('open'); - }; + client.onopen = () => { + data.push('open'); + }; - client.onmessage = (e) => { - data.push(e.data); - }; + client.onmessage = (e) => { + data.push(e.data); + }; - client.onclose = () => { - data.push('close'); - }; + client.onclose = () => { + data.push('close'); + }; - setTimeout(() => { - expect(data).toMatchSnapshot(); - done(); - }, 5000); + setTimeout(() => { + expect(data).toMatchSnapshot(); + done(); + }, 5000); + }); }); }); });