finished implementetion of DriverSettings.

mialeska · mialeska · commit 9c3b1d44fb1e · 2019-08-07T15:11:38.000+03:00
fixed IE, Edge and Firefox issues add support for "KnownCapabilities" and options for IE/Edge remove WebDriverManager setup for Edge rename IE in BrowserName enum Resolves #4
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Browsers/Browser.cs b/Aquality.Selenium/src/Aquality.Selenium/Browsers/Browser.cs
@@ -295,7 +295,7 @@ public enum BrowserName
         Chrome,
         Edge,
         Firefox,
-        InternetExplorer,
+        IExplorer,
         Safari
     }
 
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Browsers/LocalBrowserFactory.cs b/Aquality.Selenium/src/Aquality.Selenium/Browsers/LocalBrowserFactory.cs
@@ -38,12 +38,11 @@ private Browser CreateBrowser()
                     driverManager.SetUpDriver(new FirefoxConfig(), driverSettings.WebDriverVersion, driverSettings.SystemArchitecture);
                     driver = new FirefoxDriver((FirefoxOptions)driverSettings.DriverOptions);
                     break;
-                case BrowserName.InternetExplorer:
+                case BrowserName.IExplorer:
                     driverManager.SetUpDriver(new InternetExplorerConfig(), driverSettings.WebDriverVersion, driverSettings.SystemArchitecture);
                     driver = new InternetExplorerDriver((InternetExplorerOptions)driverSettings.DriverOptions);
                     break;
                 case BrowserName.Edge:
-                    driverManager.SetUpDriver(new EdgeConfig(), driverSettings.WebDriverVersion, driverSettings.SystemArchitecture);
                     driver = new EdgeDriver((EdgeOptions)driverSettings.DriverOptions);
                     break;
                 case BrowserName.Safari:
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Configurations/BrowserProfile.cs b/Aquality.Selenium/src/Aquality.Selenium/Configurations/BrowserProfile.cs
@@ -41,7 +41,7 @@ public IDriverSettings DriverSettings
                         return new EdgeSettings(settingsFile);
                     case BrowserName.Firefox:
                         return new FirefoxSettings(settingsFile);
-                    case BrowserName.InternetExplorer:
+                    case BrowserName.IExplorer:
                         return new InternetExplorerSettings(settingsFile);
                     case BrowserName.Safari:
                         return new SafariSettings(settingsFile);
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/ChromeSettings.cs b/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/ChromeSettings.cs
@@ -2,7 +2,6 @@
 using Aquality.Selenium.Utilities;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Chrome;
-using System.Linq;
 
 namespace Aquality.Selenium.Configurations.WebDriverSettings
 {
@@ -19,17 +18,17 @@ public ChromeSettings(JsonFile settingsFile) : base(settingsFile)
         {
         }
 
-        public override string DownloadDirCapabilityKey => "download.default_directory";
-
         protected override BrowserName BrowserName => BrowserName.Chrome;
 
+        public override string DownloadDirCapabilityKey => "download.default_directory";
+
         public override DriverOptions DriverOptions
         {
             get
             {
                 var options = new ChromeOptions();
                 SetChromePrefs(options);
-                SetGlobalCapabilities(options);
+                SetCapabilities(options, (name, value) => options.AddAdditionalCapability(name, value, isGlobalCapability: true));
                 SetChromeArguments(options);
                 return options;
             }
@@ -48,10 +47,5 @@ private void SetChromeArguments(ChromeOptions options)
         {
             options.AddArguments(BrowserStartArguments);
         }
-
-        private void SetGlobalCapabilities(ChromeOptions options)
-        {
-            BrowserCapabilities.ToList().ForEach(capability => options.AddAdditionalCapability(capability.Key, capability.Value, isGlobalCapability: true));
-        }
     }
 }
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/DriverSettings.cs b/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/DriverSettings.cs
@@ -59,19 +59,30 @@ protected IList<string> BrowserStartArguments
 
         protected abstract BrowserName BrowserName { get; }
 
