[dotnet] implement appropriate waiting for bidi navigation based on p…

…age load strategy
SeleniumHQ · May 29, 2024 · 903bc2b · 903bc2b
1 parent 38a94b6
commit 903bc2b
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/dotnet/src/webdriver/Navigator.cs b/dotnet/src/webdriver/Navigator.cs
@@ -30,6 +30,14 @@ internal class Navigator : INavigation
     {
         private WebDriver driver;
         private string browsingContextId;
+        private static readonly Dictionary<string, ReadinessState> PageLoadStrategyMapper = new()
+        {
+            {"normal", ReadinessState.Complete},
+            {"default", ReadinessState.Complete},
+            {"eager", ReadinessState.Interactive},
+            {"none", ReadinessState.None}
+        };
+        private ReadinessState readinessState;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Navigator"/> class
@@ -119,7 +127,11 @@ public async Task GoToUrlAsync(string url)
 
             if (this.driver.BiDiDriver != null)
             {
-                await driver.BiDiDriver.BrowsingContext.NavigateAsync(new NavigateCommandParameters(this.browsingContextId, url)).ConfigureAwait(false);
+                NavigateCommandParameters navigateCommandParameters = new NavigateCommandParameters(this.browsingContextId, url)
+                    {
+                        Wait = this.readinessState
+                    };
+                await driver.BiDiDriver.BrowsingContext.NavigateAsync(navigateCommandParameters).ConfigureAwait(false);
             }
             else
             {
@@ -172,7 +184,10 @@ public async Task RefreshAsync()
             if (this.driver.BiDiDriver != null)
             {
                 var reloadCommandParameters =
-                    new ReloadCommandParameters(this.browsingContextId);
+                    new ReloadCommandParameters(this.browsingContextId)
+                    {
+                        Wait =  this.readinessState
+                    };
                 await this.driver.BiDiDriver.BrowsingContext.ReloadAsync(reloadCommandParameters).ConfigureAwait(false);
             }
             else