chore: readd browser setup hook (#10478)

puppeteer · Jul 3, 2023 · d0d738d · d0d738d
1 parent 87aaed4
commit d0d738d
Show file tree

Hide file tree

Showing 43 changed files with 320 additions and 177 deletions.
diff --git a/test/src/CDPSession.spec.ts b/test/src/CDPSession.spec.ts
@@ -17,10 +17,12 @@
 import expect from 'expect';
 import {isErrorLike} from 'puppeteer-core/internal/util/ErrorLike.js';
 
-import {getTestState} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
 import {waitEvent} from './utils.js';
 
 describe('Target.createCDPSession', function () {
+  setupTestBrowserHooks();
+
   it('should work', async () => {
     const {page} = await getTestState();
 

diff --git a/test/src/TargetManager.spec.ts b/test/src/TargetManager.spec.ts
@@ -22,15 +22,15 @@ import {attachFrame} from './utils.js';
 
 describe('TargetManager', () => {
   /* We use a special browser for this test as we need the --site-per-process flag */
-  let testState: Awaited<ReturnType<typeof launch>> & {
+  let state: Awaited<ReturnType<typeof launch>> & {
     browser: CDPBrowser;
   };
 
   beforeEach(async () => {
     const {defaultBrowserOptions} = await getTestState({
       skipLaunch: true,
     });
-    testState = (await launch(
+    state = (await launch(
       Object.assign({}, defaultBrowserOptions, {
         args: (defaultBrowserOptions.args || []).concat([
           '--site-per-process',
@@ -45,11 +45,11 @@ describe('TargetManager', () => {
   });
 
   afterEach(async () => {
-    await testState.close();
+    await state.close();
   });
 
   it('should handle targets', async () => {
-    const {server, context, browser} = testState;
+    const {server, context, browser} = state;
 
     const targetManager = browser._targetManager();
     expect(targetManager.getAvailableTargets().size).toBe(2);

diff --git a/test/src/accessibility.spec.ts b/test/src/accessibility.spec.ts
@@ -19,9 +19,11 @@ import assert from 'assert';
 import expect from 'expect';
 import {SerializedAXNode} from 'puppeteer-core/internal/common/Accessibility.js';
 
-import {getTestState} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
 
 describe('Accessibility', function () {
+  setupTestBrowserHooks();
+
   it('should work', async () => {
     const {page, isFirefox} = await getTestState();
 

diff --git a/test/src/ariaqueryhandler.spec.ts b/test/src/ariaqueryhandler.spec.ts
@@ -20,10 +20,12 @@ import expect from 'expect';
 import {TimeoutError} from 'puppeteer';
 import type {ElementHandle} from 'puppeteer-core/internal/api/ElementHandle.js';
 
-import {getTestState} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
 import {attachFrame, detachFrame} from './utils.js';
 
 describe('AriaQueryHandler', () => {
+  setupTestBrowserHooks();
+
   describe('parseAriaSelector', () => {
     it('should find button', async () => {
       const {page} = await getTestState();

diff --git a/test/src/browser.spec.ts b/test/src/browser.spec.ts
@@ -16,9 +16,11 @@
 
 import expect from 'expect';
 
-import {getTestState} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
 
 describe('Browser specs', function () {
+  setupTestBrowserHooks();
+
   describe('Browser.version', function () {
     it('should return version', async () => {
       const {browser} = await getTestState();

diff --git a/test/src/browsercontext.spec.ts b/test/src/browsercontext.spec.ts
@@ -17,10 +17,12 @@
 import expect from 'expect';
 import {TimeoutError} from 'puppeteer';
 
-import {getTestState} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
 import {waitEvent} from './utils.js';
 
 describe('BrowserContext', function () {
+  setupTestBrowserHooks();
+
   it('should have default context', async () => {
     const {browser} = await getTestState({
       skipContextCreation: true,
@@ -240,7 +242,6 @@ describe('BrowserContext', function () {
     expect(browser.browserContexts()[0]!.id).toBeUndefined();
 
     const context = await browser.createIncognitoBrowserContext();
-    console.log('2');
     expect(browser.browserContexts()).toHaveLength(2);
     expect(browser.browserContexts()[1]!.id).toBeDefined();
     await context.close();

diff --git a/test/src/chromiumonly.spec.ts b/test/src/chromiumonly.spec.ts
@@ -16,10 +16,10 @@
 import {IncomingMessage} from 'http';
 
 import expect from 'expect';
+import {Deferred} from 'puppeteer-core/internal/util/Deferred.js';
 
-import {getTestState, launch} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks, launch} from './mocha-utils.js';
 import {waitEvent} from './utils.js';
-
 // TODO: rename this test suite to launch/connect test suite as it actually
 // works across browsers.
 describe('Chromium-Specific Launcher tests', function () {
@@ -124,13 +124,19 @@ describe('Chromium-Specific Launcher tests', function () {
         await close();
       }
     });
-    it('should fire "disconnected" when closing with pipe', async () => {
+    it('should fire "disconnected" when closing with pipe', async function () {
       const {browser, close} = await launch({pipe: true});
       try {
         const disconnectedEventPromise = waitEvent(browser, 'disconnected');
         // Emulate user exiting browser.
         browser.process()!.kill();
-        await disconnectedEventPromise;
+        await Deferred.race([
+          disconnectedEventPromise,
+          Deferred.create({
+            message: `Failed in after Hook`,
+            timeout: this.timeout() - 1000,
+          }),
+        ]);
       } finally {
         await close();
       }
@@ -139,6 +145,8 @@ describe('Chromium-Specific Launcher tests', function () {
 });
 
 describe('Chromium-Specific Page Tests', function () {
+  setupTestBrowserHooks();
+
   it('Page.setRequestInterception should work with intervention headers', async () => {
     const {server, page} = await getTestState();
 

diff --git a/test/src/click.spec.ts b/test/src/click.spec.ts
@@ -17,10 +17,12 @@
 import expect from 'expect';
 import {KnownDevices} from 'puppeteer';
 
-import {getTestState} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
 import {attachFrame} from './utils.js';
 
 describe('Page.click', function () {
+  setupTestBrowserHooks();
+
   it('should click the button', async () => {
     const {page, server} = await getTestState();
 

diff --git a/test/src/cookies.spec.ts b/test/src/cookies.spec.ts
@@ -15,9 +15,16 @@
  */
 import expect from 'expect';
 
-import {expectCookieEquals, getTestState, launch} from './mocha-utils.js';
+import {
+  expectCookieEquals,
+  getTestState,
+  launch,
+  setupTestBrowserHooks,
+} from './mocha-utils.js';
 
 describe('Cookie specs', () => {
+  setupTestBrowserHooks();
+
   describe('Page.cookies', function () {
     it('should return no cookies in pristine browser context', async () => {
       const {page, server} = await getTestState();

diff --git a/test/src/coverage.spec.ts b/test/src/coverage.spec.ts
@@ -16,9 +16,11 @@
 
 import expect from 'expect';
 
-import {getTestState} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
 
 describe('Coverage specs', function () {
+  setupTestBrowserHooks();
+
   describe('JSCoverage', function () {
     it('should work', async () => {
       const {page, server} = await getTestState();
@@ -269,7 +271,6 @@ describe('Coverage specs', function () {
       await page.goto(server.PREFIX + '/csscoverage/media.html');
       const coverage = await page.coverage.stopCSSCoverage();
       expect(coverage).toHaveLength(1);
-      console.log(coverage);
       expect(coverage[0]!.url).toContain('/csscoverage/media.html');
       expect(coverage[0]!.ranges).toEqual([{start: 8, end: 40}]);
     });

diff --git a/test/src/defaultbrowsercontext.spec.ts b/test/src/defaultbrowsercontext.spec.ts
@@ -15,9 +15,15 @@
  */
 import expect from 'expect';
 
-import {expectCookieEquals, getTestState} from './mocha-utils.js';
+import {
+  expectCookieEquals,
+  getTestState,
+  setupTestBrowserHooks,
+} from './mocha-utils.js';
 
 describe('DefaultBrowserContext', function () {
+  setupTestBrowserHooks();
+
   it('page.cookies() should work', async () => {
     const {page, server} = await getTestState();
 

diff --git a/test/src/dialog.spec.ts b/test/src/dialog.spec.ts
@@ -16,9 +16,11 @@
 import expect from 'expect';
 import sinon from 'sinon';
 
-import {getTestState} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
 
 describe('Page.Events.Dialog', function () {
+  setupTestBrowserHooks();
+
   it('should fire', async () => {
     const {page} = await getTestState();
 

diff --git a/test/src/drag-and-drop.spec.ts b/test/src/drag-and-drop.spec.ts
@@ -16,9 +16,11 @@
 
 import expect from 'expect';
 
-import {getTestState} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
 
 describe('Input.drag', function () {
+  setupTestBrowserHooks();
+
   it('should throw an exception if not enabled before usage', async () => {
     const {page, server} = await getTestState();
 

diff --git a/test/src/elementhandle.spec.ts b/test/src/elementhandle.spec.ts
@@ -21,11 +21,14 @@ import sinon from 'sinon';
 
 import {
   getTestState,
+  setupTestBrowserHooks,
   shortWaitForArrayToHaveAtLeastNElements,
 } from './mocha-utils.js';
 import {attachFrame} from './utils.js';
 
 describe('ElementHandle specs', function () {
+  setupTestBrowserHooks();
+
   describe('ElementHandle.boundingBox', function () {
     it('should work', async () => {
       const {page, server} = await getTestState();

diff --git a/test/src/emulation.spec.ts b/test/src/emulation.spec.ts
@@ -17,12 +17,14 @@
 import expect from 'expect';
 import {KnownDevices, PredefinedNetworkConditions} from 'puppeteer';
 
-import {getTestState} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
 
 const iPhone = KnownDevices['iPhone 6'];
 const iPhoneLandscape = KnownDevices['iPhone 6 landscape'];
 
 describe('Emulation', () => {
+  setupTestBrowserHooks();
+
   describe('Page.viewport', function () {
     it('should get the proper viewport size', async () => {
       const {page} = await getTestState();

diff --git a/test/src/evaluation.spec.ts b/test/src/evaluation.spec.ts
@@ -16,10 +16,12 @@
 
 import expect from 'expect';
 
-import {getTestState} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
 import {attachFrame} from './utils.js';
 
 describe('Evaluation specs', function () {
+  setupTestBrowserHooks();
+
   describe('Page.evaluate', function () {
     it('should work', async () => {
       const {page} = await getTestState();

diff --git a/test/src/fixtures.spec.ts b/test/src/fixtures.spec.ts
@@ -20,10 +20,12 @@ import path from 'path';
 
 import expect from 'expect';
 
-import {getTestState} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
 import {waitEvent} from './utils.js';
 
 describe('Fixtures', function () {
+  setupTestBrowserHooks();
+
   it('dumpio option should work with pipe option', async () => {
     const {defaultBrowserOptions, puppeteerPath, headless} =
       await getTestState();
@@ -49,7 +51,6 @@ describe('Fixtures', function () {
     await new Promise(resolve => {
       return res.on('close', resolve);
     });
-    console.log(dumpioData);
     expect(dumpioData).toContain('message from dumpio');
   });
   it('should dump browser process stderr', async () => {

diff --git a/test/src/frame.spec.ts b/test/src/frame.spec.ts
@@ -18,7 +18,7 @@ import expect from 'expect';
 import {Frame} from 'puppeteer-core/internal/api/Frame.js';
 import {CDPSession} from 'puppeteer-core/internal/common/Connection.js';
 
-import {getTestState} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
 import {
   attachFrame,
   detachFrame,
@@ -28,6 +28,8 @@ import {
 } from './utils.js';
 
 describe('Frame specs', function () {
+  setupTestBrowserHooks();
+
   describe('Frame.executionContext', function () {
     it('should work', async () => {
       const {page, server} = await getTestState();

diff --git a/test/src/idle_override.spec.ts b/test/src/idle_override.spec.ts
@@ -18,9 +18,11 @@ import expect from 'expect';
 import {ElementHandle} from 'puppeteer-core/internal/api/ElementHandle.js';
 import {Page} from 'puppeteer-core/internal/api/Page.js';
 
-import {getTestState} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
 
 describe('Emulate idle state', () => {
+  setupTestBrowserHooks();
+
   async function getIdleState(page: Page) {
     const stateElement = (await page.$('#state')) as ElementHandle<HTMLElement>;
     return await page.evaluate(element => {