+        protected virtual IDictionary<string, Action<DriverOptions, object>> KnownCapabilitySetters => new Dictionary<string, Action<DriverOptions, object>>();
+
         public abstract string DownloadDirCapabilityKey { get; }
 
         public abstract DriverOptions DriverOptions { get; }
 
-        public string WebDriverVersion => SettingsFile.GetObject<string>($"{DriverSettingsPath}.webDriverVersion");
+        public string WebDriverVersion
+        {
+            get
+            {
+                var jsonPath = $"{DriverSettingsPath}.webDriverVersion";
+                return SettingsFile.IsValuePresent(jsonPath)
+                ? SettingsFile.GetObject<string>(jsonPath)
+                : "Latest";
+            }
+        }
 
         public Architecture SystemArchitecture
         {
             get
             {
                 var jsonPath = $"{DriverSettingsPath}.systemArchitecture";
                 return SettingsFile.IsValuePresent(jsonPath)
-                ? (Architecture) Enum.Parse(typeof(Architecture), SettingsFile.GetObject<string>(jsonPath))
+                ? SettingsFile.GetObject<string>(jsonPath).ToEnum<Architecture>()
                 : Architecture.Auto;
             }
         }
@@ -90,9 +101,63 @@ public virtual string DownloadDir
             }
         }
 
-        protected void SetCapabilities(DriverOptions options)
+        protected void SetCapabilities(DriverOptions options, Action<string, object> addCapabilityMethod = null)
+        {
+            foreach(var capability in BrowserCapabilities)
+            {
+                try
+                {
+                    var defaultAddCapabilityMethod = addCapabilityMethod ?? options.AddAdditionalCapability;
+                    defaultAddCapabilityMethod(capability.Key, capability.Value);
+                } 
+                catch(ArgumentException exception)
+                {
+                    if(exception.Message.StartsWith("There is already an option"))
+                    {
+                        SetKnownProperty(options, capability, exception);
+                    }
+                    else
+                    {
+                        throw exception;
+                    }
+                }
+            }
+        }
+
+        private void SetKnownProperty(DriverOptions options, KeyValuePair<string, object> capability, ArgumentException exception)
+        {
+            if (KnownCapabilitySetters.ContainsKey(capability.Key))
+            {
+                KnownCapabilitySetters[capability.Key](options, capability.Value);
+            }
+            else
+            {
+                SetOptionByPropertyName(options, capability, exception);
+            }            
+        }
+
+        protected void SetOptionsByPropertyNames(DriverOptions options)
+        {
+            foreach (var option in BrowserOptions)
+            {
+                SetOptionByPropertyName(options, option, new NotSupportedException($"Property for option {option.Key} is not supported"));
+            }
+        }
+
+        private void SetOptionByPropertyName(DriverOptions options, KeyValuePair<string, object> option, Exception exception)
+        {
+            var optionProperty = options
+                            .GetType()
+                            .GetProperties()
+                            .FirstOrDefault(property => IsPropertyNameMatchOption(property.Name, option.Key) && property.CanWrite)
+                            ?? throw exception;
+            optionProperty.SetValue(options, option.Value);
+        }
+
+        private bool IsPropertyNameMatchOption(string propertyName, string optionKey)
         {
-            BrowserCapabilities.ToList().ForEach(capability => options.AddAdditionalCapability(capability.Key, capability.Value));
+            return propertyName.Equals(optionKey, StringComparison.InvariantCultureIgnoreCase)
+                || optionKey.ToLowerInvariant().Contains(propertyName.ToLowerInvariant());
         }
     }
 }
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/EdgeSettings.cs b/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/EdgeSettings.cs
@@ -19,18 +19,19 @@ public EdgeSettings(JsonFile settingsFile) : base(settingsFile)
         {
         }
 
