From 3989160467871d080f3e9637225e2c63c301348f Mon Sep 17 00:00:00 2001 From: Kirill Nagaitsev Date: Tue, 11 Jun 2019 15:58:57 -0500 Subject: [PATCH] test(e2e): make browser close before tests run --- test/e2e/Client.test.js | 24 ++++++------ test/e2e/ClientOptions.test.js | 72 +++++++++++++++++++++------------- test/e2e/ProvidePlugin.test.js | 12 ++++-- 3 files changed, 64 insertions(+), 44 deletions(-) diff --git a/test/e2e/Client.test.js b/test/e2e/Client.test.js index 2803b12b90..90eb2ffe5a 100644 --- a/test/e2e/Client.test.js +++ b/test/e2e/Client.test.js @@ -48,8 +48,6 @@ describe('reload', () => { return bgColor; }) .then((color) => { - expect(color).toEqual('rgb(0, 0, 255)'); - page.setRequestInterception(true).then(() => { page.on('request', (req) => { if ( @@ -66,8 +64,6 @@ describe('reload', () => { 'body { background-color: rgb(255, 0, 0); }' ); page.waitFor(10000).then(() => { - expect(refreshed).toBeFalsy(); - page .evaluate(() => { const body = document.body; @@ -77,8 +73,12 @@ describe('reload', () => { return bgColor; }) .then((color2) => { - expect(color2).toEqual('rgb(255, 0, 0)'); - browser.close().then(done); + browser.close().then(() => { + expect(color).toEqual('rgb(0, 0, 255)'); + expect(color2).toEqual('rgb(255, 0, 0)'); + expect(refreshed).toBeFalsy(); + done(); + }); }); }); }); @@ -126,8 +126,6 @@ describe('reload', () => { return bgColor; }) .then((color) => { - expect(color).toEqual('rgb(0, 0, 255)'); - page.setRequestInterception(true).then(() => { page.on('request', (req) => { if ( @@ -144,8 +142,6 @@ describe('reload', () => { 'body { background-color: rgb(255, 0, 0); }' ); page.waitFor(10000).then(() => { - expect(refreshed).toBeTruthy(); - page .evaluate(() => { const body = document.body; @@ -155,8 +151,12 @@ describe('reload', () => { return bgColor; }) .then((color2) => { - expect(color2).toEqual('rgb(255, 0, 0)'); - browser.close().then(done); + browser.close().then(() => { + expect(color).toEqual('rgb(0, 0, 255)'); + expect(color2).toEqual('rgb(255, 0, 0)'); + expect(refreshed).toBeTruthy(); + done(); + }); }); }); }); diff --git a/test/e2e/ClientOptions.test.js b/test/e2e/ClientOptions.test.js index 1d9bcd931b..3fb4160245 100644 --- a/test/e2e/ClientOptions.test.js +++ b/test/e2e/ClientOptions.test.js @@ -69,10 +69,14 @@ describe('Client code', () => { page .waitForRequest((requestObj) => requestObj.url().match(/sockjs-node/)) .then((requestObj) => { - expect( - requestObj.url().includes(`http://localhost:${port1}/sockjs-node`) - ).toBeTruthy(); - browser.close().then(done); + browser.close().then(() => { + expect( + requestObj + .url() + .includes(`http://localhost:${port1}/sockjs-node`) + ).toBeTruthy(); + done(); + }); }); page.goto(`http://localhost:${port2}/main`); }); @@ -105,12 +109,14 @@ describe('Client complex inline script path', () => { requestObj.url().match(/foo\/test\/bar/) ) .then((requestObj) => { - expect( - requestObj - .url() - .includes(`http://myhost.test:${port2}/foo/test/bar/`) - ).toBeTruthy(); - browser.close().then(done); + browser.close().then(() => { + expect( + requestObj + .url() + .includes(`http://myhost.test:${port2}/foo/test/bar/`) + ).toBeTruthy(); + done(); + }); }); page.goto(`http://localhost:${port2}/main`); }); @@ -143,12 +149,14 @@ describe('Client complex inline script path with sockPort', () => { requestObj.url().match(/foo\/test\/bar/) ) .then((requestObj) => { - expect( - requestObj - .url() - .includes(`http://localhost:${port3}/foo/test/bar`) - ).toBeTruthy(); - browser.close().then(done); + browser.close().then(() => { + expect( + requestObj + .url() + .includes(`http://localhost:${port3}/foo/test/bar`) + ).toBeTruthy(); + done(); + }); }); page.goto(`http://localhost:${port2}/main`); @@ -182,10 +190,14 @@ describe('Client complex inline script path with sockPort, no sockPath', () => { page .waitForRequest((requestObj) => requestObj.url().match(/sockjs-node/)) .then((requestObj) => { - expect( - requestObj.url().includes(`http://localhost:${port3}/sockjs-node`) - ).toBeTruthy(); - browser.close().then(done); + browser.close().then(() => { + expect( + requestObj + .url() + .includes(`http://localhost:${port3}/sockjs-node`) + ).toBeTruthy(); + done(); + }); }); page.goto(`http://localhost:${port2}/main`); }); @@ -215,12 +227,14 @@ describe('Client complex inline script path with sockHost', () => { page .waitForRequest((requestObj) => requestObj.url().match(/sockjs-node/)) .then((requestObj) => { - expect( - requestObj - .url() - .includes(`http://myhost.test:${port2}/sockjs-node`) - ).toBeTruthy(); - browser.close().then(done); + browser.close().then(() => { + expect( + requestObj + .url() + .includes(`http://myhost.test:${port2}/sockjs-node`) + ).toBeTruthy(); + done(); + }); }); page.goto(`http://localhost:${port2}/main`); }); @@ -286,8 +300,10 @@ describe('Client console.log', () => { res.push(_text); }); setTimeout(() => { - expect(res).toMatchSnapshot(); - browser.close().then(resolve); + browser.close().then(() => { + expect(res).toMatchSnapshot(); + resolve(); + }); }, 1000); }); }) diff --git a/test/e2e/ProvidePlugin.test.js b/test/e2e/ProvidePlugin.test.js index d200f3aed9..99d44cf910 100644 --- a/test/e2e/ProvidePlugin.test.js +++ b/test/e2e/ProvidePlugin.test.js @@ -30,8 +30,10 @@ describe('ProvidePlugin', () => { return window.injectedClient === window.expectedClient; }) .then((isCorrectClient) => { - expect(isCorrectClient).toBeTruthy(); - browser.close().then(done); + browser.close().then(() => { + expect(isCorrectClient).toBeTruthy(); + done(); + }); }); }); page.goto(`http://localhost:${port}/main`); @@ -65,8 +67,10 @@ describe('ProvidePlugin', () => { return window.injectedClient === undefined; }) .then((isCorrectClient) => { - expect(isCorrectClient).toBeTruthy(); - browser.close().then(done); + browser.close().then(() => { + expect(isCorrectClient).toBeTruthy(); + done(); + }); }); }); page.goto(`http://localhost:${port}/main`);