test: move files in utils in subfolder

.mocharc.cjs

@@ -11,7 +11,7 @@ if (!!process.env.DEBUGGER_ATTACHED) {
 module.exports = {
  reporter: 'dot',
  logLevel: 'debug',
- require: ['./test/build/mocha-utils.js', 'source-map-support/register'],
+ require: ['./test/build/utils/mocha-utils.js', 'source-map-support/register'],
  exit: !!process.env.CI,
  retries: process.env.CI ? 3 : 0,
  parallel: !!process.env.PARALLEL,

packages/browsers/.mocharc.cjs

@@ -1,7 +1,7 @@
 module.exports = {
  logLevel: 'debug',
  spec: 'test/build/**/*.spec.js',
- require: ['./test/build/mocha-utils.js'],
+ require: ['./test/build/utils/mocha-utils.js'],
  exit: !!process.env.CI,
  reporter: 'spec',
  timeout: 10_000,

test/src/accessibility.spec.ts

@@ -9,7 +9,7 @@ import assert from 'assert';
 import expect from 'expect';
 import type {SerializedAXNode} from 'puppeteer-core/internal/cdp/Accessibility.js';
 
-import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
 
 describe('Accessibility', function () {
  setupTestBrowserHooks();

test/src/ariaqueryhandler.spec.ts

@@ -10,8 +10,8 @@ import expect from 'expect';
 import {TimeoutError} from 'puppeteer';
 import type {ElementHandle} from 'puppeteer-core/internal/api/ElementHandle.js';
 
-import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
-import {attachFrame, detachFrame} from './utils.js';
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
+import {attachFrame, detachFrame} from './utils/utils.js';
 
 describe('AriaQueryHandler', () => {
  setupTestBrowserHooks();

test/src/autofill.spec.ts

@@ -6,7 +6,7 @@
 
 import expect from 'expect';
 
-import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
 
 describe('Autofill', function () {
  setupTestBrowserHooks();

test/src/browser.spec.ts

@@ -6,7 +6,11 @@
 
 import expect from 'expect';
 
-import {getTestState, launch, setupTestBrowserHooks} from './mocha-utils.js';
+import {
+ getTestState,
+ launch,
+ setupTestBrowserHooks,
+} from './utils/mocha-utils.js';
 
 describe('Browser specs', function () {
  setupTestBrowserHooks();

test/src/browsercontext.spec.ts

@@ -8,8 +8,8 @@ import expect from 'expect';
 import {TimeoutError} from 'puppeteer';
 import type {Page} from 'puppeteer-core/internal/api/Page.js';
 
-import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
-import {waitEvent} from './utils.js';
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
+import {waitEvent} from './utils/utils.js';
 
 describe('BrowserContext', function () {
  setupTestBrowserHooks();

test/src/cdp/CDPSession.spec.ts

@@ -8,8 +8,8 @@ import expect from 'expect';
 import type {Target} from 'puppeteer-core/internal/api/Target.js';
 import {isErrorLike} from 'puppeteer-core/internal/util/ErrorLike.js';
 
-import {getTestState, setupTestBrowserHooks} from '../mocha-utils.js';
-import {waitEvent} from '../utils.js';
+import {getTestState, setupTestBrowserHooks} from '../utils/mocha-utils.js';
+import {waitEvent} from '../utils/utils.js';
 
 describe('Target.createCDPSession', function () {
  setupTestBrowserHooks();

test/src/cdp/TargetManager.spec.ts

@@ -7,8 +7,8 @@
 import expect from 'expect';
 import type {CdpBrowser} from 'puppeteer-core/internal/cdp/Browser.js';
 
-import {getTestState, launch} from '../mocha-utils.js';
-import {attachFrame} from '../utils.js';
+import {getTestState, launch} from '../utils/mocha-utils.js';
+import {attachFrame} from '../utils/utils.js';
 
 describe('TargetManager', () => {
  /* We use a special browser for this test as we need the --site-per-process flag */

test/src/cdp/bfcache.spec.ts

@@ -7,8 +7,8 @@
 import expect from 'expect';
 import {PageEvent} from 'puppeteer-core';
 
-import {launch} from '../mocha-utils.js';
-import {waitEvent} from '../utils.js';
+import {launch} from '../utils/mocha-utils.js';
+import {waitEvent} from '../utils/utils.js';
 
 describe('BFCache', function () {
  it('can navigate to a BFCached page', async () => {

test/src/cdp/devtools.spec.ts

@@ -7,7 +7,7 @@
 import expect from 'expect';
 import type {PuppeteerLaunchOptions} from 'puppeteer-core/internal/node/PuppeteerNode.js';
 
-import {getTestState, launch} from '../mocha-utils.js';
+import {getTestState, launch} from '../utils/mocha-utils.js';
 
 describe('DevTools', function () {
  /* These tests fire up an actual browser so let's

test/src/cdp/extensions.spec.ts

@@ -9,7 +9,7 @@ import path from 'path';
 import expect from 'expect';
 import type {PuppeteerLaunchOptions} from 'puppeteer-core/internal/node/PuppeteerNode.js';
 
-import {getTestState, launch} from '../mocha-utils.js';
+import {getTestState, launch} from '../utils/mocha-utils.js';
 
 const extensionPath = path.join(
  __dirname,

test/src/cdp/pdf.spec.ts

@@ -8,7 +8,7 @@ import {readFile, unlink} from 'fs/promises';
 
 import expect from 'expect';
 
-import {getTestState, setupTestBrowserHooks} from '../mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from '../utils/mocha-utils.js';
 
 describe('Page.pdf', () => {
  setupTestBrowserHooks();

test/src/cdp/prerender.spec.ts

@@ -8,8 +8,8 @@ import {statSync} from 'fs';
 
 import expect from 'expect';
 
-import {getTestState, setupTestBrowserHooks} from '../mocha-utils.js';
-import {getUniqueVideoFilePlaceholder} from '../utils.js';
+import {getTestState, setupTestBrowserHooks} from '../utils/mocha-utils.js';
+import {getUniqueVideoFilePlaceholder} from '../utils/utils.js';
 
 describe('Prerender', function () {
  setupTestBrowserHooks();

test/src/cdp/queryObjects.spec.ts

@@ -5,7 +5,7 @@
  */
 import expect from 'expect';
 
-import {getTestState, setupTestBrowserHooks} from '../mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from '../utils/mocha-utils.js';
 
 describe('page.queryObjects', function () {
  setupTestBrowserHooks();

test/src/cdp/screencast.spec.ts

@@ -8,8 +8,8 @@ import {statSync} from 'fs';
 
 import expect from 'expect';
 
-import {getTestState, setupTestBrowserHooks} from '../mocha-utils.js';
-import {getUniqueVideoFilePlaceholder} from '../utils.js';
+import {getTestState, setupTestBrowserHooks} from '../utils/mocha-utils.js';
+import {getUniqueVideoFilePlaceholder} from '../utils/utils.js';
 
 describe('Screencasts', function () {
  setupTestBrowserHooks();

test/src/chromiumonly.spec.ts

@@ -8,8 +8,12 @@ import type {IncomingMessage} from 'http';
 import expect from 'expect';
 import {Deferred} from 'puppeteer-core/internal/util/Deferred.js';
 
-import {getTestState, setupTestBrowserHooks, launch} from './mocha-utils.js';
-import {waitEvent} from './utils.js';
+import {
+ getTestState,
+ setupTestBrowserHooks,
+ launch,
+} from './utils/mocha-utils.js';
+import {waitEvent} from './utils/utils.js';
 // TODO: rename this test suite to launch/connect test suite as it actually
 // works across browsers.
 describe('Chromium-Specific Launcher tests', function () {

test/src/click.spec.ts

@@ -7,8 +7,8 @@
 import expect from 'expect';
 import {KnownDevices} from 'puppeteer';
 
-import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
-import {attachFrame} from './utils.js';
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
+import {attachFrame} from './utils/utils.js';
 
 describe('Page.click', function () {
  setupTestBrowserHooks();

test/src/cookies.spec.ts

@@ -10,7 +10,7 @@ import {
  getTestState,
  launch,
  setupTestBrowserHooks,
-} from './mocha-utils.js';
+} from './utils/mocha-utils.js';
 
 describe('Cookie specs', () => {
  setupTestBrowserHooks();

test/src/coverage.spec.ts

@@ -6,7 +6,7 @@
 
 import expect from 'expect';
 
-import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
 
 describe('Coverage specs', function () {
  setupTestBrowserHooks();

test/src/debugInfo.spec.ts

@@ -6,7 +6,7 @@
 
 import expect from 'expect';
 
-import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
 
 describe('DebugInfo', function () {
  setupTestBrowserHooks();

test/src/defaultbrowsercontext.spec.ts

@@ -9,7 +9,7 @@ import {
  expectCookieEquals,
  getTestState,
  setupTestBrowserHooks,
-} from './mocha-utils.js';
+} from './utils/mocha-utils.js';
 
 describe('DefaultBrowserContext', function () {
  setupTestBrowserHooks();

test/src/device-request-prompt.spec.ts

@@ -6,7 +6,7 @@
 import expect from 'expect';
 import {TimeoutError} from 'puppeteer';
 
-import {launch} from './mocha-utils.js';
+import {launch} from './utils/mocha-utils.js';
 
 describe('device request prompt', function () {
  let state: Awaited<ReturnType<typeof launch>>;

test/src/dialog.spec.ts

@@ -6,7 +6,7 @@
 import expect from 'expect';
 import sinon from 'sinon';
 
-import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
 
 describe('Page.Events.Dialog', function () {
  setupTestBrowserHooks();

test/src/drag-and-drop.spec.ts

@@ -8,7 +8,7 @@ import assert from 'assert';
 
 import expect from 'expect';
 
-import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
 
 async function getDragState() {
  const {page} = await getTestState({skipLaunch: true});

test/src/elementhandle.spec.ts

@@ -13,12 +13,11 @@ import {
 } from 'puppeteer-core/internal/util/disposable.js';
 import sinon from 'sinon';
 
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
 import {
- getTestState,
- setupTestBrowserHooks,
+ attachFrame,
  shortWaitForArrayToHaveAtLeastNElements,
-} from './mocha-utils.js';
-import {attachFrame} from './utils.js';
+} from './utils/utils.js';
 
 describe('ElementHandle specs', function () {
  setupTestBrowserHooks();

test/src/emulation.spec.ts

@@ -7,7 +7,7 @@
 import expect from 'expect';
 import {KnownDevices, PredefinedNetworkConditions} from 'puppeteer';
 
-import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
 
 const iPhone = KnownDevices['iPhone 6'];
 const iPhoneLandscape = KnownDevices['iPhone 6 landscape'];

test/src/evaluation.spec.ts

@@ -6,8 +6,8 @@
 
 import expect from 'expect';
 
-import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
-import {attachFrame} from './utils.js';
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
+import {attachFrame} from './utils/utils.js';
 
 describe('Evaluation specs', function () {
  setupTestBrowserHooks();

test/src/fixtures.spec.ts

@@ -9,8 +9,8 @@ import path from 'path';
 
 import expect from 'expect';
 
-import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
-import {waitEvent} from './utils.js';
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
+import {waitEvent} from './utils/utils.js';
 
 describe('Fixtures', function () {
  setupTestBrowserHooks();

test/src/frame.spec.ts

@@ -9,14 +9,14 @@ import {CDPSession} from 'puppeteer-core/internal/api/CDPSession.js';
 import type {Frame} from 'puppeteer-core/internal/api/Frame.js';
 import {assert} from 'puppeteer-core/internal/util/assert.js';
 
-import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
 import {
  attachFrame,
  detachFrame,
  dumpFrames,
  navigateFrame,
  waitEvent,
-} from './utils.js';
+} from './utils/utils.js';
 
 describe('Frame specs', function () {
  setupTestBrowserHooks();

test/src/headful.spec.ts

@@ -12,7 +12,7 @@ import expect from 'expect';
 import type {PuppeteerLaunchOptions} from 'puppeteer-core/internal/node/PuppeteerNode.js';
 import {rmSync} from 'puppeteer-core/internal/node/util/fs.js';
 
-import {getTestState, launch} from './mocha-utils.js';
+import {getTestState, launch} from './utils/mocha-utils.js';
 
 const TMP_FOLDER = path.join(os.tmpdir(), 'pptr_tmp_folder-');
 

test/src/idle_override.spec.ts

@@ -8,7 +8,7 @@ import expect from 'expect';
 import type {ElementHandle} from 'puppeteer-core/internal/api/ElementHandle.js';
 import type {Page} from 'puppeteer-core/internal/api/Page.js';
 
-import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
 
 describe('Emulate idle state', () => {
  setupTestBrowserHooks();

test/src/ignorehttpserrors.spec.ts

@@ -9,7 +9,7 @@ import type {TLSSocket} from 'tls';
 import expect from 'expect';
 import type {HTTPResponse} from 'puppeteer-core/internal/api/HTTPResponse.js';
 
-import {launch} from './mocha-utils.js';
+import {launch} from './utils/mocha-utils.js';
 
 describe('ignoreHTTPSErrors', function () {
  /* Note that this test creates its own browser rather than use

test/src/injected.spec.ts

@@ -7,7 +7,7 @@
 import expect from 'expect';
 import {LazyArg} from 'puppeteer-core/internal/common/LazyArg.js';
 
-import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
 
 describe('PuppeteerUtil tests', function () {
  setupTestBrowserHooks();

test/src/input.spec.ts

@@ -9,8 +9,8 @@ import path from 'path';
 import expect from 'expect';
 import {TimeoutError} from 'puppeteer';
 
-import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
-import {waitEvent} from './utils.js';
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
+import {waitEvent} from './utils/utils.js';
 
 const FILE_TO_UPLOAD = path.join(__dirname, '/../assets/file-to-upload.txt');
 

test/src/jshandle.spec.ts

@@ -12,7 +12,7 @@ import {
 } from 'puppeteer-core/internal/util/disposable.js';
 import sinon from 'sinon';
 
-import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
 
 describe('JSHandle', function () {
  setupTestBrowserHooks();

test/src/keyboard.spec.ts

@@ -9,8 +9,8 @@ import os from 'os';
 import expect from 'expect';
 import type {KeyInput} from 'puppeteer-core/internal/common/USKeyboardLayout.js';
 
-import {getTestState, setupTestBrowserHooks} from './mocha-utils.js';
-import {attachFrame} from './utils.js';
+import {getTestState, setupTestBrowserHooks} from './utils/mocha-utils.js';
+import {attachFrame} from './utils/utils.js';
 
 describe('Keyboard', function () {
  setupTestBrowserHooks();

test/src/launcher.spec.ts

@@ -16,8 +16,8 @@ import type {Page} from 'puppeteer-core/internal/api/Page.js';
 import {rmSync} from 'puppeteer-core/internal/node/util/fs.js';
 import sinon from 'sinon';
 
-import {getTestState, launch} from './mocha-utils.js';
-import {dumpFrames, waitEvent} from './utils.js';
+import {getTestState, launch} from './utils/mocha-utils.js';
+import {dumpFrames, waitEvent} from './utils/utils.js';
 
 const TMP_FOLDER = path.join(os.tmpdir(), 'pptr_tmp_folder-');
 const FIREFOX_TIMEOUT = 30_000;