+        protected override BrowserName BrowserName => BrowserName.Edge;
+
         public override DriverOptions DriverOptions
         {
             get
             {
                 var options = new EdgeOptions();
                 SetCapabilities(options);
+                SetOptionsByPropertyNames(options);
                 return options;
             }
         }
         
         public override string DownloadDirCapabilityKey => throw new NotSupportedException("Download directory key for Edge profiles is not supported");
-
-        protected override BrowserName BrowserName => BrowserName.Edge;
     }
 }
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/FirefoxSettings.cs b/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/FirefoxSettings.cs
@@ -2,7 +2,8 @@
 using Aquality.Selenium.Utilities;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Firefox;
-using System.Linq;
+using System;
+using System.Collections.Generic;
 
 namespace Aquality.Selenium.Configurations.WebDriverSettings
 {
@@ -19,17 +20,29 @@ public FirefoxSettings(JsonFile settingsFile) : base(settingsFile)
         {
         }
 
+        protected override BrowserName BrowserName => BrowserName.Firefox;
+
+        protected override IDictionary<string, Action<DriverOptions, object>> KnownCapabilitySetters => new Dictionary<string, Action<DriverOptions, object>>
+        {
+            { "binary", (options, value) => ((FirefoxOptions) options).BrowserExecutableLocation = value.ToString() },            
+            { "firefox_binary", (options, value) => ((FirefoxOptions) options).BrowserExecutableLocation = value.ToString() },
+            { "firefox_profile", (options, value) => ((FirefoxOptions) options).Profile = new FirefoxProfileManager().GetProfile(value.ToString()) },
+            { "log", (options, value) => ((FirefoxOptions) options).LogLevel = value.ToEnum<FirefoxDriverLogLevel>() },
+            { "marionette", (options, value) => ((FirefoxOptions) options).UseLegacyImplementation = (bool) value }
+        };
+
         public override DriverOptions DriverOptions
         {
             get
             {
                 var options = new FirefoxOptions();
-                SetGlobalCapabilities(options);
+                SetCapabilities(options, (name, value) => options.AddAdditionalCapability(name, value, isGlobalCapability: true));
                 SetFirefoxPrefs(options);
                 SetFirefoxArguments(options);
                 return options;
             }
         }
+
         private void SetFirefoxPrefs(FirefoxOptions options)
         {
             foreach (var option in BrowserOptions)
@@ -63,13 +76,6 @@ private void SetFirefoxArguments(FirefoxOptions options)
             options.AddArguments(BrowserStartArguments);
         }
 
-        private void SetGlobalCapabilities(FirefoxOptions options)
-        {
-            BrowserCapabilities.ToList().ForEach(capability => options.AddAdditionalCapability(capability.Key, capability.Value, isGlobalCapability: true));
-        }
-
         public override string DownloadDirCapabilityKey => "browser.download.dir";
-
-        protected override BrowserName BrowserName => BrowserName.Firefox;
     }
 }
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/InternetExplorerSettings.cs b/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/InternetExplorerSettings.cs
@@ -1,8 +1,10 @@
 ﻿using System;
+using System.Collections.Generic;
 using Aquality.Selenium.Browsers;
 using Aquality.Selenium.Utilities;
 using OpenQA.Selenium;
 using OpenQA.Selenium.IE;
