Skip to content

Commit 74488cf

Browse files
authored
Roll Chromium to r705776 (#1318)
* Roll Chromium to r705776 * Add missing replacements * Add some logs * Init children * Add xml doc * Add logs * Force focus
1 parent c072146 commit 74488cf

File tree

15 files changed

+39
-51
lines changed

15 files changed

+39
-51
lines changed

lib/PuppeteerSharp.Tests/AccessibilityTests/AccessibilityTests.cs

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
using System.Threading.Tasks;
1+
using System;
2+
using System.Threading.Tasks;
3+
using Newtonsoft.Json;
24
using PuppeteerSharp.PageAccessibility;
35
using Xunit;
46
using Xunit.Abstractions;
@@ -35,12 +37,12 @@ await Page.SetContentAsync(@"
3537
<option>Second Option</option>
3638
</select>
3739
</body>");
38-
Assert.Equal(
39-
new SerializedAXNode
40-
{
41-
Role = "WebArea",
42-
Name = "Accessibility Test",
43-
Children = new SerializedAXNode[]
40+
41+
var nodeToCheck = new SerializedAXNode
42+
{
43+
Role = "WebArea",
44+
Name = "Accessibility Test",
45+
Children = new SerializedAXNode[]
4446
{
4547
new SerializedAXNode
4648
{
@@ -107,14 +109,18 @@ await Page.SetContentAsync(@"
107109
}
108110
}
109111
}
110-
},
111-
await Page.Accessibility.SnapshotAsync());
112+
};
113+
await Page.FocusAsync("[placeholder='Empty input']");
114+
var snapshot = await Page.Accessibility.SnapshotAsync();
115+
Assert.Equal(nodeToCheck, snapshot);
112116
}
113117

114118
[Fact]
115119
public async Task ShouldReportUninterestingNodes()
116120
{
117121
await Page.SetContentAsync("<textarea autofocus>hi</textarea>");
122+
await Page.FocusAsync("textarea");
123+
118124
Assert.Equal(
119125
new SerializedAXNode
120126
{

lib/PuppeteerSharp.Tests/NetworkTests/SetRequestInterceptionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public async Task ShouldWorkWithRedirectInsideSyncXHR()
198198
}
199199

200200
[Fact]
201-
public async Task ShouldWorksWithCustomizingRefererHeaders()
201+
public async Task ShouldWorkWithCustomRefererHeaders()
202202
{
203203
await Page.SetExtraHttpHeadersAsync(new Dictionary<string, string>
204204
{

lib/PuppeteerSharp.Tests/PageTests/GotoTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public async Task ShouldFailWhenExceedingMaximumNavigationTimeout()
153153

154154
var exception = await Assert.ThrowsAnyAsync<Exception>(async ()
155155
=> await Page.GoToAsync(TestConstants.EmptyPage, new NavigationOptions { Timeout = 1 }));
156-
Assert.Contains("Timeout Exceeded: 1ms", exception.Message);
156+
Assert.Contains("Timeout of 1 ms exceeded", exception.Message);
157157
}
158158

159159
[Fact]
@@ -163,7 +163,7 @@ public async Task ShouldFailWhenExceedingDefaultMaximumNavigationTimeout()
163163

164164
Page.DefaultNavigationTimeout = 1;
165165
var exception = await Assert.ThrowsAnyAsync<Exception>(async () => await Page.GoToAsync(TestConstants.EmptyPage));
166-
Assert.Contains("Timeout Exceeded: 1ms", exception.Message);
166+
Assert.Contains("Timeout of 1 ms exceeded", exception.Message);
167167
}
168168

169169
[Fact]
@@ -173,7 +173,7 @@ public async Task ShouldFailWhenExceedingDefaultMaximumTimeout()
173173
Server.SetRoute("/empty.html", context => Task.Delay(-1));
174174
Page.DefaultTimeout = 1;
175175
var exception = await Assert.ThrowsAnyAsync<Exception>(async () => await Page.GoToAsync(TestConstants.EmptyPage));
176-
Assert.Contains("Timeout Exceeded: 1ms", exception.Message);
176+
Assert.Contains("Timeout of 1 ms exceeded", exception.Message);
177177
}
178178

179179
[Fact]
@@ -184,7 +184,7 @@ public async Task ShouldPrioritizeDefaultNavigationTimeoutOverDefaultTimeout()
184184
Page.DefaultTimeout = 0;
185185
Page.DefaultNavigationTimeout = 1;
186186
var exception = await Assert.ThrowsAnyAsync<Exception>(async () => await Page.GoToAsync(TestConstants.EmptyPage));
187-
Assert.Contains("Timeout Exceeded: 1ms", exception.Message);
187+
Assert.Contains("Timeout of 1 ms exceeded", exception.Message);
188188
}
189189

190190
[Fact]

lib/PuppeteerSharp.Tests/PageTests/ScreenshotTests.cs

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -90,31 +90,6 @@ await page.SetViewportAsync(new ViewPortOptions
9090
}
9191
}
9292

93-
[Fact]
94-
public async Task ShouldWorkForOffscreenClip()
95-
{
96-
using (var page = await Context.NewPageAsync())
97-
{
98-
await page.SetViewportAsync(new ViewPortOptions
99-
{
100-
Width = 500,
101-
Height = 500
102-
});
103-
await page.GoToAsync(TestConstants.ServerUrl + "/grid.html");
104-
var screenshot = await page.ScreenshotDataAsync(new ScreenshotOptions
105-
{
106-
Clip = new Clip
107-
{
108-
X = 50,
109-
Y = 600,
110-
Width = 100,
111-
Height = 100
112-
}
113-
});
114-
Assert.True(ScreenshotHelper.PixelMatch("screenshot-offscreen-clip.png", screenshot));
115-
}
116-
}
117-
11893
[Fact]
11994
public async Task ShouldRunInParallel()
12095
{

lib/PuppeteerSharp.Tests/PageTests/SetContentTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public async Task ShouldRespectTimeout()
5959
Timeout = 1
6060
}));
6161

