diff --git a/eng/Versions.props b/eng/Versions.props index 41afaa83cf6a..ca1fdabb0b35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -305,11 +305,11 @@ 13.0.3 13.0.4 2.5.2 - 1.28.0 + 1.60.0 3.0.0 7.2.4 - 4.17.0 - 4.17.0 + 4.44.0 + 4.44.0 1.4.0 4.0.0 2.7.27 diff --git a/src/ProjectTemplates/test/Templates.Blazor.Tests/BlazorWasmTemplateTest.cs b/src/ProjectTemplates/test/Templates.Blazor.Tests/BlazorWasmTemplateTest.cs index 9a781f2b9cf1..3399e5cc568e 100644 --- a/src/ProjectTemplates/test/Templates.Blazor.Tests/BlazorWasmTemplateTest.cs +++ b/src/ProjectTemplates/test/Templates.Blazor.Tests/BlazorWasmTemplateTest.cs @@ -320,7 +320,7 @@ private static async Task TestBasicNavigation(string appName, IPage page, bool u // Can navigate to the counter page await Task.WhenAll( - page.WaitForNavigationAsync(new() { UrlString = "**/counter" }), + page.WaitForURLAsync("**/counter"), page.WaitForSelectorAsync("h1 >> text=Counter"), page.WaitForSelectorAsync("p >> text=Current count: 0"), page.ClickAsync("a[href=counter]")); @@ -333,36 +333,36 @@ await Task.WhenAll( if (usesAuth) { await Task.WhenAll( - page.WaitForNavigationAsync(new() { UrlString = "**/Identity/Account/Login**", WaitUntil = WaitUntilState.NetworkIdle }), + page.WaitForURLAsync("**/Identity/Account/Login**", new() { WaitUntil = WaitUntilState.NetworkIdle }), page.ClickAsync("text=Log in")); await Task.WhenAll( page.WaitForSelectorAsync("[name=\"Input.Email\"]"), - page.WaitForNavigationAsync(new() { UrlString = "**/Identity/Account/Register**", WaitUntil = WaitUntilState.NetworkIdle }), + page.WaitForURLAsync("**/Identity/Account/Register**", new() { WaitUntil = WaitUntilState.NetworkIdle }), page.ClickAsync("text=Register as a new user")); var userName = $"{Guid.NewGuid()}@example.com"; var password = "[PLACEHOLDER]-1a"; - await page.TypeAsync("[name=\"Input.Email\"]", userName); - await page.TypeAsync("[name=\"Input.Password\"]", password); - await page.TypeAsync("[name=\"Input.ConfirmPassword\"]", password); + await page.FillAsync("[name=\"Input.Email\"]", userName); + await page.FillAsync("[name=\"Input.Password\"]", password); + await page.FillAsync("[name=\"Input.ConfirmPassword\"]", password); // We will be redirected to the RegisterConfirmation await Task.WhenAll( - page.WaitForNavigationAsync(new() { UrlString = "**/Identity/Account/RegisterConfirmation**", WaitUntil = WaitUntilState.NetworkIdle }), + page.WaitForURLAsync("**/Identity/Account/RegisterConfirmation**", new() { WaitUntil = WaitUntilState.NetworkIdle }), page.ClickAsync("#registerSubmit")); // We will be redirected to the ConfirmEmail await Task.WhenAll( - page.WaitForNavigationAsync(new() { UrlString = "**/Identity/Account/ConfirmEmail**", WaitUntil = WaitUntilState.NetworkIdle }), + page.WaitForURLAsync("**/Identity/Account/ConfirmEmail**", new() { WaitUntil = WaitUntilState.NetworkIdle }), page.ClickAsync("text=Click here to confirm your account")); // Now we can login await page.ClickAsync("text=Login"); await page.WaitForSelectorAsync("[name=\"Input.Email\"]"); - await page.TypeAsync("[name=\"Input.Email\"]", userName); - await page.TypeAsync("[name=\"Input.Password\"]", password); + await page.FillAsync("[name=\"Input.Email\"]", userName); + await page.FillAsync("[name=\"Input.Password\"]", password); await page.ClickAsync("#login-submit"); // Need to navigate to fetch page diff --git a/src/Shared/BrowserTesting/src/BrowserManagerConfiguration.cs b/src/Shared/BrowserTesting/src/BrowserManagerConfiguration.cs index d33a172ed4cf..1a1fc4479702 100644 --- a/src/Shared/BrowserTesting/src/BrowserManagerConfiguration.cs +++ b/src/Shared/BrowserTesting/src/BrowserManagerConfiguration.cs @@ -205,7 +205,6 @@ string EnsureFolderExists(string folderPath) Env = configuration.GetValue>(nameof(BrowserTypeLaunchOptions.Env)), DownloadsPath = configuration.GetValue(nameof(BrowserTypeLaunchOptions.DownloadsPath)), ExecutablePath = configuration.GetValue(nameof(BrowserTypeLaunchOptions.ExecutablePath)), - Devtools = configuration.GetValue(nameof(BrowserTypeLaunchOptions.Devtools)), Args = BindMultiValueMap( configuration.GetSection(nameof(BrowserTypeLaunchOptions.Args)), argsMap => argsMap.SelectMany(argNameValue => argNameValue.Value.Prepend(argNameValue.Key)).ToArray()), @@ -342,7 +341,6 @@ private static BrowserTypeLaunchOptions Combine(BrowserTypeLaunchOptions default Env = overrideOptions.Env != default ? overrideOptions.Env : defaultOptions.Env, DownloadsPath = overrideOptions.DownloadsPath != default ? overrideOptions.DownloadsPath : defaultOptions.DownloadsPath, ExecutablePath = overrideOptions.ExecutablePath != default ? overrideOptions.ExecutablePath : defaultOptions.ExecutablePath, - Devtools = overrideOptions.Devtools != default ? overrideOptions.Devtools : defaultOptions.Devtools, Args = overrideOptions.Args != default ? overrideOptions.Args : defaultOptions.Args, Headless = overrideOptions.Headless != default ? overrideOptions.Headless : defaultOptions.Headless, Timeout = overrideOptions.Timeout != default ? overrideOptions.Timeout : defaultOptions.Timeout,