Adding ClickReliablyOnThenWaitForUrlChangeAsync()

Lombiq.Tests.UI/Extensions/NavigationUITestContextExtensions.cs

@@ -296,6 +296,18 @@ public static Task ClickReliablyOnUntilPageLeaveAsync(
         TimeSpan? interval = null) =>
         context.Get(by).ClickReliablyUntilPageLeaveAsync(context, timeout, interval);
 
+    /// <summary>
+    /// A convenience method that merges <see cref="ElementRetrievalUITestContextExtensions.Get"/> and <see
+    /// cref="NavigationWebElementExtensions.ClickReliablyThenWaitForUrlChangeAsync(IWebElement, UITestContext, TimeSpan?,
+    /// TimeSpan?)"/> so the <paramref name="context"/> doesn't have to be passed twice.
+    /// </summary>
+    public static Task ClickReliablyOnThenWaitForUrlChangeAsync(
+        this UITestContext context,
+        By by,
+        TimeSpan? timeout = null,
+        TimeSpan? interval = null) =>
+        context.Get(by).ClickReliablyThenWaitForUrlChangeAsync(context, timeout, interval);
+
     /// <summary>
     /// Switches control to JS alert box, accepts it, and switches control back to main document or first frame.
     /// </summary>

Lombiq.Tests.UI/Extensions/NavigationWebElementExtensions.cs

@@ -67,7 +67,8 @@ await context.Configuration.Events.AfterClick
 
     /// <summary>
     /// Repeatedly clicks an element until the browser leaves the page. If you're doing a Get() before then use <see
-    /// cref="NavigationUITestContextExtensions.ClickReliablyOnAsync(UITestContext, By, int)"/> instead.
+    /// cref="NavigationUITestContextExtensions.ClickReliablyOnUntilPageLeaveAsync(UITestContext, By, TimeSpan?, TimeSpan?)"/>
+    /// instead.
     /// </summary>
     public static Task ClickReliablyUntilPageLeaveAsync(
         this IWebElement element,
@@ -82,4 +83,24 @@ public static Task ClickReliablyUntilPageLeaveAsync(
             },
             timeout,
             interval);
+
+    /// <summary>
+    /// Repeatedly clicks an element until the browser leaves the page. If you're doing a Get() before then use <see
+    /// cref="NavigationUITestContextExtensions.ClickReliablyOnThenWaitForUrlChangeAsync(UITestContext, By, TimeSpan?, TimeSpan?)"/>
+    /// instead.
+    /// </summary>
+    public static async Task ClickReliablyThenWaitForUrlChangeAsync(
+        this IWebElement element,
+        UITestContext context,
+        TimeSpan? timeout = null,
+        TimeSpan? interval = null)
+    {
+        var originalUri = context.GetCurrentUri();
+        await element.ClickReliablyAsync(context);
+
+        context.DoWithRetriesOrFail(
+            () => context.GetCurrentUri() != originalUri,
+            timeout,
+            interval);
+    }
 }