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

tests: use run-server for mode=service tests, restrict to page tests only (#19435)

Browse source
This commit is contained in:
Dmitry Gozman 2022-12-13 16:03:53 -08:00 committed by GitHub
parent d1559a0fcc
commit b97900b925
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tests/library/playwright.config.ts
View file

@ -69,14 +69,23 @@ const config: Config<CoverageWorkerOptions & PlaywrightWorkerOptions & Playwrigh
['html', { open: 'on-failure' }] ['html', { open: 'on-failure' }]
], ],
projects: [], projects: [],
use: {}, use: {
connectOptions: mode === 'service' ? {
wsEndpoint: 'ws://localhost:3333/',
} : undefined,
},
webServer: mode === 'service' ? {
command: 'npx playwright run-server --port=3333',
port: 3333,
reuseExistingServer: !process.env.CI,
} : undefined,
}; };
if (mode === 'service') { if (mode === 'service2') {
config.webServer = { config.webServer = {
command: 'npx playwright experimental-grid-server --auth-token=mysecret --address=http://localhost:3333 --port=3333', command: 'npx playwright experimental-grid-server --auth-token=mysecret --address=http://localhost:3333 --port=3333',
port: 3333, port: 3333,
reuseExistingServer: true, reuseExistingServer: !process.env.CI,
env: { env: {
PWTEST_UNSAFE_GRID_VERSION: '1', PWTEST_UNSAFE_GRID_VERSION: '1',
}, },
@ -106,17 +115,6 @@ if (mode === 'service') {
}]; }];
} }
if (mode === 'service2') {
config.webServer = {
command: 'npx playwright run-server --port=3333',
port: 3333,
reuseExistingServer: true,
};
config.use.connectOptions = {
wsEndpoint: 'ws://localhost:3333/',
};
}
const browserNames = ['chromium', 'webkit', 'firefox'] as BrowserName[]; const browserNames = ['chromium', 'webkit', 'firefox'] as BrowserName[];
for (const browserName of browserNames) { for (const browserName of browserNames) {
const executablePath = getExecutablePath(browserName); const executablePath = getExecutablePath(browserName);
@ -125,6 +123,8 @@ for (const browserName of browserNames) {
const devtools = process.env.DEVTOOLS === '1'; const devtools = process.env.DEVTOOLS === '1';
const testIgnore: RegExp[] = browserNames.filter(b => b !== browserName).map(b => new RegExp(b)); const testIgnore: RegExp[] = browserNames.filter(b => b !== browserName).map(b => new RegExp(b));
for (const folder of ['library', 'page']) { for (const folder of ['library', 'page']) {
if (mode === 'service' && folder === 'library')
continue;
config.projects.push({ config.projects.push({
name: browserName, name: browserName,
testDir: path.join(testDir, folder), testDir: path.join(testDir, folder),