+using OpenQA.Selenium.Remote;
 
 namespace Aquality.Selenium.Configurations.WebDriverSettings
 {
@@ -19,18 +21,30 @@ public InternetExplorerSettings(JsonFile settingsFile) : base(settingsFile)
         {
         }
 
+        protected override BrowserName BrowserName => BrowserName.IExplorer;
+
+        protected override IDictionary<string, Action<DriverOptions, object>> KnownCapabilitySetters => new Dictionary<string, Action<DriverOptions, object>>
+        {
+            { "ignoreProtectedModeSettings", (options, value) => ((InternetExplorerOptions) options).IntroduceInstabilityByIgnoringProtectedModeSettings = (bool) value },
+            { "ignoreZoomSetting", (options, value) => ((InternetExplorerOptions) options).IgnoreZoomLevel = (bool) value },
+            { CapabilityType.HasNativeEvents, (options, value) => ((InternetExplorerOptions) options).EnableNativeEvents = (bool) value },
+            { CapabilityType.UnexpectedAlertBehavior, (options, value) => ((InternetExplorerOptions) options).UnhandledPromptBehavior = value.ToEnum<UnhandledPromptBehavior>() },
+            { "ie.browserCommandLineSwitches", (options, value) => ((InternetExplorerOptions) options).BrowserCommandLineArguments = value.ToString() },
+            { "elementScrollBehavior", (options, value) => ((InternetExplorerOptions) options).ElementScrollBehavior = value.ToEnum<InternetExplorerElementScrollBehavior>() }
+        };
+
         public override DriverOptions DriverOptions
         {
             get
             {
                 var options = new InternetExplorerOptions();
                 SetCapabilities(options);
+                SetOptionsByPropertyNames(options);
+                options.BrowserCommandLineArguments = string.Join(" ", BrowserStartArguments);
                 return options;
             }
         }
 
         public override string DownloadDirCapabilityKey => throw new NotSupportedException("Download directory key for Internet Explorer profiles is not supported");
-
-        protected override BrowserName BrowserName => BrowserName.InternetExplorer;
     }
 }
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/SafariSettings.cs b/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/SafariSettings.cs
@@ -18,17 +18,18 @@ public SafariSettings(JsonFile settingsFile) : base(settingsFile)
         {
         }
 
+        protected override BrowserName BrowserName => BrowserName.Safari;
+
         public override DriverOptions DriverOptions
         {
             get
             {
                 var options = new SafariOptions();
                 SetCapabilities(options);
+                SetOptionsByPropertyNames(options);
                 return options;
             }
         }
         public override string DownloadDirCapabilityKey => "safari.options.dataDir";
