fix UiA driver with Selenium Grid 3.141

Author: Roei Sabag

src/Gravity.Abstraction.Tests/Base/TestSuite.cs

@@ -27,7 +27,7 @@ protected TestSuite()
         public static bool CreateRemoteDriver(string onDriver, string onTest, TestContext onContext)
         {
             // setup
-            var driverParams = System.Text.Json.JsonSerializer.Serialize(new
+            var driverParams = JsonSerializer.Serialize(new
             {
                 Driver = onDriver,
                 DriverBinaries = $"{onContext.Properties["Grid.Endpoint"]}",

src/Gravity.Abstraction/Uia/UiaCommandExecutor.cs

@@ -0,0 +1,39 @@
+using Newtonsoft.Json.Linq;
+
+using OpenQA.Selenium.Remote;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+
+namespace Gravity.Abstraction.Uia
+{
+    public class UiaCommandExecutor : HttpCommandExecutor
+    {
+        public UiaCommandExecutor(Uri addressOfRemoteServer, TimeSpan timeout)
+            : base(addressOfRemoteServer, timeout)
+        { }
+
+        public UiaCommandExecutor(Uri addressOfRemoteServer, TimeSpan timeout, bool enableKeepAlive)
+            : base(addressOfRemoteServer, timeout, enableKeepAlive)
+        { }
+
+        protected override void OnSendingRemoteHttpRequest(SendingRemoteHttpRequestEventArgs eventArgs)
+        {
+            // setup
+            var json = JObject.Parse(eventArgs.RequestBody);
+            var filed = eventArgs.GetType().GetField("requestBody", BindingFlags.Instance | BindingFlags.NonPublic);
+            
+            // clean capabilites
+            json.Remove("capabilities");
+            filed.SetValue(eventArgs, $"{json}");
+
+            // clear
+            base.OnSendingRemoteHttpRequest(eventArgs);
+        }
+    }
+}

src/Gravity.Abstraction/Uia/UiaDriver.cs

@@ -55,8 +55,8 @@ public UiaDriver(Uri remoteAddress, ICapabilities desiredCapabilities)
         /// <summary>
         /// initializes a new instance of the <see cref="UiDriver"/> class using the specified <see cref="UiaDriverService"/>
         /// </summary>
-        /// <param name="service">the <see cref="ChromeDriverService"/> to use.</param>
-        /// <param name="options">The <see cref="ChromeOptions"/> to be used with the Chrome driver.</param>
+        /// <param name="service">the <see cref="UiaDriverService"/> to use.</param>
+        /// <param name="options">The <see cref="UiaOptions"/> to be used with the Chrome driver.</param>
         /// <param name="commandTimeout">The maximum amount of time to wait for each command.</param>
         public UiaDriver(UiaDriverService service, UiaOptions options, TimeSpan commandTimeout)
             : base(new DriverServiceCommandExecutor(service, commandTimeout), options.ToCapabilities())
@@ -68,6 +68,15 @@ public UiaDriver(Uri remoteAddress, ICapabilities desiredCapabilities, TimeSpan
             : base(remoteAddress, desiredCapabilities, commandTimeout)
         { }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoteWebDriver"/> class
+        /// </summary>
+        /// <param name="commandExecutor">An <see cref="ICommandExecutor"/> object which executes commands for the driver.</param>
+        /// <param name="desiredCapabilities">An <see cref="ICapabilities"/> object containing the desired capabilities of the browser.</param>
+        public UiaDriver(ICommandExecutor commandExecutor, ICapabilities desiredCapabilities)
+            : base(commandExecutor, desiredCapabilities)
+        { }
+
         /// <summary>
         /// gets the capabilities as a dictionary
         /// </summary>

src/Gravity.Abstraction/WebDriver/DriverFactory.cs

@@ -27,6 +27,7 @@
 using System.Text.Json;
 using System.Diagnostics.CodeAnalysis;
 using OpenQA.Selenium.Uia;
+using Gravity.Abstraction.Uia;
 
 namespace Gravity.Abstraction.WebDriver
 {
@@ -87,7 +88,15 @@ public IWebDriver Create()
             var method = GetMethod(driver, isRemote);
 
             // generate driver
-            return (IWebDriver)method.Invoke(this, new object[] { driverBinaries });
+            try
+            {
+                return (IWebDriver)method.Invoke(this, new object[] { driverBinaries });
+            }
+            catch (Exception e)
+            {
+
+                throw;
+            }            
         }
         #endregion
 
@@ -218,11 +227,14 @@ private IWebDriver GetRemoteDriver(string driverBinaries)
             // get constructor arguments
             var options = GetOptions<UiaOptions, UiaOptionsParams>(platformName: "WINDOWS");
             var capabilities = GetCapabilities(options, _capabilities);
+            options.BrowserVersion = string.IsNullOrEmpty(options.BrowserVersion) ? "1.0" : options.BrowserVersion;
+
 
             // factor web driver
-            return _commandTimeout == 0
-                ? new UiaDriver(new Uri(driverBinaries), capabilities)
-                : new UiaDriver(new Uri(driverBinaries), capabilities, TimeSpan.FromSeconds(_commandTimeout));
+            var executor = _commandTimeout == 0
+                ? new UiaCommandExecutor(new Uri(driverBinaries), TimeSpan.FromSeconds(60))
+                : new UiaCommandExecutor(new Uri(driverBinaries), TimeSpan.FromSeconds(_commandTimeout));
+            return new UiaDriver(executor, capabilities);
         }
         #endregion