Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.
TypeScript automationchromechromiume2e-testingelectronend-to-end-testingfirefoxjavascriptplaywrighttesttest-automationtestingtesting-toolswebwebkit
fix(c# codegen): properly capitalise popup alias (#36468)
Simon Knottbb033f723177
diff --git a/packages/playwright-core/src/server/codegen/csharp.ts b/packages/playwright-core/src/server/codegen/csharp.tsindex 9fd67fa96c..98b5a182fb 100644--- a/packages/playwright-core/src/server/codegen/csharp.ts+++ b/packages/playwright-core/src/server/codegen/csharp.ts@@ -58,9 +58,7 @@ export class CSharpLanguageGenerator implements LanguageGenerator {const action = actionInContext.action;if (this._mode !== 'library' && (action.name === 'openPage' || action.name === 'closePage'))return '';- let pageAlias = actionInContext.frame.pageAlias;- if (this._mode !== 'library')- pageAlias = pageAlias.replace('page', 'Page');+ const pageAlias = this._formatPageAlias(actionInContext.frame.pageAlias);const formatter = new CSharpFormatter(this._mode === 'library' ? 0 : 8);if (action.name === 'openPage') {@@ -93,7 +91,7 @@ export class CSharpLanguageGenerator implements LanguageGenerator {}if (signals.popup) {- lines.unshift(`var ${signals.popup.popupAlias} = await ${pageAlias}.RunAndWaitForPopupAsync(async () =>\n{`);+ lines.unshift(`var ${this._formatPageAlias(signals.popup.popupAlias)} = await ${pageAlias}.RunAndWaitForPopupAsync(async () =>\n{`);lines.push(`});`);}@@ -103,6 +101,17 @@ export class CSharpLanguageGenerator implements LanguageGenerator {return formatter.format();}+ private _formatPageAlias(pageAlias: string): string {+ if (this._mode === 'library')+ return pageAlias;++ if (pageAlias === 'page')+ return 'Page'; // first page is class member++ // other pages are local variables+ return pageAlias;+ }+private _generateActionCall(subject: string, actionInContext: actions.ActionInContext): string {const action = actionInContext.action;switch (action.name) {diff --git a/tests/library/inspector/cli-codegen-1.spec.ts b/tests/library/inspector/cli-codegen-1.spec.tsindex 91a1979668..a3b7a8ec86 100644--- a/tests/library/inspector/cli-codegen-1.spec.ts+++ b/tests/library/inspector/cli-codegen-1.spec.ts@@ -759,25 +759,36 @@ await page.Locator(\"#age\").SelectOptionAsync(new[] { \"2\" });`);expect(message.text()).toBe('2');});- test('should await popup', async ({ openRecorder }) => {+ test('should await popup', async ({ openRecorder, server }) => {+ test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36461' });test.skip(recorderMode === 'record', 'Navigation is dispatched concurrently (before click is recorded)');const { page, recorder } = await openRecorder();- await recorder.setContentAndWait('<a target=_blank rel=noopener href="about:blank">link</a>');+ server.setRoute('/popup', (req, res) => {+ res.setHeader('Content-Type', 'text/html; charset=utf-8');+ res.end(`<button>Click me</button>`);+ });+ await recorder.setContentAndWait(`<a target=_blank rel=noopener href="${server.PREFIX}/popup">link</a>`);const locator = await recorder.hoverOverElement('a');expect(locator).toBe(`getByRole('link', { name: 'link' })`);- const [popup, sources] = await Promise.all([+ const [popup] = await Promise.all([page.context().waitForEvent('page'),- recorder.waitForOutput('JavaScript', 'waitForEvent'),recorder.trustedClick(),]);+ recorder.page = popup;+ await recorder.hoverOverElement('button');+ await recorder.trustedClick();++ const sources = await recorder.waitForOutput('JavaScript', 'page1.');+expect.soft(sources.get('JavaScript')!.text).toContain(`const page1Promise = page.waitForEvent('popup');await page.getByRole('link', { name: 'link' }).click();- const page1 = await page1Promise;`);+ const page1 = await page1Promise;+ await page1.getByRole('button', { name: 'Click me' }).click();`);expect.soft(sources.get('Java')!.text).toContain(`Page page1 = page.waitForPopup(() -> {@@ -798,9 +809,15 @@ await page.Locator(\"#age\").SelectOptionAsync(new[] { \"2\" });`);var page1 = await page.RunAndWaitForPopupAsync(async () =>{await page.GetByRole(AriaRole.Link, new() { Name = "link" }).ClickAsync();-});`);-- expect(popup.url()).toBe('about:blank');+});+await page1.GetByRole(AriaRole.Button, new() { Name = \"Click me\" }).ClickAsync();`);++ expect.soft(sources.get('C# NUnit')!.text).toContain(`+ var page1 = await Page.RunAndWaitForPopupAsync(async () =>+ {+ await Page.GetByRole(AriaRole.Link, new() { Name = "link" }).ClickAsync();+ });+ await page1.GetByRole(AriaRole.Button, new() { Name = \"Click me\" }).ClickAsync();`);});test('should attribute navigation to click', async ({ openRecorder }) => {