From 8eb13005ac4cfec17865a4b62f2bab088682a226 Mon Sep 17 00:00:00 2001
From: baseballyama <xydybaseball@gmail.com>
Date: Sat, 1 Jan 2022 11:28:19 +0900
Subject: [PATCH] delete 'getNewPage' and add page deleting process

---
 test/custom-elements/index.ts   | 15 +++++++++++++--
 test/helpers.ts                 | 18 ------------------
 test/runtime-puppeteer/index.ts | 14 ++++++++++++--
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/test/custom-elements/index.ts b/test/custom-elements/index.ts
index 10e74bdaf4..e833406f78 100644
--- a/test/custom-elements/index.ts
+++ b/test/custom-elements/index.ts
@@ -4,7 +4,7 @@ import * as http from 'http';
 import { rollup } from 'rollup';
 import virtual from '@rollup/plugin-virtual';
 import puppeteer from 'puppeteer';
-import { addLineNumbers, loadConfig, loadSvelte, getNewPage, retryAsync } from '../helpers';
+import { addLineNumbers, loadConfig, loadSvelte, retryAsync } from '../helpers';
 import { deepEqual } from 'assert';
 
 const page = `
@@ -129,11 +129,22 @@ describe('custom-elements', function () {
 			do {
 				count++;
 				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');
 					const result = await page.evaluate(() => test(document.querySelector('main')));
 					if (result) console.log(result);
 					assertWarnings();
+					await page.close();
 					break;
 				} catch (err) {
 					if (count === 5 || browser.isConnected()) {
diff --git a/test/helpers.ts b/test/helpers.ts
index bd561e16bf..930d2de94c 100644
--- a/test/helpers.ts
+++ b/test/helpers.ts
@@ -5,7 +5,6 @@ import * as path from 'path';
 import * as fs from 'fs';
 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 };
-import { Browser, Page } from 'puppeteer';
 
 // for coverage purposes, we need to test source 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> {
 	let attempts = 0;
 	while (attempts <= 3) {
diff --git a/test/runtime-puppeteer/index.ts b/test/runtime-puppeteer/index.ts
index 969777c1ee..641a3d6a59 100644
--- a/test/runtime-puppeteer/index.ts
+++ b/test/runtime-puppeteer/index.ts
@@ -10,7 +10,6 @@ import {
 	loadSvelte,
 	mkdirp,
 	prettyPrintPuppeteerAssertionError,
-	getNewPage,
 	retryAsync
 } from '../helpers';
 import { deepEqual } from 'assert';
@@ -233,11 +232,22 @@ describe('runtime (puppeteer)', function () {
 			do {
 				count++;
 				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');
 					const result = await page.evaluate(() => test(document.querySelector('main')));
 					if (result) console.log(result);
 					assertWarnings();
+					await page.close();
 					break;
 				} catch (err) {
 					if (count === 5 || browser.isConnected()) {