Merge 375799c into ba194df

AxaFrance · Apr 6, 2023 · d9bd3af · d9bd3af
2 parents ba194df + 375799c
commit d9bd3af
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 20 deletions.
diff --git a/src/AxaFrance.WebEngine.MobileApp/AxaFrance.WebEngine.MobileApp.csproj b/src/AxaFrance.WebEngine.MobileApp/AxaFrance.WebEngine.MobileApp.csproj
@@ -20,9 +20,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appium.WebDriver" Version="5.0.0-beta02" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="Selenium.WebDriver" Version="4.7.0" />
+    <PackageReference Include="Appium.WebDriver" Version="5.0.0-beta03" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.8.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/AxaFrance.WebEngine.ReportViewer/AxaFrance.WebEngine.ReportViewer.csproj b/src/AxaFrance.WebEngine.ReportViewer/AxaFrance.WebEngine.ReportViewer.csproj
@@ -35,7 +35,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AvalonEdit" Version="6.2.0.78" />
+    <PackageReference Include="AvalonEdit" Version="6.3.0.90" />
     <PackageReference Include="Hummingbird.UI" Version="1.2.2772.2" />
   </ItemGroup>
 

diff --git a/src/AxaFrance.WebEngine.Web/AxaFrance.WebEngine.Web.csproj b/src/AxaFrance.WebEngine.Web/AxaFrance.WebEngine.Web.csproj
@@ -36,10 +36,10 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Appium.WebDriver" Version="5.0.0-beta02" />
+    <PackageReference Include="Appium.WebDriver" Version="5.0.0-beta03" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="Selenium.WebDriver" Version="4.7.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.8.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/AxaFrance.WebEngine.Web/BrowserFactory.cs b/src/AxaFrance.WebEngine.Web/BrowserFactory.cs
@@ -297,7 +297,14 @@ private static void AddBrowserStackOptions(DriverOptions options, Settings s)
                 browserstackOptions.Add("browserVersion", s.BrowserVersion); //13.0
             }
             //browserstackOptions.Add("seleniumVersion", "4.7.0");             //Same as installed selenium package;
-            options.AddAdditionalOption("bstack:options", browserstackOptions);
+            if (options is AppiumOptions ao)
+            {
+                ao.AddAdditionalAppiumOption("bstack:options", browserstackOptions);
+            }
+            else
+            {
+                options.AddAdditionalOption("bstack:options", browserstackOptions);
+            }
 
             var assembly = GlobalConstants.LoadedAssemblies.FirstOrDefault();
             var name = assembly?.GetName();

diff --git a/src/AxaFrance.WebEngine/AxaFrance.WebEngine.csproj b/src/AxaFrance.WebEngine/AxaFrance.WebEngine.csproj
@@ -54,7 +54,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
 

diff --git a/src/Samples.Gherkin/Samples.Gherkin.csproj b/src/Samples.Gherkin/Samples.Gherkin.csproj
@@ -7,12 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="SpecFlow.Plus.LivingDocPlugin" Version="3.9.57" />
     <PackageReference Include="SpecFlow.NUnit" Version="3.9.74" />
     <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
-    <PackageReference Include="FluentAssertions" Version="6.8.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
+    <PackageReference Include="FluentAssertions" Version="6.10.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Samples.LinearScripting/Samples.LinearScripting.csproj b/src/Samples.LinearScripting/Samples.LinearScripting.csproj
@@ -9,15 +9,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appium.WebDriver" Version="5.0.0-beta02" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.0.0" />
+    <PackageReference Include="Appium.WebDriver" Version="5.0.0-beta03" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
     <PackageReference Include="coverlet.collector" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Selenium.WebDriver" Version="4.7.0" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.8.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/WebEngine.Test/UnitTests/WebTest.cs b/src/WebEngine.Test/UnitTests/WebTest.cs
@@ -41,7 +41,7 @@ public static void Initialize(TestContext context)
         {
             if (driver == null)
             {
-                driver = BrowserFactory.GetDriver(AxaFrance.WebEngine.Platform.Windows, BrowserType.Chrome);
+                driver = BrowserFactory.GetDriver(AxaFrance.WebEngine.Platform.Windows, BrowserType.ChromiumEdge);
                 driver.Navigate().GoToUrl("http://webengine-test.azurewebsites.net/");
             }
         }
@@ -97,7 +97,7 @@ public void SecurePassword()
                 inputBox.SetSecure(password);    //-> Error with Not supported Exception
             } catch
             {
-
+                return;
             }
             Assert.Fail("no exception if setsecure is used on normal text box");
         }

diff --git a/src/WebEngine.Test/WebEngine.Test.csproj b/src/WebEngine.Test/WebEngine.Test.csproj
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
     <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
     <PackageReference Include="coverlet.collector" Version="3.2.0">