fix ExecuteScript and Actions to handle IWrapsElement appropriately

Using EventFiringWebDriver, element targets and args throw exceptions
when calling ExecuteScript or Actions methods. Fix by casting as
IWrapsElement and checking for wrapped elements first.

Fixes issue #5810.

Signed-off-by: Jim Evans <[email protected]>

Author: cwood-panopto

dotnet/src/support/Events/EventFiringWebDriver.cs

@@ -727,7 +727,7 @@ private static object[] UnwrapElementArguments(object[] args)
             List<object> unwrappedArgs = new List<object>();
             foreach (object arg in args)
             {
-                EventFiringWebElement eventElementArg = arg as EventFiringWebElement;
+                IWrapsElement eventElementArg = arg as IWrapsElement;
                 if (eventElementArg != null)
                 {
                     unwrappedArgs.Add(eventElementArg.WrappedElement);

dotnet/src/webdriver/Interactions/Actions.cs

@@ -457,20 +457,17 @@ protected static ILocatable GetLocatableFromElement(IWebElement element)
                 return null;
             }
 
-            ILocatable target = element as ILocatable;
-            if (target == null)
+            ILocatable target = null;
+            IWrapsElement wrapper = element as IWrapsElement;
+            while (wrapper != null)
             {
-                IWrapsElement wrapper = element as IWrapsElement;
-                while (wrapper != null)
-                {
-                    target = wrapper.WrappedElement as ILocatable;
-                    if (target != null)
-                    {
-                        break;
-                    }
+                target = wrapper.WrappedElement as ILocatable;
+                wrapper = wrapper.WrappedElement as IWrapsElement;
+            }
 
-                    wrapper = wrapper.WrappedElement as IWrapsElement;
-                }
+            if (target == null)
+            {
+                target = element as ILocatable;
             }
 
             if (target == null)