chore: split playwright.fixtures into files (3) (#3984)

pavelfeldman · web-flow · commit cef27d620b93 · 2020-09-25T23:30:46.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
   },
   "devDependencies": {
     "@playwright/test": "^0.9.6",
-    "@playwright/test-runner": "^0.9.14",
+    "@playwright/test-runner": "^0.9.15",
     "@types/debug": "^4.1.5",
     "@types/extract-zip": "^1.6.2",
     "@types/mime": "^2.0.3",
diff --git a/test/browsercontext-basic.spec.ts b/test/browsercontext-basic.spec.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect, verifyViewport } from './playwright.fixtures';
+import { it, expect } from './playwright.fixtures';
+import { verifyViewport } from './utils';
 
 it('should create new context', async function({browser}) {
   expect(browser.contexts().length).toBe(0);
diff --git a/test/browsercontext-csp.spec.ts b/test/browsercontext-csp.spec.ts
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { it, expect, attachFrame } from './playwright.fixtures';
+import { it, expect } from './playwright.fixtures';
+import { attachFrame } from './utils';
 
 it('should bypass CSP meta tag', async ({browser, server}) => {
   // Make sure CSP prohibits addScriptTag.
diff --git a/test/browsercontext-user-agent.spec.ts b/test/browsercontext-user-agent.spec.ts
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { it, expect, attachFrame } from './playwright.fixtures';
+import { it, expect } from './playwright.fixtures';
+import { attachFrame } from './utils';
 
 it('should work', async ({browser, server}) => {
   {
diff --git a/test/browsercontext-viewport.spec.ts b/test/browsercontext-viewport.spec.ts
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { it, expect, verifyViewport } from './playwright.fixtures';
+import { it, expect } from './playwright.fixtures';
+import { verifyViewport } from './utils';
 
 it('should get the proper default viewport size', async ({page, server}) => {
   await verifyViewport(page, 1280, 720);
diff --git a/test/channels.spec.ts b/test/channels.spec.ts
@@ -16,10 +16,15 @@
  */
 
 import domain from 'domain';
-import { it, expect, options, playwrightFixtures } from './playwright.fixtures';
+import { options, fixtures as baseFixtures } from './playwright.fixtures';
 import type { ChromiumBrowser } from '..';
 
-playwrightFixtures.defineWorkerFixture('domain', async ({ }, test) => {
+type DomainFixtures = {
+  domain: any;
+};
+
+const fixtures = baseFixtures.declareWorkerFixtures<DomainFixtures>();
+fixtures.defineWorkerFixture('domain', async ({ }, test) => {
   const local = domain.create();
   local.run(() => { });
   let err;
@@ -29,6 +34,8 @@ playwrightFixtures.defineWorkerFixture('domain', async ({ }, test) => {
     throw err;
 });
 
+const { it, expect } = fixtures;
+
 it('should work', async ({browser}) => {
   expect(!!browser['_connection']).toBeTruthy();
 });
diff --git a/test/chromium/oopif.spec.ts b/test/chromium/oopif.spec.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { options, playwrightFixtures } from '../playwright.fixtures';
+import { options, fixtures as playwrightFixtures } from '../playwright.fixtures';
 const { it, expect, describe, overrideWorkerFixture } = playwrightFixtures;
 
 overrideWorkerFixture('browser', async ({browserType, defaultBrowserOptions}, test) => {
diff --git a/test/chromium/tracing.spec.ts b/test/chromium/tracing.spec.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { options, playwrightFixtures } from '../playwright.fixtures';
+import { options, fixtures as playwrightFixtures } from '../playwright.fixtures';
 import fs from 'fs';
 import path from 'path';
 import type { ChromiumBrowser } from '../..';
@@ -25,7 +25,6 @@ type TestState = {
 const fixtures = playwrightFixtures.declareTestFixtures<TestState>();
 const { it, expect, describe, defineTestFixture } = fixtures;
 
-
 defineTestFixture('outputTraceFile', async ({testOutputDir}, test) => {
   await test(path.join(testOutputDir, `trace.json`));
 });
diff --git a/test/click.spec.ts b/test/click.spec.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect, options, attachFrame } from './playwright.fixtures';
+import { it, expect, options } from './playwright.fixtures';
+import { attachFrame } from './utils';
 
 async function giveItAChanceToClick(page) {
   for (let i = 0; i < 5; i++)
diff --git a/test/defaultbrowsercontext-1.spec.ts b/test/defaultbrowsercontext-1.spec.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect, verifyViewport } from './playwright.fixtures';
+import { it, expect } from './playwright.fixtures';
+import { verifyViewport } from './utils';
 import fs from 'fs';
 
 it('context.cookies() should work', async ({server, launchPersistent}) => {
diff --git a/test/downloads-path.spec.ts b/test/downloads-path.spec.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { playwrightFixtures } from './playwright.fixtures';
+import { fixtures as baseFixtures } from './playwright.fixtures';
 
 import fs from 'fs';
 import type { Browser, BrowserContext } from '..';
@@ -23,7 +23,7 @@ type TestState = {
   downloadsBrowser: Browser;
   persistentDownloadsContext: BrowserContext;
 };
-const fixtures = playwrightFixtures.declareTestFixtures<TestState>();
+const fixtures = baseFixtures.declareTestFixtures<TestState>();
 const { it, expect, defineTestFixture } = fixtures;
 
 defineTestFixture('downloadsBrowser', async ({server, browserType, defaultBrowserOptions, testOutputDir}, test) => {
diff --git a/test/electron/electron.fixture.ts b/test/electron/electron.fixture.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { playwrightFixtures } from '../playwright.fixtures';
+import { fixtures as baseFixtures } from '../playwright.fixtures';
 import type {ElectronApplication, ElectronLauncher, ElectronPage} from '../../electron-types';
 import path from 'path';
 
@@ -25,7 +25,7 @@ type TestState = {
   window: ElectronPage;
 };
 
-export const electronFixtures = playwrightFixtures.declareTestFixtures<TestState>();
+export const electronFixtures = baseFixtures.declareTestFixtures<TestState>();
 const { defineTestFixture } = electronFixtures;
 
 declare module '../../index' {
diff --git a/test/elementhandle-content-frame.spec.ts b/test/elementhandle-content-frame.spec.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect, attachFrame } from './playwright.fixtures';
+import { it, expect } from './playwright.fixtures';
+import { attachFrame } from './utils';
 
 it('should work', async ({ page, server }) => {
   await page.goto(server.EMPTY_PAGE);
diff --git a/test/elementhandle-owner-frame.spec.ts b/test/elementhandle-owner-frame.spec.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect, options, attachFrame } from './playwright.fixtures';
+import { it, expect, options } from './playwright.fixtures';
+import { attachFrame } from './utils';
 
 it('should work', async ({ page, server }) => {
   await page.goto(server.EMPTY_PAGE);
diff --git a/test/elementhandle-screenshot.spec.ts b/test/elementhandle-screenshot.spec.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect, describe, options, verifyViewport } from './playwright.fixtures';
+import { it, expect, describe, options } from './playwright.fixtures';
+import { verifyViewport } from './utils';
 
 import {PNG} from 'pngjs';
 import path from 'path';
diff --git a/test/emulation-focus.spec.ts b/test/emulation-focus.spec.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect, options, attachFrame } from './playwright.fixtures';
+import { it, expect, options } from './playwright.fixtures';
+import { attachFrame } from './utils';
 
 it('should think that it is focused by default', async ({page}) => {
   expect(await page.evaluate('document.hasFocus()')).toBe(true);
diff --git a/test/frame-evaluate.spec.ts b/test/frame-evaluate.spec.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect, options, attachFrame, detachFrame } from './playwright.fixtures';
+import { it, expect, options } from './playwright.fixtures';
+import { attachFrame, detachFrame } from './utils';
 
 import type { Frame } from '../src/client/frame';
 
diff --git a/test/frame-frame-element.spec.ts b/test/frame-frame-element.spec.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect, attachFrame } from './playwright.fixtures';
+import { it, expect } from './playwright.fixtures';
+import { attachFrame } from './utils';
 
 it('should work', async ({page, server}) => {
   await page.goto(server.EMPTY_PAGE);
diff --git a/test/frame-goto.spec.ts b/test/frame-goto.spec.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect, attachFrame } from './playwright.fixtures';
+import { it, expect } from './playwright.fixtures';
+import { attachFrame } from './utils';
 
 it('should navigate subframes', async ({page, server}) => {
   await page.goto(server.PREFIX + '/frames/one-frame.html');
diff --git a/test/frame-hierarchy.spec.ts b/test/frame-hierarchy.spec.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect, options, attachFrame, detachFrame } from './playwright.fixtures';
+import { it, expect, options } from './playwright.fixtures';
+import { attachFrame, detachFrame } from './utils';
 import type { Frame } from '../index';
 
 function dumpFrames(frame: Frame, indentation: string = ''): string[] {
diff --git a/test/http.fixtures.ts b/test/http.fixtures.ts
@@ -17,8 +17,6 @@
 import { fixtures as baseFixtures } from '@playwright/test-runner';
 import path from 'path';
 import { TestServer } from '../utils/testserver';
-export { expect } from '@playwright/test';
-export { config } from '@playwright/test-runner';
 
 type HttpWorkerFixtures = {
   asset: (path: string) => string;
diff --git a/test/impl.fixtures.ts b/test/impl.fixtures.ts
@@ -0,0 +1,29 @@
+/**
+ * Copyright Microsoft Corporation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { fixtures as playwrightFixtures } from './upstream.fixtures';
+
+type ImplWorkerFixtures = {
+  toImpl: (rpcObject: any) => any;
+};
+
+export const fixtures = playwrightFixtures
+    .declareWorkerFixtures<ImplWorkerFixtures>();
+const { defineWorkerFixture } = fixtures;
+
+defineWorkerFixture('toImpl', async ({ playwright }, test) => {
+  await test((playwright as any)._toImpl);
+});
diff --git a/test/keyboard.spec.ts b/test/keyboard.spec.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect, options, attachFrame } from './playwright.fixtures';
+import { it, expect, options } from './playwright.fixtures';
+import { attachFrame } from './utils';
 
 it('should type into a textarea', async ({page}) => {
   await page.evaluate(() => {
diff --git a/test/network-request.spec.ts b/test/network-request.spec.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect, options, attachFrame } from './playwright.fixtures';
+import { it, expect, options } from './playwright.fixtures';
+import { attachFrame } from './utils';
 
 it('should work for main frame navigation request', async ({page, server}) => {
   const requests = [];
diff --git a/test/page-emulate-media.spec.ts b/test/page-emulate-media.spec.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect, attachFrame } from './playwright.fixtures';
+import { it, expect } from './playwright.fixtures';
+import { attachFrame } from './utils';
 
 it('should emulate type', async ({page, server}) => {
   expect(await page.evaluate(() => matchMedia('screen').matches)).toBe(true);
diff --git a/test/page-event-request.spec.ts b/test/page-event-request.spec.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect, attachFrame } from './playwright.fixtures';
+import { it, expect } from './playwright.fixtures';
+import { attachFrame } from './utils';
 
 it('should fire for navigation requests', async ({page, server}) => {
   const requests = [];
diff --git a/test/page-goto.spec.ts b/test/page-goto.spec.ts
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-import { it, expect, options } from './playwright.fixtures';
-
 import path from 'path';
 import url from 'url';
+import { expect, it, options } from './playwright.fixtures';
+import { expectedSSLError } from './utils';
 
 it('should work', async ({page, server}) => {
   await page.goto(server.EMPTY_PAGE);
@@ -173,23 +173,23 @@ it('should fail when navigating to bad url', async ({page, isChromium, isWebKit}
     expect(error.message).toContain('Invalid url');
 });
 
-it('should fail when navigating to bad SSL', async ({page, httpsServer, expectedSSLError}) => {
+it('should fail when navigating to bad SSL', async ({page, browserName, httpsServer}) => {
   // Make sure that network events do not emit 'undefined'.
   // @see https://crbug.com/750469
   page.on('request', request => expect(request).toBeTruthy());
   page.on('requestfinished', request => expect(request).toBeTruthy());
   page.on('requestfailed', request => expect(request).toBeTruthy());
   let error = null;
   await page.goto(httpsServer.EMPTY_PAGE).catch(e => error = e);
-  expect(error.message).toContain(expectedSSLError);
+  expect(error.message).toContain(expectedSSLError(browserName));
 });
 
-it('should fail when navigating to bad SSL after redirects', async ({page, server, httpsServer, expectedSSLError}) => {
+it('should fail when navigating to bad SSL after redirects', async ({page, browserName, server, httpsServer}) => {
   server.setRedirect('/redirect/1.html', '/redirect/2.html');
   server.setRedirect('/redirect/2.html', '/empty.html');
   let error = null;
   await page.goto(httpsServer.PREFIX + '/redirect/1.html').catch(e => error = e);
-  expect(error.message).toContain(expectedSSLError);
+  expect(error.message).toContain(expectedSSLError(browserName));
 });
 
 it('should not crash when navigating to bad SSL after a cross origin navigation', async ({page, server, httpsServer}) => {
diff --git a/test/page-screenshot.spec.ts b/test/page-screenshot.spec.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { it, expect, describe, options, verifyViewport } from './playwright.fixtures';
+import { it, expect, describe, options } from './playwright.fixtures';
+import { verifyViewport } from './utils';
 import path from 'path';
 import fs from 'fs';
 
diff --git a/test/page-wait-for-navigation.spec.ts b/test/page-wait-for-navigation.spec.ts
diff --git a/test/playwright.fixtures.ts b/test/playwright.fixtures.ts
diff --git a/test/remoteServer.fixture.ts b/test/remoteServer.fixture.ts
diff --git a/test/screencast.spec.ts b/test/screencast.spec.ts
diff --git a/test/slowmo.spec.ts b/test/slowmo.spec.ts
diff --git a/test/upstream.fixtures.ts b/test/upstream.fixtures.ts
diff --git a/test/utils.ts b/test/utils.ts
diff --git a/test/wait-for-selector-1.spec.ts b/test/wait-for-selector-1.spec.ts
diff --git a/test/wait-for-selector-2.spec.ts b/test/wait-for-selector-2.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@`
`14`	`14`	`* See the License for the specific language governing permissions and`
`15`	`15`	`* limitations under the License.`
`16`	`16`	`*/`
`17`		`-import { it, expect, attachFrame } from './playwright.fixtures';`
	`17`	`+import { it, expect } from './playwright.fixtures';`
	`18`	`+import { attachFrame } from './utils';`
`18`	`19`
`19`	`20`	`it('should work', async ({browser, server}) => {`
`20`	`21`	`{`