Skip to content

Commit

Permalink
cherry-pick(#15293): fix(config): fall back to launch options
Browse files Browse the repository at this point in the history
  • Loading branch information
pavelfeldman committed Jul 1, 2022
1 parent 354f6ea commit 2b64bca
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 2 deletions.
4 changes: 2 additions & 2 deletions packages/playwright-test/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ export const test = _baseTest.extend<TestFixtures, WorkerFixtures>({
await use(require('playwright-core'));
}
}, { scope: 'worker' } ],
headless: [ true, { scope: 'worker', option: true } ],
channel: [ undefined, { scope: 'worker', option: true } ],
headless: [ ({ launchOptions }, use) => use(launchOptions.headless ?? true), { scope: 'worker', option: true } ],
channel: [ ({ launchOptions }, use) => use(launchOptions.channel), { scope: 'worker', option: true } ],
launchOptions: [ {}, { scope: 'worker', option: true } ],
connectOptions: [ undefined, { scope: 'worker', option: true } ],
screenshot: [ 'off', { scope: 'worker', option: true } ],
Expand Down
69 changes: 69 additions & 0 deletions tests/playwright-test/playwright.config.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/**
* Copyright (c) Microsoft Corporation.
*
* 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 { test, expect } from './playwright-test-fixtures';

test('should fall back to launchOptions', async ({ runInlineTest }) => {
const result = await runInlineTest({
'playwright.config.ts': `
module.exports = {
use: {
launchOptions: {
headless: false,
channel: 'chrome',
}
}
};
`,
'a.test.ts': `
const { test } = pwt;
test('pass', async ({ headless, channel }) => {
expect.soft(headless).toBe(false);
expect.soft(channel).toBe('chrome');
});
`,
}, { workers: 1 });

expect(result.exitCode).toBe(0);
expect(result.passed).toBe(1);
});

test('should override launchOptions', async ({ runInlineTest }) => {
const result = await runInlineTest({
'playwright.config.ts': `
module.exports = {
use: {
headless: false,
channel: 'chrome',
launchOptions: {
headless: true,
channel: 'msedge',
}
}
};
`,
'a.test.ts': `
const { test } = pwt;
test('pass', async ({ headless, channel }) => {
expect.soft(headless).toBe(false);
expect.soft(channel).toBe('chrome');
});
`,
}, { workers: 1 });

expect(result.exitCode).toBe(0);
expect(result.passed).toBe(1);
});

0 comments on commit 2b64bca

Please sign in to comment.