huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Extend timeout and report failure to WarmUp for template tests (#16759) 

* Extend timeout and report failure to WarmUp for template tests

* Retry click events
This commit is contained in:
Ryan Brandenburg 2020-01-15 18:44:56 -08:00 committed by William Godbe
parent cf3bf40543
commit 5dc2d6eafa
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ProjectTemplates/test/BlazorServerTemplateTest.cs
View File

@ -146,17 +146,17 @@ namespace Templates.Test
Browser.Equal("Hello, world!", () => Browser.FindElement(By.TagName("h1")).Text);
// Can navigate to the counter page
Browser.FindElement(By.PartialLinkText("Counter")).Click();
Browser.Click(By.PartialLinkText("Counter"));
Browser.Contains("counter", () => Browser.Url);
Browser.Equal("Counter", () => Browser.FindElement(By.TagName("h1")).Text);
// Clicking the counter button works
Browser.Equal("Current count: 0", () => Browser.FindElement(By.CssSelector("h1 + p")).Text);
Browser.FindElement(By.CssSelector("p+button")).Click();
Browser.Click(By.CssSelector("p+button"));
Browser.Equal("Current count: 1", () => Browser.FindElement(By.CssSelector("h1 + p")).Text);
// Can navigate to the 'fetch data' page
Browser.FindElement(By.PartialLinkText("Fetch data")).Click();
Browser.Click(By.PartialLinkText("Fetch data"));
Browser.Contains("fetchdata", () => Browser.Url);
Browser.Equal("Weather forecast", () => Browser.FindElement(By.TagName("h1")).Text);

31
src/ProjectTemplates/test/SpaTemplateTest/SpaTemplateTestBase.cs
View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Net;
@ -193,8 +194,11 @@ namespace Templates.Test.SpaTemplateTest
private static async Task WarmUpServer(AspNetProcess aspNetProcess)
{
var intervalInSeconds = 5;
var attempt = 0;
var maxAttempts = 3;
var maxAttempts = 5;
var stopwatch = new Stopwatch();
stopwatch.Start();
do
{
try
@ -203,7 +207,7 @@ namespace Templates.Test.SpaTemplateTest
var response = await aspNetProcess.SendRequest("/");
if (response.StatusCode == HttpStatusCode.OK)
{
break;
return;
}
}
catch (OperationCanceledException)
@ -212,8 +216,11 @@ namespace Templates.Test.SpaTemplateTest
catch (HttpRequestException ex) when (ex.Message.StartsWith("The SSL connection could not be established"))
{
}
await Task.Delay(TimeSpan.FromSeconds(5 * attempt));
var currentDelay = intervalInSeconds * attempt;
await Task.Delay(TimeSpan.FromSeconds(currentDelay));
} while (attempt < maxAttempts);
stopwatch.Stop();
throw new TimeoutException($"Could not contact the server within {stopwatch.Elapsed.TotalSeconds} seconds");
}
private void UpdatePublishedSettings()
@ -246,25 +253,25 @@ namespace Templates.Test.SpaTemplateTest
browser.Equal("Hello, world!", () => browser.FindElement(By.TagName("h1")).Text);
// Can navigate to the counter page
browser.FindElement(By.PartialLinkText("Counter")).Click();
browser.Click(By.PartialLinkText("Counter"));
browser.Contains("counter", () => browser.Url);
browser.Equal("Counter", () => browser.FindElement(By.TagName("h1")).Text);
// Clicking the counter button works
browser.Equal("0", () => browser.FindElement(By.CssSelector("p>strong")).Text);
browser.FindElement(By.CssSelector("p+button")).Click();
browser.Click(By.CssSelector("p+button")) ;
browser.Equal("1", () => browser.FindElement(By.CssSelector("p>strong")).Text);
if (visitFetchData)
{
browser.FindElement(By.PartialLinkText("Fetch data")).Click();
browser.Click(By.PartialLinkText("Fetch data"));
if (usesAuth)
{
// We will be redirected to the identity UI
browser.Contains("/Identity/Account/Login", () => browser.Url);
browser.FindElement(By.PartialLinkText("Register as a new user")).Click();
browser.Click(By.PartialLinkText("Register as a new user"));
var userName = $"{Guid.NewGuid()}@example.com";
var password = $"!Test.Password1$";
@ -272,24 +279,24 @@ namespace Templates.Test.SpaTemplateTest
browser.FindElement(By.Name("Input.Email")).SendKeys(userName);
browser.FindElement(By.Name("Input.Password")).SendKeys(password);
browser.FindElement(By.Name("Input.ConfirmPassword")).SendKeys(password);
browser.FindElement(By.Id("registerSubmit")).Click();
browser.Click(By.Id("registerSubmit"));
// We will be redirected to the RegisterConfirmation
browser.Contains("/Identity/Account/RegisterConfirmation", () => browser.Url);
browser.FindElement(By.PartialLinkText("Click here to confirm your account")).Click();
browser.Click(By.PartialLinkText("Click here to confirm your account"));
// We will be redirected to the ConfirmEmail
browser.Contains("/Identity/Account/ConfirmEmail", () => browser.Url);
// Now we can login
browser.FindElement(By.PartialLinkText("Login")).Click();
browser.Click(By.PartialLinkText("Login"));
browser.Exists(By.Name("Input.Email"));
browser.FindElement(By.Name("Input.Email")).SendKeys(userName);
browser.FindElement(By.Name("Input.Password")).SendKeys(password);
browser.FindElement(By.Id("login-submit")).Click();
browser.Click(By.Id("login-submit"));
// Need to navigate to fetch page
browser.FindElement(By.PartialLinkText("Fetch data")).Click();
browser.Click(By.PartialLinkText("Fetch data"));
}
// Can navigate to the 'fetch data' page

6
src/Shared/E2ETesting/WaitAssert.cs
View File

@ -63,6 +63,12 @@ namespace Microsoft.AspNetCore.E2ETesting
return result;
}, timeout);
public static void Click(this IWebDriver driver, By selector)
=> WaitAssertCore(driver, () =>
{
driver.FindElement(selector).Click();
});
private static void WaitAssertCore(IWebDriver driver, Action assertion, TimeSpan timeout = default)
{
WaitAssertCore<object>(driver, () => { assertion(); return null; }, timeout);