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

chore: fix codegen to emit new C# api (#6763)

Browse source
This commit is contained in:
Pavel Feldman 2021-05-26 15:44:40 -07:00 committed by GitHub
parent f60b79a311
commit 95bd4b315c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/server/supplements/recorder/csharp.ts
View file

@ -59,23 +59,24 @@ export class CSharpLanguageGenerator implements LanguageGenerator {
const lines: string[] = []; const lines: string[] = [];
const actionCall = this._generateActionCall(action, actionInContext.isMainFrame); const actionCall = this._generateActionCall(action, actionInContext.isMainFrame);
if (signals.waitForNavigation) { if (signals.waitForNavigation) {
lines.push(`await Task.WhenAll(`); lines.push(`await ${pageAlias}.RunAndWaitForNavigationAsync(async () =>`);
lines.push(`${pageAlias}.WaitForNavigationAsync(/* new ${actionInContext.isMainFrame ? 'Page' : 'Frame'}WaitForNavigationOptions`); lines.push(`{`);
lines.push(` await ${subject}.${actionCall};`);
lines.push(`}/*, new ${actionInContext.isMainFrame ? 'Page' : 'Frame'}WaitForNavigationOptions`);
lines.push(`{`); lines.push(`{`);
lines.push(` UrlString = ${quote(signals.waitForNavigation.url)}`); lines.push(` UrlString = ${quote(signals.waitForNavigation.url)}`);
lines.push(`} */),`); lines.push(`}*/);`);
lines.push(`${subject}.${actionCall});`);
} else { } else {
lines.push(`await ${subject}.${actionCall};`); lines.push(`await ${subject}.${actionCall};`);
} }
if (signals.download) { if (signals.download) {
lines.unshift(`var download${signals.download.downloadAlias} = await ${pageAlias}.RunAndWaitForEventAsync(PageEvent.Download, async () =>\n{`); lines.unshift(`var download${signals.download.downloadAlias} = await ${pageAlias}.RunAndWaitForDownloadAsync(async () =>\n{`);
lines.push(`});`); lines.push(`});`);
} }
if (signals.popup) { if (signals.popup) {
lines.unshift(`var ${signals.popup.popupAlias} = await ${pageAlias}.RunAndWaitForEventAsync(PageEvent.Popup, async () =>\n{`); lines.unshift(`var ${signals.popup.popupAlias} = await ${pageAlias}.RunAndWaitForPopupAsync(async () =>\n{`);
lines.push(`});`); lines.push(`});`);
} }

15
tests/inspector/cli-codegen-1.spec.ts
View file

@ -510,7 +510,7 @@ test.describe('cli codegen', () => {
page1 = await popup_info.value`); page1 = await popup_info.value`);
expect(sources.get('<csharp>').text).toContain(` expect(sources.get('<csharp>').text).toContain(`
var page1 = await page.RunAndWaitForEventAsync(PageEvent.Popup, async () => var page1 = await page.RunAndWaitForPopupAsync(async () =>
{ {
await page.ClickAsync(\"text=link\"); await page.ClickAsync(\"text=link\");
});`); });`);
@ -602,12 +602,13 @@ test.describe('cli codegen', () => {
expect(sources.get('<csharp>').text).toContain(` expect(sources.get('<csharp>').text).toContain(`
// Click text=link // Click text=link
await Task.WhenAll( await page.RunAndWaitForNavigationAsync(async () =>
page.WaitForNavigationAsync(/* new PageWaitForNavigationOptions {
{ await page.ClickAsync(\"text=link\");
UrlString = \"about:blank#foo\" }/*, new PageWaitForNavigationOptions
} */), {
page.ClickAsync(\"text=link\"));`); UrlString = \"about:blank#foo\"
}*/);`);
expect(page.url()).toContain('about:blank#foo'); expect(page.url()).toContain('about:blank#foo');
}); });

2
tests/inspector/cli-codegen-2.spec.ts
View file

@ -293,7 +293,7 @@ test.describe('cli codegen', () => {
});`); });`);
expect(sources.get('<csharp>').text).toContain(` expect(sources.get('<csharp>').text).toContain(`
// Click text=Download // Click text=Download
var download1 = await page.RunAndWaitForEventAsync(PageEvent.Download, async () => var download1 = await page.RunAndWaitForDownloadAsync(async () =>
{ {
await page.ClickAsync(\"text=Download\"); await page.ClickAsync(\"text=Download\");
});`); });`);