Update libs

skbkontur · Aug 16, 2023 · ee02788 · ee02788
1 parent 584b458
commit ee02788
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/DbViewer.TestApi/DbViewer.TestApi.csproj b/DbViewer.TestApi/DbViewer.TestApi.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="GroboContainer" Version="1.2.60" />
     <PackageReference Include="GroBuf" Version="1.7.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.20" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.20" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.20" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.8" />

diff --git a/DbViewer.Tests/DbViewer.Tests.csproj b/DbViewer.Tests/DbViewer.Tests.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
-    <PackageReference Include="Kontur.ReactUI.SeleniumTesting" Version="3.5.3" />
+    <PackageReference Include="Kontur.ReactUI.SeleniumTesting" Version="3.6.0" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />

diff --git a/DbViewer.Tests/FrontTests/Helpers/BrowserForTests.cs b/DbViewer.Tests/FrontTests/Helpers/BrowserForTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
 using System.IO;
@@ -8,6 +9,7 @@
 
 using NUnit.Framework;
 
+using OpenQA.Selenium;
 using OpenQA.Selenium.Chrome;
 using OpenQA.Selenium.Remote;
 
@@ -67,7 +69,7 @@ public string DownloadFile(string filename)
         private TPage InitializePage<TPage>()
         {
             var newPage = (TPage)Activator.CreateInstance(typeof(TPage), WebDriver);
-            (newPage as PageBase).WaitLoaded();
+            // (newPage as PageBase).WaitLoaded();
             return newPage;
         }
 
@@ -83,16 +85,14 @@ public RemoteWebDriver WebDriver
                 if (webDriver != null) return webDriver;
 
                 var wdHub = "http://localhost:4444/wd/hub";
-                ChromeOptions options = new ChromeOptions();
-
-                options.AddAdditionalCapability(CapabilityType.Platform, "Windows 10", true);
-                options.AddAdditionalCapability("name", TestContext.CurrentContext.Test.Name, true);
-                options.AddAdditionalCapability("maxDuration", 10800, true);
-
-                var caps = (DesiredCapabilities)options.ToCapabilities();
-                caps.SetCapability("enableVNC", true);
-
-                webDriver = new RemoteWebDriver(new Uri(wdHub), caps, TimeSpan.FromMinutes(1));
+                var options = new ChromeOptions();
+
+                var selenoidOptions = new Dictionary<string, object> {{"enableVNC", true}};
+                options.AddAdditionalOption("selenoid:options", selenoidOptions);
+                options.AddAdditionalOption(CapabilityType.Platform, "Windows 10");
+                options.AddAdditionalOption("name", TestContext.CurrentContext.Test.Name);
+                options.AddAdditionalOption("maxDuration", 10800);
+                webDriver = new RemoteWebDriver(new Uri(wdHub), options.ToCapabilities(), TimeSpan.FromMinutes(1));
                 webDriver.Manage().Window.Size = new Size(1280, 1024);
                 return webDriver;
             }

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -35,7 +35,7 @@ services:
 
   selenoid:
     container_name: selenoid
-    image: aerokube/selenoid:1.10.0
+    image: aerokube/selenoid:1.11.0
     networks:
       - default-network
     ports:
@@ -47,7 +47,7 @@ services:
 
   selenoid-ui:
     container_name: selenoid-ui
-    image: aerokube/selenoid-ui:1.10.0
+    image: aerokube/selenoid-ui:1.10.10
     networks:
       - default-network
     ports: