Add cancellation token.

OrchardCMS · Feb 28, 2025 · 3c1efcc · 3c1efcc
1 parent c243f26
commit 3c1efcc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/test/OrchardCore.Commerce.Tests.UI/Extension/FormUITestContextExtensions.cs b/test/OrchardCore.Commerce.Tests.UI/Extension/FormUITestContextExtensions.cs
@@ -27,18 +27,20 @@ Task FillAsync(string suffix, string value, bool isDropdown = false)
                 return context.ClickAndFillInWithRetriesAsync(by, value);
             }
 
-            return ReliabilityHelper.DoWithRetriesOrFailAsync(async () =>
-            {
-                try
-                {
-                    await context.SetDropdownByValueAsync(by, value);
-                    return true;
-                }
-                catch (WebDriverException)
+            return ReliabilityHelper.DoWithRetriesOrFailAsync(
+                async () =>
                 {
-                    return false;
-                }
-            });
+                    try
+                    {
+                        await context.SetDropdownByValueAsync(by, value);
+                        return true;
+                    }
+                    catch (WebDriverException)
+                    {
+                        return false;
+                    }
+                },
+                cancellationToken: context.Configuration.TestCancellationToken);
         }
 
         await FillAsync(nameof(address.Name), address.Name);

diff --git a/test/OrchardCore.Commerce.Tests.UI/UITestBase.cs b/test/OrchardCore.Commerce.Tests.UI/UITestBase.cs
@@ -27,7 +27,7 @@ protected async Task ExecuteTestAfterSetupAsync(
         var timeoutValue = timeout ?? TimeSpan.FromMinutes(10);
 
         var testTask = ExecuteTestAsync(testAsync, browser, SetupHelpers.RunSetupAsync, changeConfigurationAsync);
-        var timeoutTask = Task.Delay(timeoutValue);
+        var timeoutTask = Task.Delay(timeoutValue, CancellationToken.None);
 
         await Task.WhenAny(testTask, timeoutTask);