Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(test-runner): wrong test-runner options got determined (#10607)

Browse source 
Follow-up for #10507
This commit is contained in:
Max Schmitt 2021-11-30 19:59:35 +01:00 committed by GitHub
parent 0936ce2bbd
commit 682d1f41c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/playwright-test/src/index.ts
View file

@ -21,7 +21,6 @@ import type { TestType, PlaywrightTestArgs, PlaywrightTestOptions, PlaywrightWor
import { rootTestType } from './testType'; import { rootTestType } from './testType';
import { createGuid, removeFolders } from 'playwright-core/lib/utils/utils'; import { createGuid, removeFolders } from 'playwright-core/lib/utils/utils';
import { GridClient } from 'playwright-core/lib/grid/gridClient'; import { GridClient } from 'playwright-core/lib/grid/gridClient';
import { chromium, firefox, webkit } from 'playwright-core';
import { prependToTestError } from './util'; import { prependToTestError } from './util';
export { expect } from './expect'; export { expect } from './expect';
export const _baseTest: TestType<{}, {}> = rootTestType.test; export const _baseTest: TestType<{}, {}> = rootTestType.test;
@ -172,7 +171,7 @@ export const test = _baseTest.extend<TestFixtures, WorkerFixtures>({
_snapshotSuffix: [process.env.PLAYWRIGHT_DOCKER ? 'docker' : process.platform, { scope: 'worker' }], _snapshotSuffix: [process.env.PLAYWRIGHT_DOCKER ? 'docker' : process.platform, { scope: 'worker' }],
_setupContextOptionsAndArtifacts: [async ({ _snapshotSuffix, _combinedContextOptions, _artifactsDir, trace, screenshot, actionTimeout, navigationTimeout }, use, testInfo) => { _setupContextOptionsAndArtifacts: [async ({ playwright, _snapshotSuffix, _combinedContextOptions, _artifactsDir, trace, screenshot, actionTimeout, navigationTimeout }, use, testInfo) => {
testInfo.snapshotSuffix = _snapshotSuffix; testInfo.snapshotSuffix = _snapshotSuffix;
if (process.env.PWDEBUG) if (process.env.PWDEBUG)
testInfo.setTimeout(0); testInfo.setTimeout(0);
@ -248,7 +247,7 @@ export const test = _baseTest.extend<TestFixtures, WorkerFixtures>({
}; };
// 1. Setup instrumentation and process existing contexts. // 1. Setup instrumentation and process existing contexts.
for (const browserType of [chromium, firefox, webkit]) { for (const browserType of [playwright.chromium, playwright.firefox, playwright.webkit]) {
(browserType as any)._onDidCreateContext = onDidCreateContext; (browserType as any)._onDidCreateContext = onDidCreateContext;
(browserType as any)._onWillCloseContext = onWillCloseContext; (browserType as any)._onWillCloseContext = onWillCloseContext;
(browserType as any)._defaultContextOptions = _combinedContextOptions; (browserType as any)._defaultContextOptions = _combinedContextOptions;
@ -283,7 +282,7 @@ export const test = _baseTest.extend<TestFixtures, WorkerFixtures>({
// 4. Cleanup instrumentation. // 4. Cleanup instrumentation.
const leftoverContexts: BrowserContext[] = []; const leftoverContexts: BrowserContext[] = [];
for (const browserType of [chromium, firefox, webkit]) { for (const browserType of [playwright.chromium, playwright.firefox, playwright.webkit]) {
leftoverContexts.push(...(browserType as any)._contexts); leftoverContexts.push(...(browserType as any)._contexts);
(browserType as any)._onDidCreateContext = undefined; (browserType as any)._onDidCreateContext = undefined;
(browserType as any)._onWillCloseContext = undefined; (browserType as any)._onWillCloseContext = undefined;