Update to Selenium 4.24.0 (#123)

Temporarily add direct reference to Newtonsoft.Json Stabilize wait for FindElements in the ElementFactory +semver:feature
aquality-automation · Aug 30, 2024 · d28171d · d28171d
1 parent 764517d
commit d28171d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Aquality.Selenium.Core.csproj b/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Aquality.Selenium.Core.csproj
@@ -50,9 +50,10 @@
     <PackageReference Include="DotNetSeleniumExtras.PageObjects" Version="3.11.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
-    <PackageReference Include="NLog" Version="5.3.2" />
-    <PackageReference Include="Selenium.Support" Version="4.23.0" />
-    <PackageReference Include="Selenium.WebDriver" Version="4.23.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="NLog" Version="5.3.3" />
+    <PackageReference Include="Selenium.Support" Version="4.24.0" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.24.0" />
     <PackageReference Include="SkiaSharp" Version="2.88.8" />    
   </ItemGroup>
 </Project>
diff --git a/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/ElementFactory.cs b/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/ElementFactory.cs
@@ -69,15 +69,22 @@ public virtual IList<T> FindElements<T>(By locator, string name = null, ElementS
                 default:
                     throw new ArgumentOutOfRangeException($"No such expected value: {expectedCount}");
             }
-
-            var webElements = ElementFinder.FindElements(locator, state, TimeSpan.Zero, name);
-            IEnumerable<T> elements = webElements.Select((webElement, index) =>
+            
+            var elements = new List<T>();
+            ConditionalWait.WaitFor(() =>
             {
-                var elementIndex = index + 1;
-                var elementName = $"{name ?? "element"} {elementIndex}";
-                return elementSupplier(GenerateLocator(locator, webElement, elementIndex), elementName, state);
-            });
-            return elements.ToList();
+                var webElements = ElementFinder.FindElements(locator, state, TimeSpan.Zero, name);
+                elements = webElements.Select((webElement, index) =>
+                {
+                    var elementIndex = index + 1;
+                    var elementName = $"{name ?? "element"} {elementIndex}";
+                    return elementSupplier(GenerateLocator(locator, webElement, elementIndex), elementName, state);
+                }).ToList();
+                var anyElementsFound = elements.Any();
+                return expectedCount == ElementsCount.Any || (expectedCount == ElementsCount.Zero && !anyElementsFound) || (expectedCount == ElementsCount.MoreThenZero && anyElementsFound);
+            }, exceptionsToIgnore: new List<Type> { typeof(StaleElementReferenceException), typeof(JavaScriptException) , typeof(WebDriverTimeoutException)});
+
+            return elements;
         }
 
         public virtual T GetCustomElement<T>(ElementSupplier<T> elementSupplier, By locator, string name, ElementState state = ElementState.Displayed) where T : IElement

diff --git a/...lity.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Aquality.Selenium.Core.Tests.csproj b/...lity.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Aquality.Selenium.Core.Tests.csproj
@@ -27,12 +27,12 @@
   <ItemGroup>
     <PackageReference Include="Appium.WebDriver" Version="5.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="nunit" Version="4.1.0" />
+    <PackageReference Include="nunit" Version="4.2.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
   </ItemGroup>
 
   <ItemGroup>