Skip to content

Commit fb6bff7

Browse files
committed
Merge in 'release/6.0' changes
2 parents 03626ad + 0e0d50f commit fb6bff7

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

src/Components/test/E2ETest/Tests/CircuitTests.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
1010
using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
1111
using Microsoft.AspNetCore.E2ETesting;
12+
using Microsoft.AspNetCore.Testing;
1213
using OpenQA.Selenium;
1314
using TestServer;
1415
using Xunit;
@@ -40,6 +41,7 @@ protected override void InitializeAsyncCore()
4041
[InlineData("render-throw")]
4142
[InlineData("afterrender-sync-throw")]
4243
[InlineData("afterrender-async-throw")]
44+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/46836")]
4345
public void ComponentLifecycleMethodThrowsExceptionTerminatesTheCircuit(string id)
4446
{
4547
Browser.MountTestComponent<ReliabilityComponent>();
@@ -58,6 +60,7 @@ public void ComponentLifecycleMethodThrowsExceptionTerminatesTheCircuit(string i
5860
}
5961

6062
[Fact]
63+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/46836")]
6164
public void ComponentDisposeMethodThrowsExceptionTerminatesTheCircuit()
6265
{
6366
Browser.MountTestComponent<ReliabilityComponent>();

src/Components/test/E2ETest/Tests/ComponentRenderingTestBase.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,7 @@ public void CanUseFocusExtensionToFocusSvgElement()
433433
}
434434

435435
[Fact]
436+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/46835")]
436437
public void CanUseFocusExtensionToFocusElementPreventScroll()
437438
{
438439
Browser.Manage().Window.Size = new System.Drawing.Size(100, 300);

src/Shared/E2ETesting/BrowserFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ private async Task DeleteBrowserUserProfileDirectoriesAsync()
149149
!Debugger.IsAttached &&
150150
!string.Equals(Environment.GetEnvironmentVariable("E2E_TEST_VISIBLE"), "true", StringComparison.OrdinalIgnoreCase))
151151
{
152-
opts.AddArgument("--headless");
152+
opts.AddArgument("--headless=new");
153153
}
154154

155155
opts.AddArgument("--no-sandbox");

src/Shared/E2ETesting/selenium-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"drivers": {
33
"chrome": {
4-
"version" : "106.0.5249.21"
4+
"version" : "110.0.5481.77"
55
}
66
},
77
"ignoreExtraDrivers": true

0 commit comments

Comments
 (0)