-
-        protected override BrowserName BrowserName => BrowserName.Safari;
     }
 }
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Resources/settings.json b/Aquality.Selenium/src/Aquality.Selenium/Resources/settings.json
@@ -1,8 +1,8 @@
 {
-  "browserName" : "chrome",
+  "browserName": "chrome",
   "isRemote": true,
   "remoteConnectionUrl": "http://qa-auto-nexus:4444/wd/hub",
-  "isElementHighlightEnabled" : true,
+  "isElementHighlightEnabled": true,
 
   "driverSettings": {
     "chrome": {
@@ -48,7 +48,17 @@
       "capabilities": {
         "ignoreProtectedModeSettings": true
       },
-      "options": {},
+      "options": {
+      },
+      "startArguments": []
+    },
+    "edge": {
+      "webDriverVersion": "Latest",
+      "systemArchitecture": "X32",
+      "capabilities": {
+      },
+      "options": {
+      },
       "startArguments": []
     },
     "safari": {
@@ -59,10 +69,10 @@
     }
   },
   "timeouts": {
-    "timeoutImplicit" : 0,
-    "timeoutCondition" : 30,
-    "timeoutScript" : 10,
-    "timeoutPageLoad" : 15,
+    "timeoutImplicit": 0,
+    "timeoutCondition": 30,
+    "timeoutScript": 10,
+    "timeoutPageLoad": 15,
     "timeoutPollingInterval": 300
   }
 }
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Utilities/EnumExtensions.cs b/Aquality.Selenium/src/Aquality.Selenium/Utilities/EnumExtensions.cs
@@ -0,0 +1,22 @@
+﻿using System;
+using System.Diagnostics.Contracts;
+
+namespace Aquality.Selenium.Utilities
+{
+    internal static class EnumExtensions
+    {
+        internal static T ToEnum<T>(this object value) where T : struct, IConvertible
+        {
+            return value is int
+                ? (T) (object) (int) (long) value 
+                : value.ToString().ToEnum<T>();
+        }
+
+        internal static T ToEnum<T>(this string value) where T : struct, IConvertible
+        {
+            var type = typeof(T);
+            Contract.Assert(type.IsEnum, "T must be an enum type");
+            return (T) Enum.Parse(type, value, ignoreCase: true);
+        }
+    }
+}
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Aquality.Selenium.Tests.csproj b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Aquality.Selenium.Tests.csproj
@@ -25,7 +25,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="Resources\local.settings.json">
+    <None Update="Resources\settings.local.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Resources\settings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.json b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.json
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.local.json b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.local.json
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Unit/BrowserManager/BrowserManagerTests.cs b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Unit/BrowserManager/BrowserManagerTests.cs
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Unit/Configurations/ConfigurationTests.cs b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Unit/Configurations/ConfigurationTests.cs

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ public enum BrowserName`
`295`	`295`	`Chrome,`
`296`	`296`	`Edge,`
`297`	`297`	`Firefox,`
`298`		`- InternetExplorer,`
	`298`	`+ IExplorer,`
`299`	`299`	`Safari`
`300`	`300`	`}`
`301`	`301`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using Aquality.Selenium.Utilities;`
`3`	`3`	`using OpenQA.Selenium;`
`4`	`4`	`using OpenQA.Selenium.Chrome;`
`5`		`-using System.Linq;`
`6`	`5`
`7`	`6`	`namespace Aquality.Selenium.Configurations.WebDriverSettings`
`8`	`7`	`{`
`@@ -19,17 +18,17 @@ public ChromeSettings(JsonFile settingsFile) : base(settingsFile)`
`19`	`18`	`{`
`20`	`19`	`}`
`21`	`20`
`22`		`- public override string DownloadDirCapabilityKey => "download.default_directory";`
`23`		`-`
`24`	`21`	`protected override BrowserName BrowserName => BrowserName.Chrome;`
`25`	`22`
	`23`	`+ public override string DownloadDirCapabilityKey => "download.default_directory";`
	`24`	`+`
`26`	`25`	`public override DriverOptions DriverOptions`
`27`	`26`	`{`
`28`	`27`	`get`
`29`	`28`	`{`
`30`	`29`	`var options = new ChromeOptions();`
`31`	`30`	`SetChromePrefs(options);`
`32`		`- SetGlobalCapabilities(options);`
	`31`	`+ SetCapabilities(options, (name, value) => options.AddAdditionalCapability(name, value, isGlobalCapability: true));`
`33`	`32`	`SetChromeArguments(options);`
`34`	`33`	`return options;`
`35`	`34`	`}`
`@@ -48,10 +47,5 @@ private void SetChromeArguments(ChromeOptions options)`
`48`	`47`	`{`
`49`	`48`	`options.AddArguments(BrowserStartArguments);`
`50`	`49`	`}`
`51`		`-`
`52`		`- private void SetGlobalCapabilities(ChromeOptions options)`
`53`		`- {`
`54`		`- BrowserCapabilities.ToList().ForEach(capability => options.AddAdditionalCapability(capability.Key, capability.Value, isGlobalCapability: true));`
`55`		`- }`
`56`	`50`	`}`
`57`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,18 +19,19 @@ public EdgeSettings(JsonFile settingsFile) : base(settingsFile)`
`19`	`19`	`{`
`20`	`20`	`}`
`21`	`21`
	`22`	`+ protected override BrowserName BrowserName => BrowserName.Edge;`
	`23`	`+`
`22`	`24`	`public override DriverOptions DriverOptions`
`23`	`25`	`{`
`24`	`26`	`get`
`25`	`27`	`{`
`26`	`28`	`var options = new EdgeOptions();`
`27`	`29`	`SetCapabilities(options);`
	`30`	`+ SetOptionsByPropertyNames(options);`
`28`	`31`	`return options;`
`29`	`32`	`}`
`30`	`33`	`}`
`31`	`34`
`32`	`35`	`public override string DownloadDirCapabilityKey => throw new NotSupportedException("Download directory key for Edge profiles is not supported");`
`33`		`-`
`34`		`- protected override BrowserName BrowserName => BrowserName.Edge;`
`35`	`36`	`}`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,8 @@`
`2`	`2`	`using Aquality.Selenium.Utilities;`
`3`	`3`	`using OpenQA.Selenium;`
`4`	`4`	`using OpenQA.Selenium.Firefox;`
`5`		`-using System.Linq;`
	`5`	`+using System;`
	`6`	`+using System.Collections.Generic;`
