From 749ede3af81acccd71b09edb191fcbf6f10b6d9b Mon Sep 17 00:00:00 2001 From: DIYgod Date: Thu, 13 Jun 2019 18:37:55 +0800 Subject: [PATCH] test: puppeteer auto close --- lib/utils/puppeteer.js | 4 ++-- test/utils/puppeteer.js | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/utils/puppeteer.js b/lib/utils/puppeteer.js index 3cfe61a218..87741100d7 100644 --- a/lib/utils/puppeteer.js +++ b/lib/utils/puppeteer.js @@ -18,10 +18,10 @@ module.exports = async () => { browser = await puppeteer.launch(options); } setTimeout(async () => { - if ((await browser.process()).signalCode) { + if ((await browser.process()).exitCode === null) { browser.close(); } - }, 5000); + }, 10000); return browser; }; diff --git a/test/utils/puppeteer.js b/test/utils/puppeteer.js index 9ce37366c6..154ed03527 100644 --- a/test/utils/puppeteer.js +++ b/test/utils/puppeteer.js @@ -1,10 +1,11 @@ const puppeteer = require('../../lib/utils/puppeteer'); +const wait = require('../../lib/utils/wait'); describe('puppeteer', () => { it('puppeteer run', async () => { const browser = await puppeteer(); const page = await browser.newPage(); - await page.goto('https://github.com/DIYgod/RSSHub', { + await page.goto('https://www.google.com', { waitUntil: 'domcontentloaded', }); @@ -12,6 +13,8 @@ describe('puppeteer', () => { const html = await page.evaluate(() => document.body.innerHTML); expect(html.length).toBeGreaterThan(0); - await browser.close(); - }, 10000); + expect((await browser.process()).exitCode).toBe(null); + await wait(10 * 1000); + expect((await browser.process()).exitCode).toBe(0); + }, 20000); });