ui tests: avoid stale ements in ApiTests

riganti · Nov 2, 2022 · ea2af16 · ea2af16
1 parent 9aafca0
commit ea2af16
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/Samples/Tests/Tests/Feature/ApiTests.cs b/src/Samples/Tests/Tests/Feature/ApiTests.cs
@@ -9,6 +9,7 @@
 using Riganti.Selenium.DotVVM;
 using Xunit;
 using Xunit.Abstractions;
+using static DotVVM.Samples.Tests.UITestUtils;
 
 namespace DotVVM.Samples.Tests.Feature
 {
@@ -28,15 +29,15 @@ public void Feature_Api_GetCollection()
                 }, 30000, "Cannot find CompanyID = 11. Probably data are not loaded. (The page did not load in 5s.)");
 
                 // ensure that orders have been loaded
-                WaitForExecutor.WaitFor(() => {
+                WaitForIgnoringStaleElements(() => {
                     AssertUI.Any(browser.FindElements(".id-order"), waitForOptions: WaitForOptions.Disabled).Attribute("data-order-id", "6");
                 });
 
                 var idToDelete = browser.FindElements(".id-order")[2].GetAttribute("data-order-id");       // every order has two elements (read-only and edit)
 
                 // delete order (ID = 7)
                 browser.First($".id-order[data-order-id='{idToDelete}'] input[type=button][value=Delete]").Click();
-                WaitForExecutor.WaitFor(() => {
+                WaitForIgnoringStaleElements(() => {
                     AssertUI.Any(browser.FindElements(".id-order"), WaitForOptions.Disabled).Attribute("data-order-id", "6");
                     AssertUI.All(browser.FindElements(".id-order"), WaitForOptions.Disabled).Attribute("data-order-id", s => s != idToDelete);
                 });
@@ -46,7 +47,7 @@ public void Feature_Api_GetCollection()
 
 
                 // ensure that orders have been loaded
-                WaitForExecutor.WaitFor(() => {
+                WaitForIgnoringStaleElements(() => {
                     AssertUI.Any(browser.FindElements(".id-order"), WaitForOptions.Disabled).Attribute("data-order-id", "2");
                     AssertUI.Any(browser.FindElements(".id-order"), WaitForOptions.Disabled).Attribute("data-order-id", "9");
                 });

diff --git a/src/Samples/Tests/Tests/UITestUtils.cs b/src/Samples/Tests/Tests/UITestUtils.cs
@@ -1,5 +1,6 @@
 using System;
 using OpenQA.Selenium;
+using Riganti.Selenium.Core;
 
 namespace DotVVM.Samples.Tests;
 public static class UITestUtils
@@ -21,4 +22,10 @@ public static T StaleElementRetry<T>(Func<T> action, int attempts = 5)
     }
     public static void StaleElementRetry(Action action, int attempts = 5) =>
         StaleElementRetry(() => { action(); return 0; }, attempts);
+
+
+    public static void WaitForIgnoringStaleElements(Action action, WaitForOptions options = null)
+    {
+        WaitForExecutor.WaitFor(() => StaleElementRetry(action), options);
+    }
 }