Add PageLoadStrategy to IDriverSettings (#182)

aquality-automation · May 8, 2020 · f0f09c7 · f0f09c7
1 parent 6acd182
commit f0f09c7
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 16 deletions.
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/ChromeSettings.cs b/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/ChromeSettings.cs
@@ -30,6 +30,7 @@ public override DriverOptions DriverOptions
                 SetChromePrefs(options);
                 SetCapabilities(options, (name, value) => options.AddAdditionalCapability(name, value, isGlobalCapability: true));
                 SetChromeArguments(options);
+                SetPageLoadStratergy(options);
                 return options;
             }
         }

diff --git a/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/DriverSettings.cs b/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/DriverSettings.cs
@@ -24,27 +24,15 @@ protected DriverSettings(ISettingsFile settingsFile)
             SettingsFile = settingsFile;
         }
 
-        private string DriverSettingsPath => $".driverSettings.{BrowserName.ToString().ToLowerInvariant()}";
-
-        protected IDictionary<string, object> BrowserCapabilities => SettingsFile.GetValueOrNew<Dictionary<string, object>>($"{DriverSettingsPath}.capabilities");
-
-        protected IDictionary<string, object> BrowserOptions => SettingsFile.GetValueOrNew<Dictionary<string, object>>($"{DriverSettingsPath}.options");
-
-        protected IReadOnlyList<string> BrowserStartArguments => SettingsFile.GetValueListOrEmpty<string>($"{DriverSettingsPath}.startArguments");
-
         protected ISettingsFile SettingsFile { get; }
 
-        protected abstract BrowserName BrowserName { get; }
-
-        protected virtual IDictionary<string, Action<DriverOptions, object>> KnownCapabilitySetters => new Dictionary<string, Action<DriverOptions, object>>();
+        public string WebDriverVersion => SettingsFile.GetValueOrDefault($"{DriverSettingsPath}.webDriverVersion", "Latest");
 
-        public abstract string DownloadDirCapabilityKey { get; }
+        public Architecture SystemArchitecture => SettingsFile.GetValueOrDefault($"{DriverSettingsPath}.systemArchitecture", Architecture.Auto).ToEnum<Architecture>();
 
         public abstract DriverOptions DriverOptions { get; }
 
-        public string WebDriverVersion => SettingsFile.GetValueOrDefault($"{DriverSettingsPath}.webDriverVersion", defaultValue: "Latest");
-
-        public Architecture SystemArchitecture => SettingsFile.GetValueOrDefault($"{DriverSettingsPath}.systemArchitecture", "Auto").ToEnum<Architecture>();
+        public PageLoadStrategy PageLoadStrategy => SettingsFile.GetValueOrDefault($"{DriverSettingsPath}.pageLoadStrategy", PageLoadStrategy.Normal).ToEnum<PageLoadStrategy>();
 
         public virtual string DownloadDir
         {
@@ -60,6 +48,25 @@ public virtual string DownloadDir
             }
         }
 
+        public abstract string DownloadDirCapabilityKey { get; }
+
+        protected IDictionary<string, object> BrowserCapabilities => SettingsFile.GetValueOrNew<Dictionary<string, object>>($"{DriverSettingsPath}.capabilities");
+
+        protected IDictionary<string, object> BrowserOptions => SettingsFile.GetValueOrNew<Dictionary<string, object>>($"{DriverSettingsPath}.options");
+
+        protected IReadOnlyList<string> BrowserStartArguments => SettingsFile.GetValueListOrEmpty<string>($"{DriverSettingsPath}.startArguments");
+
+        private string DriverSettingsPath => $".driverSettings.{BrowserName.ToString().ToLowerInvariant()}";        
+
+        protected abstract BrowserName BrowserName { get; }
+
+        protected virtual IDictionary<string, Action<DriverOptions, object>> KnownCapabilitySetters => new Dictionary<string, Action<DriverOptions, object>>();
+
+        protected void SetPageLoadStratergy(DriverOptions options)
+        {
+            options.PageLoadStrategy = PageLoadStrategy;
+        }
+
         protected void SetCapabilities(DriverOptions options, Action<string, object> addCapabilityMethod = null)
         {
             foreach (var capability in BrowserCapabilities)

diff --git a/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/EdgeSettings.cs b/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/EdgeSettings.cs
@@ -28,6 +28,7 @@ public override DriverOptions DriverOptions
                 var options = new EdgeOptions();
                 SetCapabilities(options);
                 SetOptionsByPropertyNames(options);
+                SetPageLoadStratergy(options);
                 return options;
             }
         }

diff --git a/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/FirefoxSettings.cs b/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/FirefoxSettings.cs
@@ -40,6 +40,7 @@ public override DriverOptions DriverOptions
                 SetCapabilities(options, (name, value) => options.AddAdditionalCapability(name, value, isGlobalCapability: true));
                 SetFirefoxPrefs(options);
                 SetFirefoxArguments(options);
+                SetPageLoadStratergy(options);
                 return options;
             }
         }

diff --git a/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/IDriverSettings.cs b/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/IDriverSettings.cs
@@ -23,6 +23,11 @@ public interface IDriverSettings
         /// </summary>
         DriverOptions DriverOptions { get; }
 
+        /// <summary>
+        /// WebDriver page load strategy.
+        /// </summary>
+        PageLoadStrategy PageLoadStrategy { get; }
+
         /// <summary>
         /// Gets download directory for web driver.
         /// </summary>

diff --git a/...lenium/src/Aquality.Selenium/Configurations/WebDriverSettings/InternetExplorerSettings.cs b/...lenium/src/Aquality.Selenium/Configurations/WebDriverSettings/InternetExplorerSettings.cs
@@ -41,6 +41,7 @@ public override DriverOptions DriverOptions
                 var options = new InternetExplorerOptions();
                 SetCapabilities(options);
                 SetOptionsByPropertyNames(options);
+                SetPageLoadStratergy(options);
                 options.BrowserCommandLineArguments = string.Join(" ", BrowserStartArguments);
                 return options;
             }

diff --git a/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/SafariSettings.cs b/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/SafariSettings.cs
@@ -27,6 +27,7 @@ public override DriverOptions DriverOptions
                 var options = new SafariOptions();
                 SetCapabilities(options);
                 SetOptionsByPropertyNames(options);
+                SetPageLoadStratergy(options);
                 return options;
             }
         }

diff --git a/Aquality.Selenium/src/Aquality.Selenium/Resources/settings.json b/Aquality.Selenium/src/Aquality.Selenium/Resources/settings.json
@@ -18,7 +18,8 @@
         "download.prompt_for_download": "false",
         "download.default_directory": "//home//selenium//downloads"
       },
-      "startArguments": []
+      "startArguments": [],
+      "pageLoadStrategy": "Normal"
     },
     "firefox": {
       "webDriverVersion": "Latest",