Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/PuppeteerSharp.Tests/CoverageTests/JSCoverageTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ public async Task ShouldReportRightRanges()
{
await Page.Coverage.StartJSCoverageAsync();
await Page.GoToAsync(TestConstants.ServerUrl + "/jscoverage/ranges.html");
// Prevent flaky tests.
await Task.Delay(1000);
var coverage = await Page.Coverage.StopJSCoverageAsync();
Assert.That(coverage, Has.Exactly(1).Items);
var entry = coverage[0];
Expand Down
6 changes: 3 additions & 3 deletions lib/PuppeteerSharp.Tests/InputTests/FileChooserCancelTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ await Task.WhenAll(
Page.ClickAsync("input"));

var fileChooser = waitForTask.Result;
fileChooser.Cancel();
await fileChooser.CancelAsync();

await Task.WhenAll(
Page.WaitForFileChooserAsync(),
Expand All @@ -47,9 +47,9 @@ await Task.WhenAll(
Page.ClickAsync("input"));

var fileChooser = waitForTask.Result;
fileChooser.Cancel();
await fileChooser.CancelAsync();

var ex = Assert.Throws<PuppeteerException>(() => fileChooser.Cancel());
var ex = Assert.ThrowsAsync<PuppeteerException>(() => fileChooser.CancelAsync());
Assert.AreEqual("Cannot accept FileChooser which is already handled!", ex.Message);
}
}
Expand Down
41 changes: 23 additions & 18 deletions lib/PuppeteerSharp/ElementHandle.cs
Original file line number Diff line number Diff line change
Expand Up @@ -189,34 +189,39 @@ public async Task UploadFileAsync(bool resolveFilePaths, params string[] filePat
throw new PuppeteerException("Multiple file uploads only work with <input type=file multiple>");
}

var objectId = RemoteObject.ObjectId;
var node = await Client.SendAsync<DomDescribeNodeResponse>("DOM.describeNode", new DomDescribeNodeRequest
{
ObjectId = RemoteObject.ObjectId,
}).ConfigureAwait(false);
var backendNodeId = node.Node.BackendNodeId;

// The zero-length array is a special case, it seems that
// DOM.setFileInputFiles does not actually update the files in that case, so
// the solution is to eval the element value to a new FileList directly.
if (!filePaths.Any() || filePaths == null)
{
await EvaluateFunctionAsync(@"(element) => {
element.files = new DataTransfer().files;

// Dispatch events for this case because it should behave akin to a user action.
element.dispatchEvent(new Event('input', { bubbles: true }));
element.dispatchEvent(
new Event('input', {bubbles: true, composed: true})
);
element.dispatchEvent(new Event('change', { bubbles: true }));
}").ConfigureAwait(false);

return;
}
else

var objectId = RemoteObject.ObjectId;
var node = await Client.SendAsync<DomDescribeNodeResponse>("DOM.describeNode", new DomDescribeNodeRequest
{
var files = resolveFilePaths ? filePaths.Select(Path.GetFullPath).ToArray() : filePaths;
CheckForFileAccess(files);
await Client.SendAsync("DOM.setFileInputFiles", new DomSetFileInputFilesRequest
{
ObjectId = objectId,
Files = files,
BackendNodeId = backendNodeId,
}).ConfigureAwait(false);
}
ObjectId = RemoteObject.ObjectId,
}).ConfigureAwait(false);
var backendNodeId = node.Node.BackendNodeId;

var files = resolveFilePaths ? filePaths.Select(Path.GetFullPath).ToArray() : filePaths;
CheckForFileAccess(files);
await Client.SendAsync("DOM.setFileInputFiles", new DomSetFileInputFilesRequest
{
ObjectId = objectId,
Files = files,
BackendNodeId = backendNodeId,
}).ConfigureAwait(false);
}

/// <inheritdoc/>
Expand Down
4 changes: 3 additions & 1 deletion lib/PuppeteerSharp/FileChooser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,16 @@ public Task AcceptAsync(params string[] filePaths)
/// <summary>
/// Closes the file chooser without selecting any files.
/// </summary>
public void Cancel()
/// <returns>A task that resolves after the cancel event is sent to the browser.</returns>
public Task CancelAsync()
{
if (_handled)
{
throw new PuppeteerException("Cannot accept FileChooser which is already handled!");
}

_handled = true;
return _element.EvaluateFunctionAsync("element => element.dispatchEvent(new Event('cancel', {bubbles: true}))");
}
}
}
8 changes: 4 additions & 4 deletions lib/PuppeteerSharp/PuppeteerSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
<Description>Headless Browser .NET API</Description>
<PackageId>PuppeteerSharp</PackageId>
<PackageReleaseNotes></PackageReleaseNotes>
<PackageVersion>12.0.0</PackageVersion>
<ReleaseVersion>12.0.0</ReleaseVersion>
<AssemblyVersion>12.0.0</AssemblyVersion>
<FileVersion>12.0.0</FileVersion>
<PackageVersion>13.0.0</PackageVersion>
<ReleaseVersion>13.0.0</ReleaseVersion>
<AssemblyVersion>13.0.0</AssemblyVersion>
<FileVersion>13.0.0</FileVersion>
<SynchReleaseVersion>false</SynchReleaseVersion>
<StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>
<DebugType>embedded</DebugType>
Expand Down