delete 'getNewPage' and add page deleting process

pull/7076/head
baseballyama 5 years ago
parent 5f272b9d91
commit 8eb13005ac

@ -4,7 +4,7 @@ import * as http from 'http';
import { rollup } from 'rollup'; import { rollup } from 'rollup';
import virtual from '@rollup/plugin-virtual'; import virtual from '@rollup/plugin-virtual';
import puppeteer from 'puppeteer'; import puppeteer from 'puppeteer';
import { addLineNumbers, loadConfig, loadSvelte, getNewPage, retryAsync } from '../helpers'; import { addLineNumbers, loadConfig, loadSvelte, retryAsync } from '../helpers';
import { deepEqual } from 'assert'; import { deepEqual } from 'assert';
const page = ` const page = `
@ -129,11 +129,22 @@ describe('custom-elements', function () {
do { do {
count++; count++;
try { try {
const page = await getNewPage(browser); const page = await browser.newPage();
page.on('console', (type) => {
console[type._type](type._text);
});
page.on('error', error => {
console.log('>>> an error happened');
console.error(error);
});
await page.goto('http://localhost:6789'); await page.goto('http://localhost:6789');
const result = await page.evaluate(() => test(document.querySelector('main'))); const result = await page.evaluate(() => test(document.querySelector('main')));
if (result) console.log(result); if (result) console.log(result);
assertWarnings(); assertWarnings();
await page.close();
break; break;
} catch (err) { } catch (err) {
if (count === 5 || browser.isConnected()) { if (count === 5 || browser.isConnected()) {

@ -5,7 +5,6 @@ import * as path from 'path';
import * as fs from 'fs'; import * as fs from 'fs';
import * as colors from 'kleur'; import * as colors from 'kleur';
export const assert = (assert$1 as unknown) as typeof assert$1 & { htmlEqual: (actual, expected, message?) => void, htmlEqualWithComments: (actual, expected, message?) => void }; export const assert = (assert$1 as unknown) as typeof assert$1 & { htmlEqual: (actual, expected, message?) => void, htmlEqualWithComments: (actual, expected, message?) => void };
import { Browser, Page } from 'puppeteer';
// for coverage purposes, we need to test source files, // for coverage purposes, we need to test source files,
// but for sanity purposes, we need to test dist files // but for sanity purposes, we need to test dist files
@ -281,23 +280,6 @@ export function prettyPrintPuppeteerAssertionError(message) {
} }
} }
export async function getNewPage(browser: Browser): Promise<Page> {
const pages = await browser.pages();
if (pages.length) return pages[0];
const page = await browser.newPage();
page.on('console', (type) => {
console[type._type](type._text);
});
page.on('error', error => {
console.log('>>> an error happened');
console.error(error);
});
return page;
}
export async function retryAsync<T>(fn: () => Promise<T>): Promise<T> { export async function retryAsync<T>(fn: () => Promise<T>): Promise<T> {
let attempts = 0; let attempts = 0;
while (attempts <= 3) { while (attempts <= 3) {

@ -10,7 +10,6 @@ import {
loadSvelte, loadSvelte,
mkdirp, mkdirp,
prettyPrintPuppeteerAssertionError, prettyPrintPuppeteerAssertionError,
getNewPage,
retryAsync retryAsync
} from '../helpers'; } from '../helpers';
import { deepEqual } from 'assert'; import { deepEqual } from 'assert';
@ -233,11 +232,22 @@ describe('runtime (puppeteer)', function () {
do { do {
count++; count++;
try { try {
const page = await getNewPage(browser); const page = await browser.newPage();
page.on('console', (type) => {
console[type._type](type._text);
});
page.on('error', error => {
console.log('>>> an error happened');
console.error(error);
});
await page.goto('http://localhost:6789'); await page.goto('http://localhost:6789');
const result = await page.evaluate(() => test(document.querySelector('main'))); const result = await page.evaluate(() => test(document.querySelector('main')));
if (result) console.log(result); if (result) console.log(result);
assertWarnings(); assertWarnings();
await page.close();
break; break;
} catch (err) { } catch (err) {
if (count === 5 || browser.isConnected()) { if (count === 5 || browser.isConnected()) {

Loading…
Cancel
Save