riganti · cafour · Sep 22, 2023 · Aug 12, 2023 · Aug 12, 2023 · Aug 12, 2023
diff --git a/.github/uitest/action.yml b/.github/uitest/action.yml
@@ -8,7 +8,7 @@ inputs:
     required: false
   build-configuration:
     default: Debug
-    description: which --configuration to pass to dotnet build / dotnet run    
+    description: which --configuration to pass to dotnet build / dotnet run
     required: false
   runtime-environment:
     default: Development
@@ -25,6 +25,7 @@ inputs:
 runs:
   using: composite
   steps:
+
   # run the appropriate uitest script
   - if: ${{ runner.os != 'Windows' }}
     name: uitest.sh

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -139,7 +139,7 @@ jobs:
         name: webforms-adapters-tests
         title: WebForms Adapter Tests
         github-token: ${{ secrets.GITHUB_TOKEN }}
-        target-framework: net472        
+        target-framework: net472
 
   js-tests:
     runs-on: ubuntu-latest

diff --git a/src/Analyzers/Analyzers.Tests/DotVVM.Analyzers.Tests.csproj b/src/Analyzers/Analyzers.Tests/DotVVM.Analyzers.Tests.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.MSTest" Version="1.1.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.MSTest" Version="1.1.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.MSTest" Version="1.1.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>

diff --git a/...Api/Swashbuckle.AspNetCore.Tests/DotVVM.Framework.Api.Swashbuckle.AspNetCore.Tests.csproj b/...Api/Swashbuckle.AspNetCore.Tests/DotVVM.Framework.Api.Swashbuckle.AspNetCore.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.6" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.5" />

diff --git a/src/Framework/Testing.SeleniumHelpers/DotVVM.Framework.Testing.SeleniumHelpers.csproj b/src/Framework/Testing.SeleniumHelpers/DotVVM.Framework.Testing.SeleniumHelpers.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Selenium.Support" Version="4.0.0" />
-    <PackageReference Include="Selenium.WebDriver" Version="4.0.0" />
+    <PackageReference Include="Selenium.Support" Version="4.11.0" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.11.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Samples/Api.Owin/Properties/launchSettings.json b/src/Samples/Api.Owin/Properties/launchSettings.json
@@ -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"
+      }
     }
   }
 }
diff --git a/src/Samples/AspNetCore/Properties/launchSettings.json b/src/Samples/AspNetCore/Properties/launchSettings.json
@@ -4,6 +4,7 @@
       "commandName": "Project",
       "launchBrowser": true,
       "launchUrl": "http://localhost:16019",
+      "applicationUrl": "http://localhost:16019",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

diff --git a/src/Samples/AspNetCoreLatest/Properties/launchSettings.json b/src/Samples/AspNetCoreLatest/Properties/launchSettings.json
@@ -4,6 +4,7 @@
       "commandName": "Project",
       "launchBrowser": true,
       "launchUrl": "http://localhost:16019",
+      "applicationUrl": "http://localhost:16019",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

diff --git a/src/Samples/Owin/Properties/launchSettings.json b/src/Samples/Owin/Properties/launchSettings.json
@@ -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"
+      }
     }
   }
 }
diff --git a/src/Samples/Tests/Tests/Complex/SPAErrorReportingTests.cs b/src/Samples/Tests/Tests/Complex/SPAErrorReportingTests.cs
@@ -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;
@@ -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,

diff --git a/src/Samples/Tests/Tests/DotVVM.Samples.Tests.csproj b/src/Samples/Tests/Tests/DotVVM.Samples.Tests.csproj
@@ -3,24 +3,33 @@
   <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.7.1" />
+    <PackageReference Include="Selenium.Support" Version="4.11.0" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.11.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">
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <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-preview15-final" />
+    <PackageReference Include="Riganti.Selenium.AssertApi" Version="3.0.0-preview15-final" />
+    <PackageReference Include="Riganti.Selenium.xUnitIntegration" Version="3.0.0-preview15-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>

diff --git a/src/Samples/Tests/Tests/Feature/ActionFilterErrorHandlingTest.cs b/src/Samples/Tests/Tests/Feature/ActionFilterErrorHandlingTest.cs
@@ -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"));
             });
         }

diff --git a/src/Samples/Tests/Tests/Feature/PostbackConcurrencyTests.cs b/src/Samples/Tests/Tests/Feature/PostbackConcurrencyTests.cs
@@ -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;
@@ -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++)
                 {

diff --git a/src/Samples/Tests/Tests/seleniumconfig.json b/src/Samples/Tests/Tests/seleniumconfig.json
@@ -1,8 +1,6 @@
 {
   "factories": {
-    "chrome:fast": {
-      "capabilities": [ "--headless" ]
-    }
+    "firefox:fast": {}
   },
   "baseUrls": [
     "http://localhost:16019/"

diff --git a/src/Tests/DotVVM.Framework.Tests.csproj b/src/Tests/DotVVM.Framework.Tests.csproj
@@ -47,12 +47,12 @@
   <ItemGroup>
     <PackageReference Include="AngleSharp" Version="0.17.0" />
     <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.*" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.*" />
     <PackageReference Include="coverlet.collector" Version="3.1.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.0.0" PrivateAssets="all" />

diff --git a/src/Tracing/MiniProfiler.Tests/DotVVM.Tracing.MiniProfiler.Tests.csproj b/src/Tracing/MiniProfiler.Tests/DotVVM.Tracing.MiniProfiler.Tests.csproj
@@ -4,7 +4,7 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.6" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">