Skip to content

Commit b0f91e2

Browse files
kblokactions-user
andauthored
Fix request interception with complex PostData (#2759)
* Fix request interception with complex PostData * Fix tests * Fix test * Revert "Fix test" This reverts commit 8253e07. * According to puppeteer PostData is string * Docs changes * fix docs generation * improve doc generation * Docs changes * fix * fix build * fix missing snippet * another change * Docs changes --------- Co-authored-by: GitHub Action <[email protected]>
1 parent 9a4c809 commit b0f91e2

31 files changed

+142
-96
lines changed

.github/workflows/on-push-do-docs.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@ on:
33
push:
44
jobs:
55
docs:
6-
runs-on: windows-latest
6+
runs-on: ubuntu-latest
77
steps:
88
- uses: actions/checkout@v2
9+
- name: Setup .NET
10+
uses: actions/setup-dotnet@v3
11+
with:
12+
dotnet-version: 7.0.x
913
- name: Run MarkdownSnippets
1014
run: |
1115
dotnet tool install --global MarkdownSnippets.Tool

README.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ See [this document](https://github.com/hardkoded/puppeteer-sharp/blob/master/CON
4949

5050
## Take screenshots
5151

52-
<!-- snippet: ScreenshotAsync -->
53-
<a id='snippet-ScreenshotAsync'></a>
52+
<!-- snippet: screenshotasync_example -->
53+
<a id='snippet-screenshotasync_example'></a>
5454
```cs
5555
var browserFetcher = new BrowserFetcher();
5656
await browserFetcher.DownloadAsync();
@@ -60,27 +60,27 @@ await using var page = await browser.NewPageAsync();
6060
await page.GoToAsync("http://www.google.com");
6161
await page.ScreenshotAsync(outputFile);
6262
```
63-
<sup><a href='https://github.com/hardkoded/puppeteer-sharp/blob/master/lib/PuppeteerSharp.Tests/ScreenshotTests/PageScreenshotTests.cs#L54-L62' title='Snippet source file'>snippet source</a> | <a href='#snippet-ScreenshotAsync' title='Start of snippet'>anchor</a></sup>
63+
<sup><a href='https://github.com/hardkoded/puppeteer-sharp/blob/master/lib/PuppeteerSharp.Tests/ScreenshotTests/PageScreenshotTests.cs#L54-L62' title='Snippet source file'>snippet source</a> | <a href='#snippet-screenshotasync_example' title='Start of snippet'>anchor</a></sup>
6464
<!-- endSnippet -->
6565

6666
You can also change the view port before generating the screenshot
6767

68-
<!-- snippet: SetViewportAsync -->
69-
<a id='snippet-SetViewportAsync'></a>
68+
<!-- snippet: setviewportasync_example -->
69+
<a id='snippet-setviewportasync_example'></a>
7070
```cs
7171
await Page.SetViewportAsync(new ViewPortOptions
7272
{
7373
Width = 500,
7474
Height = 500
7575
});
7676
```
77-
<sup><a href='https://github.com/hardkoded/puppeteer-sharp/blob/master/lib/PuppeteerSharp.Tests/ScreenshotTests/ElementHandleScreenshotTests.cs#L13-L19' title='Snippet source file'>snippet source</a> | <a href='#snippet-SetViewportAsync' title='Start of snippet'>anchor</a></sup>
77+
<sup><a href='https://github.com/hardkoded/puppeteer-sharp/blob/master/lib/PuppeteerSharp.Tests/ScreenshotTests/ElementHandleScreenshotTests.cs#L13-L19' title='Snippet source file'>snippet source</a> | <a href='#snippet-setviewportasync_example' title='Start of snippet'>anchor</a></sup>
7878
<!-- endSnippet -->
7979

8080
### Generate PDF files
8181

82-
<!-- snippet: PdfAsync -->
83-
<a id='snippet-PdfAsync'></a>
82+
<!-- snippet: pdfasync_example -->
83+
<a id='snippet-pdfasync_example'></a>
8484
```cs
8585
var browserFetcher = new BrowserFetcher();
8686
await browserFetcher.DownloadAsync();
@@ -90,32 +90,32 @@ await page.GoToAsync("http://www.google.com"); // In case of fonts being loaded
9090
await page.EvaluateExpressionHandleAsync("document.fonts.ready"); // Wait for fonts to be loaded. Omitting this might result in no text rendered in pdf.
9191
await page.PdfAsync(outputFile);
9292
```
93-
<sup><a href='https://github.com/hardkoded/puppeteer-sharp/blob/master/lib/PuppeteerSharp.Tests/PageTests/PdfTests.cs#L23-L33' title='Snippet source file'>snippet source</a> | <a href='#snippet-PdfAsync' title='Start of snippet'>anchor</a></sup>
93+
<sup><a href='https://github.com/hardkoded/puppeteer-sharp/blob/master/lib/PuppeteerSharp.Tests/PageTests/PdfTests.cs#L23-L33' title='Snippet source file'>snippet source</a> | <a href='#snippet-pdfasync_example' title='Start of snippet'>anchor</a></sup>
9494
<!-- endSnippet -->
9595

9696
### Inject HTML
9797

98-
<!-- snippet: SetContentAsync -->
99-
<a id='snippet-SetContentAsync'></a>
98+
<!-- snippet: setcontentasync_example -->
99+
<a id='snippet-setcontentasync_example'></a>
100100
```cs
101101
await using var page = await browser.NewPageAsync();
102102
await page.SetContentAsync("<div>My Receipt</div>");
103103
var result = await page.GetContentAsync();
104104
```
105-
<sup><a href='https://github.com/hardkoded/puppeteer-sharp/blob/master/lib/PuppeteerSharp.Tests/PageTests/SetContentTests.cs#L14-L20' title='Snippet source file'>snippet source</a> | <a href='#snippet-SetContentAsync' title='Start of snippet'>anchor</a></sup>
105+
<sup><a href='https://github.com/hardkoded/puppeteer-sharp/blob/master/lib/PuppeteerSharp.Tests/PageTests/SetContentTests.cs#L14-L20' title='Snippet source file'>snippet source</a> | <a href='#snippet-setcontentasync_example' title='Start of snippet'>anchor</a></sup>
106106
<!-- endSnippet -->
107107

108108
### Evaluate Javascript
109109

110-
<!-- snippet: Evaluate -->
111-
<a id='snippet-Evaluate'></a>
110+
<!-- snippet: evaluate_example -->
111+
<a id='snippet-evaluate_example'></a>
112112
```cs
113113
await using var page = await browser.NewPageAsync();
114114
var seven = await page.EvaluateExpressionAsync<int>("4 + 3");
115115
var someObject = await page.EvaluateFunctionAsync<JsonElement>("(value) => ({a: value})", 5);
116116
Console.WriteLine(someObject.GetProperty("a").GetString());
117117
```
118-
<sup><a href='https://github.com/hardkoded/puppeteer-sharp/blob/master/lib/PuppeteerSharp.Tests/QuerySelectorTests/ElementHandleQuerySelectorEvalTests.cs#L17-L22' title='Snippet source file'>snippet source</a> | <a href='#snippet-Evaluate' title='Start of snippet'>anchor</a></sup>
118+
<sup><a href='https://github.com/hardkoded/puppeteer-sharp/blob/master/lib/PuppeteerSharp.Tests/QuerySelectorTests/ElementHandleQuerySelectorEvalTests.cs#L17-L22' title='Snippet source file'>snippet source</a> | <a href='#snippet-evaluate_example' title='Start of snippet'>anchor</a></sup>
119119
<!-- endSnippet -->
120120

121121
### Wait For Selector

docfx_project/docs/DownloadFetcher.Download.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ You will find the available versions [here](https://googlechromelabs.github.io/c
1313
Once you have the version you want, you can download it using the `BrowserFetcher` class.
1414

1515
```cs
16-
<!-- snippet: CustomVersionsExample -->
17-
<a id='snippet-CustomVersionsExample'></a>
16+
<!-- snippet: customversions_example -->
17+
<a id='snippet-customversions_example'></a>
1818
```cs
1919
Console.WriteLine("Downloading browsers");
2020

@@ -51,6 +51,6 @@ await using (var browser = await Puppeteer.LaunchAsync(new()
5151
Console.WriteLine("Export completed");
5252
}
5353
```
54-
<sup><a href='https://github.com/hardkoded/puppeteer-sharp/blob/master/lib/PuppeteerSharp.Tests/Browsers/Chrome/ChromeDataTests.cs#L24-L59' title='Snippet source file'>snippet source</a> | <a href='#snippet-CustomVersionsExample' title='Start of snippet'>anchor</a></sup>
54+
<sup><a href='https://github.com/hardkoded/puppeteer-sharp/blob/master/lib/PuppeteerSharp.Tests/Browsers/Chrome/ChromeDataTests.cs#L24-L59' title='Snippet source file'>snippet source</a> | <a href='#snippet-customversions_example' title='Start of snippet'>anchor</a></sup>
5555
<!-- endSnippet -->
5656
```

docfx_project/docs/ReuseChrome.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ from a location where it was previously downloaded instead of from the default l
1111

1212
Use `BrowserFetcherOptions` to specify the full path for where to download Chrome.
1313

14-
<!-- snippet: ReuseChromeExample -->
15-
<a id='snippet-ReuseChromeExample'></a>
14+
<!-- snippet: reusechrome_example -->
15+
<a id='snippet-reusechrome_example'></a>
1616
```cs
1717
var downloadPath = "/Users/dario/chrome";
1818
var browserFetcherOptions = new BrowserFetcherOptions { Path = downloadPath };
1919
var browserFetcher = new BrowserFetcher(browserFetcherOptions);
2020
var installedBrowser = await browserFetcher.DownloadAsync();
2121
```
22-
<sup><a href='https://github.com/hardkoded/puppeteer-sharp/blob/master/lib/PuppeteerSharp.Tests/Browsers/Chrome/ChromeDataTests.cs#L14-L19' title='Snippet source file'>snippet source</a> | <a href='#snippet-ReuseChromeExample' title='Start of snippet'>anchor</a></sup>
22+
<sup><a href='https://github.com/hardkoded/puppeteer-sharp/blob/master/lib/PuppeteerSharp.Tests/Browsers/Chrome/ChromeDataTests.cs#L14-L19' title='Snippet source file'>snippet source</a> | <a href='#snippet-reusechrome_example' title='Start of snippet'>anchor</a></sup>
2323
<!-- endSnippet -->
2424

2525
Use `Puppeteer.LaunchAsync()` with `LaunchOptions` with the `LaunchOptions.ExecutablePath` property set to the

lib/PuppeteerSharp.AspNetFramework/AspNetWebSocketTransport.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ namespace PuppeteerSharp.AspNetFramework
99
{
1010
public class AspNetWebSocketTransport : WebSocketTransport
1111
{
12-
#region Static fields
13-
1412
/// <summary>
1513
/// Gets a <see cref="TransportFactory"/> that creates <see cref="AspNetWebSocketTransport"/> instances.
1614
/// </summary>
@@ -22,10 +20,6 @@ public class AspNetWebSocketTransport : WebSocketTransport
2220
/// </summary>
2321
public static readonly TransportTaskScheduler AspNetTransportScheduler = ScheduleBackgroundTask;
2422

25-
#endregion
26-
27-
#region Static methods
28-
2923
private static async Task<IConnectionTransport> CreateAspNetTransport(Uri url, IConnectionOptions connectionOptions, CancellationToken cancellationToken)
3024
{
3125
var webSocketFactory = connectionOptions.WebSocketFactory ?? DefaultWebSocketFactory;
@@ -40,15 +34,9 @@ Task ExecuteAsync(CancellationToken hostingCancellationToken)
4034
HostingEnvironment.QueueBackgroundWorkItem(ExecuteAsync);
4135
}
4236

43-
#endregion
44-
45-
#region Constructor(s)
46-
4737
/// <inheritdoc />
4838
public AspNetWebSocketTransport(WebSocket client, bool queueRequests)
4939
: base(client, AspNetTransportScheduler, queueRequests)
5040
{ }
51-
52-
#endregion
5341
}
5442
}

lib/PuppeteerSharp.Tests/Browsers/Chrome/ChromeDataTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class ChromeDataTests
1111
{
1212
public async Task ReuseChromeExample()
1313
{
14-
#region ReuseChromeExample
14+
#region reusechrome_example
1515
var downloadPath = "/Users/dario/chrome";
1616
var browserFetcherOptions = new BrowserFetcherOptions { Path = downloadPath };
1717
var browserFetcher = new BrowserFetcher(browserFetcherOptions);
@@ -21,7 +21,7 @@ public async Task ReuseChromeExample()
2121

2222
public async Task Usage()
2323
{
24-
#region CustomVersionsExample
24+
#region customversions_example
2525
Console.WriteLine("Downloading browsers");
2626

2727
var browserFetcher = new BrowserFetcher(SupportedBrowser.Chrome);

lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/WaitForDevicePromptTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class WaitForDevicePromptTests : PuppeteerPageBaseTest
1010
{
1111
public async Task Usage()
1212
{
13-
#region DeviceRequestPromptUsage
13+
#region devicerequestprompt_usage
1414
var promptTask = Page.WaitForDevicePromptAsync();
1515
await Task.WhenAll(
1616
promptTask,
@@ -25,7 +25,7 @@ await devicePrompt.WaitForDeviceAsync(device => device.Name.Contains("My Device"
2525

2626
public async Task PageUsage()
2727
{
28-
#region IPageWaitForDevicePromptAsyncUsage
28+
#region ipagewaitfordevicepromptasync_usage
2929
var promptTask = Page.WaitForDevicePromptAsync();
3030
await Task.WhenAll(
3131
promptTask,
@@ -41,7 +41,7 @@ await devicePrompt.WaitForDeviceAsync(device => device.Name.Contains("My Device"
4141
public async Task FrameUsage()
4242
{
4343
var frame = Page.MainFrame;
44-
#region IFrameWaitForDevicePromptAsyncUsage
44+
#region iframewaitfordevicepromptasync_usage
4545
var promptTask = frame.WaitForDevicePromptAsync();
4646
await Task.WhenAll(
4747
promptTask,

0 commit comments

Comments
 (0)