`6`	`7`
`7`	`8`	`namespace Aquality.Selenium.Configurations.WebDriverSettings`
`8`	`9`	`{`
`@@ -19,17 +20,29 @@ public FirefoxSettings(JsonFile settingsFile) : base(settingsFile)`
`19`	`20`	`{`
`20`	`21`	`}`
`21`	`22`
	`23`	`+ protected override BrowserName BrowserName => BrowserName.Firefox;`
	`24`	`+`
	`25`	`+ protected override IDictionary<string, Action<DriverOptions, object>> KnownCapabilitySetters => new Dictionary<string, Action<DriverOptions, object>>`
	`26`	`+ {`
	`27`	`+ { "binary", (options, value) => ((FirefoxOptions) options).BrowserExecutableLocation = value.ToString() },`
	`28`	`+ { "firefox_binary", (options, value) => ((FirefoxOptions) options).BrowserExecutableLocation = value.ToString() },`
	`29`	`+ { "firefox_profile", (options, value) => ((FirefoxOptions) options).Profile = new FirefoxProfileManager().GetProfile(value.ToString()) },`
	`30`	`+ { "log", (options, value) => ((FirefoxOptions) options).LogLevel = value.ToEnum<FirefoxDriverLogLevel>() },`
	`31`	`+ { "marionette", (options, value) => ((FirefoxOptions) options).UseLegacyImplementation = (bool) value }`
	`32`	`+ };`
	`33`	`+`
`22`	`34`	`public override DriverOptions DriverOptions`
`23`	`35`	`{`
`24`	`36`	`get`
`25`	`37`	`{`
`26`	`38`	`var options = new FirefoxOptions();`
`27`		`- SetGlobalCapabilities(options);`
	`39`	`+ SetCapabilities(options, (name, value) => options.AddAdditionalCapability(name, value, isGlobalCapability: true));`
`28`	`40`	`SetFirefoxPrefs(options);`
`29`	`41`	`SetFirefoxArguments(options);`
`30`	`42`	`return options;`
`31`	`43`	`}`
`32`	`44`	`}`
	`45`	`+`