62-
Assert.Contains("Timeout Exceeded: 1ms", exception.Message);
62+
Assert.Contains("Timeout of 1 ms exceeded", exception.Message);
6363
}
6464

6565
[Fact]
@@ -73,7 +73,7 @@ public async Task ShouldRespectDefaultTimeout()
7373
var exception = await Assert.ThrowsAnyAsync<TimeoutException>(async () =>
7474
await Page.SetContentAsync($"<img src='{TestConstants.ServerUrl + imgPath}'></img>"));
7575

76-
Assert.Contains("Timeout Exceeded: 1ms", exception.Message);
76+
Assert.Contains("Timeout of 1 ms exceeded", exception.Message);
7777
}
7878

7979
[Fact]

lib/PuppeteerSharp.Tests/PageTests/WaitForRequestTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public async Task ShouldRespectTimeout()
5757
Timeout = 1
5858
}));
5959

60-
Assert.Contains("Timeout Exceeded: 1ms", exception.Message);
60+
Assert.Contains("Timeout of 1 ms exceeded", exception.Message);
6161
}
6262

6363
[Fact]
@@ -68,7 +68,7 @@ public async Task ShouldRespectDefaultTimeout()
6868
var exception = await Assert.ThrowsAnyAsync<TimeoutException>(async () =>
6969
await Page.WaitForRequestAsync(request => false));
7070

71-
Assert.Contains("Timeout Exceeded: 1ms", exception.Message);
71+
Assert.Contains("Timeout of 1 ms exceeded", exception.Message);
7272
}
7373

7474
[Fact]

lib/PuppeteerSharp.Tests/PageTests/WaitForResponseTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public async Task ShouldRespectTimeout()
5757
Timeout = 1
5858
}));
5959

60-
Assert.Contains("Timeout Exceeded: 1ms", exception.Message);
60+
Assert.Contains("Timeout of 1 ms exceeded", exception.Message);
6161
}
6262

6363
[Fact]
@@ -68,7 +68,7 @@ public async Task ShouldRespectDefaultTimeout()
6868
var exception = await Assert.ThrowsAnyAsync<TimeoutException>(async () =>
6969
await Page.WaitForResponseAsync(request => false));
7070

71-
Assert.Contains("Timeout Exceeded: 1ms", exception.Message);
71+
Assert.Contains("Timeout of 1 ms exceeded", exception.Message);
7272
}
7373

7474
[Fact]
-1.16 KB
Loading

lib/PuppeteerSharp/BrowserFetcher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class BrowserFetcher
3838
/// <summary>
3939
/// Default Chromium revision.
4040
/// </summary>
41-
public const int DefaultRevision = 686378;
41+
public const int DefaultRevision = 706915;
4242

4343
/// <summary>
4444
/// Gets the downloads folder.

lib/PuppeteerSharp/Helpers/TaskHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace PuppeteerSharp.Helpers
1010
public static class TaskHelper
1111
{
1212
private static readonly Func<TimeSpan, Exception> DefaultExceptionFactory =
13-
timeout => new TimeoutException($"Timeout Exceeded: {timeout.TotalMilliseconds}ms exceeded");
13+
timeout => new TimeoutException($"Timeout of {timeout.TotalMilliseconds} ms exceeded");
1414

1515
//Recipe from https://blogs.msdn.microsoft.com/pfxteam/2012/10/05/how-do-i-cancel-non-cancelable-async-operations/
1616
/// <summary>

0 commit comments

Comments
 (0)