Updating .NET PageFactory to allow frame switching with located elements

Previously, if you located a `<frame>` or `<iframe>` element using the
PageFactory attributes, you could not switch to it. This change allows one
to use `driver.SwitchTo().Frame(element)` with the element found via the
PageFactory.

Author: jimevans

dotnet/src/support/PageObjects/WebElementProxy.cs

@@ -31,7 +31,7 @@ namespace OpenQA.Selenium.Support.PageObjects
     /// <summary>
     /// Intercepts the request to a single <see cref="IWebElement"/>
     /// </summary>
-    internal sealed class WebElementProxy : WebDriverObjectProxy
+    internal sealed class WebElementProxy : WebDriverObjectProxy, IWrapsElement
     {
         private IWebElement cachedElement;
 
@@ -48,6 +48,14 @@ private WebElementProxy(Type classToProxy, IElementLocator locator, IEnumerable<
         {
         }
 
+        /// <summary>
+        /// Gets the <see cref="IWebElement"/> wrapped by this object.
+        /// </summary>
+        public IWebElement WrappedElement
+        {
+            get { return this.Element; }
+        }
+
         /// <summary>
         /// Gets the IWebElement object this proxy represents, returning a cached one if requested.
         /// </summary>

dotnet/src/webdriver/Remote/RemoteTargetLocator.cs

@@ -21,6 +21,7 @@
 using System.Collections.ObjectModel;
 using System.Text;
 using System.Text.RegularExpressions;
+using OpenQA.Selenium.Internal;
 
 namespace OpenQA.Selenium.Remote
 {
@@ -65,10 +66,6 @@ public IWebDriver Frame(string frameName)
                 throw new ArgumentNullException("frameName", "Frame name cannot be null");
             }
 
-            // Dictionary<string, object> parameters = new Dictionary<string, object>();
-            // parameters.Add("id", frameName);
-            // this.driver.InternalExecute(DriverCommand.SwitchToFrame, parameters);
-            // return this.driver;
             string name = Regex.Replace(frameName, @"(['""\\#.:;,!?+<>=~*^$|%&@`{}\-/\[\]\(\)])", @"\$1");
             ReadOnlyCollection<IWebElement> frameElements = this.driver.FindElements(By.CssSelector("frame[name='" + name + "'],iframe[name='" + name + "']"));
             if (frameElements.Count == 0)
@@ -96,6 +93,15 @@ public IWebDriver Frame(IWebElement frameElement)
             }
 
             RemoteWebElement convertedElement = frameElement as RemoteWebElement;
+            if (convertedElement == null)
+            {
+                IWrapsElement elementWrapper = frameElement as IWrapsElement;
+                if (elementWrapper != null)
+                {
+                    convertedElement = elementWrapper.WrappedElement as RemoteWebElement;
+                }
+            }
+
             if (convertedElement == null)
             {
                 throw new ArgumentException("frameElement cannot be converted to RemoteWebElement", "frameElement");

dotnet/test/support/PageObjects/PageFactoryBrowserTest.cs

@@ -116,6 +116,15 @@ public void MixingFindBySequenceAndFindByAllShouldThrow()
             Assert.Throws<ArgumentException>(() => PageFactory.InitElements(driver, page), "Cannot specify FindsBySequence and FindsByAll on the same member");
         }
 
+        [Test]
+        public void FrameTest()
+        {
+            driver.Url = iframePage;
+            var page = new PageFactoryBrowserTest.IFramePage();
+            PageFactory.InitElements(driver, page);
+            driver.SwitchTo().Frame(page.Frame);
+        }
+
         #region Page classes for tests
         #pragma warning disable 649 //We set fields through reflection, so expect an always-null warning
 
@@ -156,6 +165,12 @@ private class InvalidAttributeCombinationPage
             public IWebElement NotFound;
         }
 
+        private class IFramePage
+        {
+            [FindsBy(How = How.Id, Using = "iframe1")]
+            public IWebElement Frame;
+        }
+
         #pragma warning restore 649
         #endregion
     }

dotnet/test/support/WebDriver.Support.Tests.config

@@ -9,6 +9,7 @@
     <add key="Protocol" value="http"/>
     <add key="HostName" value="localhost"/>
     <add key="Port" value="2310"/>
+    <add key="SecurePort" value="2410"/>
     <add key="Folder" value="common"/>
   </appSettings>
 </configuration>

dotnet/test/support/WebDriver.Support.Tests.nunit

@@ -1,6 +1,6 @@
 <NUnitProject>
 	<Settings appbase="." />
-	<Config name="Default" binpathtype="Auto">
-		<assembly path="WebDriver.Support.Tests.dll" />
-	</Config>
+  <Config name="Default" binpathtype="None" configfile="WebDriver.Support.Tests.config">
+    <assembly path="WebDriver.Support.Tests.dll" />
+  </Config>
 </NUnitProject>