Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added wait to fix the flaky test #1690

Merged
merged 14 commits into from
Sep 22, 2023
Merged

Added wait to fix the flaky test #1690

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c333717
Added wait to fix the flaky test
tomasherceg Aug 12, 2023
21d62d2
Fixed flaky redirect test in SPA
tomasherceg Aug 12, 2023
5063911
Updated Selenium utils to add more logging
tomasherceg Aug 12, 2023
c615408
Fixed launchSettings.json files
tomasherceg Aug 13, 2023
71f6251
Updated to Selenium Utils 3.0.0-preview12-final
tomasherceg Aug 13, 2023
cc951ff
Updated Selenium Utils to 3.0.0-preview13-final
tomasherceg Aug 13, 2023
a2e83a3
Selenium packages updated to the latest version
tomasherceg Aug 15, 2023
c9e0efa
Update Ubuntu packages during CI setup
cafour Aug 15, 2023
88dc697
Add a sudo
cafour Aug 15, 2023
d200829
Updated Selenium Utils to 3.0.0-preview14-final
tomasherceg Aug 26, 2023
5c5f297
Squashed commit of the following:
cafour Aug 28, 2023
828db5c
Remove the internal nuget feed
cafour Aug 28, 2023
339506d
Remove apt-get update
cafour Sep 8, 2023
f33d3d9
Bump SeleniumUtils version
cafour Sep 8, 2023
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
5 changes: 3 additions & 2 deletions src/Samples/Api.Owin/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
"DotVVM.Samples.BasicSamples.Api.Owin": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "http://localhost:61453",
"applicationUrl": "http://localhost:61453",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "http://localhost:61453"
}
}
}
}
1 change: 1 addition & 0 deletions src/Samples/AspNetCore/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "http://localhost:16019",
"applicationUrl": "http://localhost:16019",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
Expand Down
1 change: 1 addition & 0 deletions src/Samples/AspNetCoreLatest/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "http://localhost:16019",
"applicationUrl": "http://localhost:16019",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
Expand Down
5 changes: 3 additions & 2 deletions src/Samples/Owin/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
"DotVVM.Samples.BasicSamples.Owin": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "http://localhost:5407",
"applicationUrl": "http://localhost:5407",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "http://localhost:5407"
}
}
}
}
3 changes: 2 additions & 1 deletion src/Samples/Tests/Tests/Complex/SPAErrorReportingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using DotVVM.Samples.Tests.Base;
using DotVVM.Testing.Abstractions;
using OpenQA.Selenium.Chrome;
using OpenQA.Selenium.Chromium;
using Riganti.Selenium.Core;
using Riganti.Selenium.Core.Abstractions.Attributes;
using Riganti.Selenium.DotVVM;
Expand Down Expand Up @@ -31,7 +32,7 @@ public void Complex_SPAErrorReporting_NavigationAndPostbacks()

void SetOfflineMode(bool offline)
{
((ChromeDriver)browser.Driver).NetworkConditions = new ChromeNetworkConditions() {
((ChromeDriver)browser.Driver).NetworkConditions = new ChromiumNetworkConditions() {
IsOffline = offline,
Latency = TimeSpan.FromMilliseconds(5),
DownloadThroughput = 500 * 1024,
Expand Down
23 changes: 15 additions & 8 deletions src/Samples/Tests/Tests/DotVVM.Samples.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,31 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>

<!-- Use this to run agains local clone of the Selenium Utils repo -->
<LocalSeleniumUtilsPath></LocalSeleniumUtilsPath>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Riganti.Selenium.Coordinator.Client" Version="3.0.0-preview09-final" />
<PackageReference Include="Riganti.Selenium.Core" Version="3.0.0-preview09-final" />
<PackageReference Include="Riganti.Selenium.Core.Abstractions" Version="3.0.0-preview09-final" />
<PackageReference Include="Riganti.Selenium.DotVVM" Version="3.0.0-preview09-final" />
<PackageReference Include="Riganti.Selenium.AssertApi" Version="3.0.0-preview09-final" />
<PackageReference Include="Riganti.Selenium.xUnitIntegration" Version="3.0.0-preview09-final" />
<PackageReference Include="Riganti.Selenium.Validators" Version="3.0.0-preview09-final" />
</ItemGroup>

<ItemGroup Condition="'$(LocalSeleniumUtilsPath)' == ''">
<PackageReference Include="Riganti.Selenium.DotVVM" Version="3.0.0-preview13-final" />
<PackageReference Include="Riganti.Selenium.AssertApi" Version="3.0.0-preview13-final" />
<PackageReference Include="Riganti.Selenium.xUnitIntegration" Version="3.0.0-preview13-final" />
</ItemGroup>
<ItemGroup Condition="'$(LocalSeleniumUtilsPath)' != ''">
<ProjectReference Include="$(LocalSeleniumUtilsPath)\src\Core\Riganti.Selenium.AssertApi\Riganti.Selenium.AssertApi.csproj" />
<ProjectReference Include="$(LocalSeleniumUtilsPath)\src\Integrations\Riganti.Selenium.DotVVM.MSTest2\Riganti.Selenium.DotVVM.csproj" />
<ProjectReference Include="$(LocalSeleniumUtilsPath)\src\Integrations\Riganti.Selenium.xUnit\Riganti.Selenium.xUnitIntegration.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Samples/Tests/Tests/Feature/ActionFilterErrorHandlingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ public void Feature_ActionFilterErrorHandling_ActionFilterRedirect()
// try the first button
browser.NavigateToUrl(SamplesRouteUrls.FeatureSamples_ActionFilterErrorHandling_ActionFilterRedirect);
AssertUI.Url(browser, u => !u.Contains("?redirected=true"));
browser.ElementAt("input", 0).Click();
browser.ElementAt("input", 0).Click().Wait(1000);
AssertUI.Url(browser, u => u.Contains("?redirected=true"));

// try the second button
browser.NavigateToUrl(SamplesRouteUrls.FeatureSamples_ActionFilterErrorHandling_ActionFilterRedirect);
AssertUI.Url(browser, u => !u.Contains("?redirected=true"));
browser.ElementAt("input", 1).Click();
browser.ElementAt("input", 1).Click().Wait(1000);
AssertUI.Url(browser, u => u.Contains("?redirected=true"));
});
}
Expand Down
19 changes: 18 additions & 1 deletion src/Samples/Tests/Tests/Feature/PostbackConcurrencyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Threading;
using DotVVM.Samples.Tests.Base;
using DotVVM.Testing.Abstractions;
using OpenQA.Selenium;
using Riganti.Selenium.Core;
using Riganti.Selenium.Core.Abstractions.Attributes;
using Riganti.Selenium.DotVVM;
Expand Down Expand Up @@ -256,11 +257,27 @@ public void Feature_PostbackConcurrency_RedirectPostbackQueueSpa_PostbackFromPre
browser.ElementAt("input[type=button]", 0).Click();
browser.ElementAt("input[type=button]", 2).Click();

var attempt = 0;
while (!browser.CurrentUrl.Contains("?time"))
{
attempt++;
if (attempt > 50)
{
Assert.Fail("The redirect didn't happen.");
}

Thread.Sleep(100);
AssertUI.TextNotEquals(browser.Single(".result"), "1");
try
{
AssertUI.TextNotEquals(browser.Single(".result"), "1", waitForOptions: WaitForOptions.Disabled);
}
catch (StaleElementReferenceException)
{
// ignore
break;
}
}
AssertUI.Url(browser, u => u.Contains("?time"));

for (int i = 0; i < 8; i++)
{
Expand Down