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

fix(ui-mode): respec --tsconfig option

Browse source 
Fixes https://github.com/microsoft/playwright/issues/32797
This commit is contained in:
Yury Semikhatsky 2024-09-24 16:18:44 -07:00
parent fbeba6619a
commit 3917f5e842
6 changed files with 72 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/playwright-core/src/server/trace/viewer/traceViewer.ts
View file

@ -48,6 +48,7 @@ export type TraceViewerRedirectOptions = {
isServer?: boolean;
outputDir?: string;
updateSnapshots?: 'all' | 'none' | 'missing';
tsconfig?: string;
};
export type TraceViewerAppOptions = {
@ -137,6 +138,8 @@ export async function installRootRedirect(server: HttpServer, traceUrls: string[
params.append('outputDir', options.outputDir);
if (options.updateSnapshots)
params.append('updateSnapshots', options.updateSnapshots);
if (options.tsconfig)
params.append('tsconfig', options.tsconfig);
for (const reporter of options.reporter || [])
params.append('reporter', reporter);

4
packages/playwright/src/isomorphic/testServerInterface.ts
View file

@ -45,7 +45,7 @@ export interface TestServerInterface {
installBrowsers(params: {}): Promise<void>;
runGlobalSetup(params: { outputDir?: string }): Promise<{
runGlobalSetup(params: { outputDir?: string, tsconfig?: string }): Promise<{
report: ReportEntry[],
status: reporterTypes.FullResult['status']
}>;
@ -83,6 +83,7 @@ export interface TestServerInterface {
grep?: string;
grepInvert?: string;
outputDir?: string;
tsconfig?: string;
}): Promise<{
report: ReportEntry[],
status: reporterTypes.FullResult['status']
@ -98,6 +99,7 @@ export interface TestServerInterface {
timeout?: number,
outputDir?: string;
updateSnapshots?: 'all' | 'none' | 'missing';
tsconfig?: string;
reporters?: string[],
trace?: 'on' | 'off';
video?: 'on' | 'off';

1
packages/playwright/src/program.ts
View file

@ -174,6 +174,7 @@ async function runTests(args: string[], opts: { [key: string]: any }) {
timeout: cliOverrides.timeout,
outputDir: cliOverrides.outputDir,
updateSnapshots: cliOverrides.updateSnapshots,
tsconfig: cliOverrides.tsconfig,
});
await stopProfiling('runner');
if (status === 'restarted')

3
packages/playwright/src/runner/testServer.ts
View file

@ -147,6 +147,7 @@ export class TestServerDispatcher implements TestServerInterface {
const overrides: ConfigCLIOverrides = {
outputDir: params.outputDir,
tsconfig: params.tsconfig,
};
const { reporter, report } = await this._collectingInternalReporter(new ListReporter());
const config = await this._loadConfigOrReportError(reporter, overrides);
@ -242,6 +243,7 @@ export class TestServerDispatcher implements TestServerInterface {
repeatEach: 1,
retries: 0,
outputDir: params.outputDir,
tsconfig: params.tsconfig,
};
const { reporter, report } = await this._collectingInternalReporter();
const config = await this._loadConfigOrReportError(reporter, overrides);
@ -308,6 +310,7 @@ export class TestServerDispatcher implements TestServerInterface {
_optionConnectOptions: params.connectWsEndpoint ? { wsEndpoint: params.connectWsEndpoint } : undefined,
},
outputDir: params.outputDir,
tsconfig: params.tsconfig,
updateSnapshots: params.updateSnapshots,
workers: params.workers,
};

7
packages/trace-viewer/src/ui/uiModeView.tsx
View file

@ -62,6 +62,7 @@ const queryParams = {
updateSnapshots: (searchParams.get('updateSnapshots') as 'all' | 'none' | 'missing' | undefined) || undefined,
reporters: searchParams.has('reporter') ? searchParams.getAll('reporter') : undefined,
pathSeparator: searchParams.get('pathSeparator') || '/',
tsconfig: searchParams.get('tsconfig') || undefined,
};
if (queryParams.updateSnapshots && !['all', 'none', 'missing'].includes(queryParams.updateSnapshots))
queryParams.updateSnapshots = undefined;
@ -189,12 +190,13 @@ export const UIModeView: React.FC<{}> = ({
});
const { status, report } = await testServerConnection.runGlobalSetup({
outputDir: queryParams.outputDir,
tsconfig: queryParams.tsconfig,
});
teleSuiteUpdater.processGlobalReport(report);
if (status !== 'passed')
return;
const result = await testServerConnection.listTests({ projects: queryParams.projects, locations: queryParams.args, grep: queryParams.grep, grepInvert: queryParams.grepInvert, outputDir: queryParams.outputDir });
const result = await testServerConnection.listTests({ projects: queryParams.projects, locations: queryParams.args, grep: queryParams.grep, grepInvert: queryParams.grepInvert, outputDir: queryParams.outputDir, tsconfig: queryParams.tsconfig });
teleSuiteUpdater.processListReport(result.report);
testServerConnection.onReport(params => {
@ -300,6 +302,7 @@ export const UIModeView: React.FC<{}> = ({
updateSnapshots: updateSnapshots ? 'all' : queryParams.updateSnapshots,
reporters: queryParams.reporters,
trace: 'on',
tsconfig: queryParams.tsconfig,
});
// Clear pending tests in case of interrupt.
for (const test of testModel.rootSuite?.allTests() || []) {
@ -319,7 +322,7 @@ export const UIModeView: React.FC<{}> = ({
commandQueue.current = commandQueue.current.then(async () => {
setIsLoading(true);
try {
const result = await testServerConnection.listTests({ projects: queryParams.projects, locations: queryParams.args, grep: queryParams.grep, grepInvert: queryParams.grepInvert, outputDir: queryParams.outputDir });
const result = await testServerConnection.listTests({ projects: queryParams.projects, locations: queryParams.args, grep: queryParams.grep, grepInvert: queryParams.grepInvert, outputDir: queryParams.outputDir, tsconfig: queryParams.tsconfig });
teleSuiteUpdater.processListReport(result.report);
} catch (e) {
// eslint-disable-next-line no-console

57
tests/playwright-test/ui-mode-test-run.spec.ts
View file

@ -444,3 +444,60 @@ test('should show proper total when using deps', async ({ runUITest }) => {
`);
await expect(page.getByTestId('status-line')).toHaveText('2/2 passed (100%)');
});
test('should respect --tsconfig option', async ({ runUITest }) => {
const { page } = await runUITest({
'playwright.config.ts': `
import { foo } from '~/foo';
export default {
testDir: './tests' + foo,
};
`,
'tsconfig.json': `{
"compilerOptions": {
"baseUrl": ".",
"paths": {
"~/*": ["./does-not-exist/*"],
},
},
}`,
'tsconfig.special.json': `{
"compilerOptions": {
"baseUrl": ".",
"paths": {
"~/*": ["./mapped-from-root/*"],
},
},
}`,
'mapped-from-root/foo.ts': `
export const foo = 42;
`,
'tests42/tsconfig.json': `{
"compilerOptions": {
"baseUrl": ".",
"paths": {
"~/*": ["../should-be-ignored/*"],
},
},
}`,
'tests42/a.test.ts': `
import { foo } from '~/foo';
import { test, expect } from '@playwright/test';
test('test', ({}) => {
expect(foo).toBe(42);
});
`,
'should-be-ignored/foo.ts': `
export const foo = 43;
`,
}, undefined, { additionalArgs: ['--tsconfig=tsconfig.special.json'] });
await page.getByTitle('Run all').click();
await expect.poll(dumpTestTree(page)).toBe(`
▼ ✅ a.test.ts
✅ test
`);
await expect(page.getByTestId('status-line')).toHaveText('1/1 passed (100%)');
});