[dotnet] Update Chromium-based browsers to correclty inherit Options

SeleniumHQ · Jun 4, 2021 · b754461 · b754461
1 parent 70af0d6
commit b754461
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 25 deletions.
diff --git a/dotnet/src/webdriver/Chrome/ChromeOptions.cs b/dotnet/src/webdriver/Chrome/ChromeOptions.cs
@@ -58,7 +58,7 @@ public class ChromeOptions : ChromiumOptions
         /// <summary>
         /// Initializes a new instance of the <see cref="ChromeOptions"/> class.
         /// </summary>
-        public ChromeOptions()
+        public ChromeOptions() : base()
         {
             this.BrowserName = BrowserNameValue;
         }

diff --git a/dotnet/src/webdriver/Edge/EdgeDriver.cs b/dotnet/src/webdriver/Edge/EdgeDriver.cs
@@ -104,30 +104,8 @@ public EdgeDriver(EdgeDriverService service, EdgeOptions options)
         /// <param name="options">The <see cref="EdgeOptions"/> to be used with the Edge driver.</param>
         /// <param name="commandTimeout">The maximum amount of time to wait for each command.</param>
         public EdgeDriver(EdgeDriverService service, EdgeOptions options, TimeSpan commandTimeout)
-            : base(new DriverServiceCommandExecutor(service, commandTimeout), ConvertOptionsToCapabilities(options, service.UsingChromium))
+            : base(service, options, commandTimeout)
         {
         }
-
-        private static ICapabilities ConvertOptionsToCapabilities(EdgeOptions options, bool serviceUsingChromium)
-        {
-            if (options == null)
-            {
-                throw new ArgumentNullException("options", "options must not be null");
-            }
-
-            if (serviceUsingChromium != options.UseChromium)
-            {
-                if (serviceUsingChromium)
-                {
-                    throw new WebDriverException("options.UseChromium must be set to true when using an Edge Chromium driver service.");
-                }
-                else
-                {
-                    throw new WebDriverException("options.UseChromium must be set to false when using an Edge Legacy driver service.");
-                }
-            }
-
-            return options.ToCapabilities();
-        }
     }
 }
diff --git a/dotnet/src/webdriver/Edge/EdgeOptions.cs b/dotnet/src/webdriver/Edge/EdgeOptions.cs
@@ -69,7 +69,7 @@ public class EdgeOptions : ChromiumOptions
         /// <summary>
         /// Initializes a new instance of the <see cref="EdgeOptions"/> class.
         /// </summary>
-        public EdgeOptions()
+        public EdgeOptions() : base()
         {
             this.BrowserName = DefaultBrowserNameValue;
             this.AddKnownCapabilityName(UseChromiumCapability, "UseChromium property");

diff --git a/dotnet/test/common/CustomDriverConfigs/StableChannelEdgeDriver.cs b/dotnet/test/common/CustomDriverConfigs/StableChannelEdgeDriver.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenQA.Selenium.Edge
+{
+    public class StableChannelEdgeDriver : EdgeDriver
+    {
+        private static string servicePath = string.Empty;
+
+        public StableChannelEdgeDriver()
+            : this(DefaultService, DefaultOptions)
+        {
+        }
+
+        public StableChannelEdgeDriver(EdgeDriverService service, EdgeOptions options)
+            : base(service, options)
+        {
+        }
+
+        public static EdgeOptions DefaultOptions
+        {
+            get {
+                // The below path to the Edge Developer Channel executable is obviously hard-coded.
+                // On non-Windows OSes, and for custom install locations, you will need to add a
+                // property to the below options: BinaryLocation = <path to MSEdge.exe>
+                return new EdgeOptions()
+                {
+                    UseChromium = true,
+                    BinaryLocation = @"C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe"
+                };
+            }
+        }
+
+        public static EdgeDriverService DefaultService
+        {
+            get
+            {
+                EdgeDriverService service = EdgeDriverService.CreateChromiumService(ServicePath);
+                return service;
+            }
+        }
+
+        public static string ServicePath
+        {
+            get { return servicePath; }
+            set { servicePath = value; }
+        }
+    }
+}
diff --git a/dotnet/test/common/appconfig.json b/dotnet/test/common/appconfig.json
@@ -46,6 +46,13 @@
     },
 
     "Edge": {
+      "DriverTypeName": "OpenQA.Selenium.Edge.StableChannelEdgeDriver",
+      "AssemblyName": "WebDriver.Common.Tests",
+      "BrowserValue": "Edge",
+      "RemoteCapabilities": "MicrosoftEdge"
+    },
+
+    "EdgeDev": {
       "DriverTypeName": "OpenQA.Selenium.Edge.DevChannelEdgeDriver",
       "AssemblyName": "WebDriver.Common.Tests",
       "BrowserValue": "Edge",