`33`	`46`	`private void SetFirefoxPrefs(FirefoxOptions options)`
`34`	`47`	`{`
`35`	`48`	`foreach (var option in BrowserOptions)`
`@@ -63,13 +76,6 @@ private void SetFirefoxArguments(FirefoxOptions options)`
`63`	`76`	`options.AddArguments(BrowserStartArguments);`
`64`	`77`	`}`
`65`	`78`
`66`		`- private void SetGlobalCapabilities(FirefoxOptions options)`
`67`		`- {`
`68`		`- BrowserCapabilities.ToList().ForEach(capability => options.AddAdditionalCapability(capability.Key, capability.Value, isGlobalCapability: true));`
`69`		`- }`
`70`		`-`
`71`	`79`	`public override string DownloadDirCapabilityKey => "browser.download.dir";`
`72`		`-`
`73`		`- protected override BrowserName BrowserName => BrowserName.Firefox;`
`74`	`80`	`}`
`75`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Collections.Generic;`
`2`	`3`	`using Aquality.Selenium.Browsers;`
`3`	`4`	`using Aquality.Selenium.Utilities;`
`4`	`5`	`using OpenQA.Selenium;`
`5`	`6`	`using OpenQA.Selenium.IE;`
	`7`	`+using OpenQA.Selenium.Remote;`
`6`	`8`
`7`	`9`	`namespace Aquality.Selenium.Configurations.WebDriverSettings`
`8`	`10`	`{`
`@@ -19,18 +21,30 @@ public InternetExplorerSettings(JsonFile settingsFile) : base(settingsFile)`
`19`	`21`	`{`
`20`	`22`	`}`
`21`	`23`
	`24`	`+ protected override BrowserName BrowserName => BrowserName.IExplorer;`
	`25`	`+`
	`26`	`+ protected override IDictionary<string, Action<DriverOptions, object>> KnownCapabilitySetters => new Dictionary<string, Action<DriverOptions, object>>`
	`27`	`+ {`
	`28`	`+ { "ignoreProtectedModeSettings", (options, value) => ((InternetExplorerOptions) options).IntroduceInstabilityByIgnoringProtectedModeSettings = (bool) value },`
	`29`	`+ { "ignoreZoomSetting", (options, value) => ((InternetExplorerOptions) options).IgnoreZoomLevel = (bool) value },`
	`30`	`+ { CapabilityType.HasNativeEvents, (options, value) => ((InternetExplorerOptions) options).EnableNativeEvents = (bool) value },`
	`31`	`+ { CapabilityType.UnexpectedAlertBehavior, (options, value) => ((InternetExplorerOptions) options).UnhandledPromptBehavior = value.ToEnum<UnhandledPromptBehavior>() },`
	`32`	`+ { "ie.browserCommandLineSwitches", (options, value) => ((InternetExplorerOptions) options).BrowserCommandLineArguments = value.ToString() },`
	`33`	`+ { "elementScrollBehavior", (options, value) => ((InternetExplorerOptions) options).ElementScrollBehavior = value.ToEnum<InternetExplorerElementScrollBehavior>() }`
	`34`	`+ };`
	`35`	`+`
`22`	`36`	`public override DriverOptions DriverOptions`
`23`	`37`	`{`
`24`	`38`	`get`
`25`	`39`	`{`
`26`	`40`	`var options = new InternetExplorerOptions();`
`27`	`41`	`SetCapabilities(options);`
	`42`	`+ SetOptionsByPropertyNames(options);`
	`43`	`+ options.BrowserCommandLineArguments = string.Join(" ", BrowserStartArguments);`
`28`	`44`	`return options;`
`29`	`45`	`}`
`30`	`46`	`}`
`31`	`47`
`32`	`48`	`public override string DownloadDirCapabilityKey => throw new NotSupportedException("Download directory key for Internet Explorer profiles is not supported");`
`33`		`-`
`34`		`- protected override BrowserName BrowserName => BrowserName.InternetExplorer;`
`35`	`49`	`}`
`36`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,17 +18,18 @@ public SafariSettings(JsonFile settingsFile) : base(settingsFile)`
`18`	`18`	`{`
`19`	`19`	`}`
`20`	`20`
	`21`	`+ protected override BrowserName BrowserName => BrowserName.Safari;`
	`22`	`+`
`21`	`23`	`public override DriverOptions DriverOptions`
`22`	`24`	`{`
`23`	`25`	`get`
`24`	`26`	`{`
`25`	`27`	`var options = new SafariOptions();`
`26`	`28`	`SetCapabilities(options);`
	`29`	`+ SetOptionsByPropertyNames(options);`
`27`	`30`	`return options;`
`28`	`31`	`}`
`29`	`32`	`}`
`30`	`33`	`public override string DownloadDirCapabilityKey => "safari.options.dataDir";`
`31`		`-`
`32`		`- protected override BrowserName BrowserName => BrowserName.Safari;`
`33`	`34`	`}`
`34`	`35`	`}`