If a string is passed into switch_to_frame, look up the element and then switch to it when in W3C Mode

Author: AutomatedTester

py/selenium/webdriver/remote/switch_to.py

@@ -17,6 +17,13 @@
 
 from .command import Command
 from selenium.webdriver.common.alert import Alert
+from selenium.webdriver.common.by import By
+from selenium.common.exceptions import NoSuchElementException
+
+try:
+    str = basestring
+except NameError:
+    pass
 
 
 class SwitchTo:
@@ -65,6 +72,12 @@ def frame(self, frame_reference):
             driver.switch_to.frame(1)
             driver.switch_to.frame(driver.find_elements_by_tag_name("iframe")[0])
         """
+        if isinstance(frame_reference, basestring) and self._driver.w3c:
+            try:
+                frame_reference = self._driver.find_element(By.ID, frame_reference)
+            except NoSuchElementException:
+                frame_reference = self._driver.find_element(By.NAME, frame_reference)
+
         self._driver.execute(Command.SWITCH_TO_FRAME, {'id': frame_reference})
 
     def parent_frame(self):

py/test/selenium/webdriver/common/frame_switching_tests.py

@@ -92,30 +92,30 @@ def testShouldBeAbleToSwitchToAnIframeByItsIndex(self):
 
     def testShouldBeAbleToSwitchToAFrameByItsName(self):
         self._load_page("frameset")
-        self.driver.switch_to.frame(self.driver.find_element_by_name("fourth"))
+        self.driver.switch_to.frame("fourth")
 
         self.assertEqual(self.driver.find_element(By.TAG_NAME, "frame").get_attribute("name"), "child1")
 
     def testShouldBeAbleToSwitchToAnIframeByItsName(self):
         self._load_page("iframes")
-        self.driver.switch_to.frame(self.driver.find_element_by_name("iframe1-name"))
+        self.driver.switch_to.frame("iframe1-name")
 
         self.assertEqual(self.driver.find_element(By.NAME, "id-name1").get_attribute("value"), "name")
 
     def testShouldBeAbleToSwitchToAFrameByItsID(self):
         self._load_page("frameset")
-        self.driver.switch_to.frame(self.driver.find_element(By.ID, "fifth"))
+        self.driver.switch_to.frame("fifth")
         self.assertEqual(self.driver.find_element(By.NAME, "windowOne").text, "Open new window")
 
     def testShouldBeAbleToSwitchToAnIframeByItsID(self):
         self._load_page("iframes")
-        self.driver.switch_to.frame(self.driver.find_element_by_id("iframe1"))
+        self.driver.switch_to.frame("iframe1")
 
         self.assertEqual(self.driver.find_element(By.NAME, "id-name1").get_attribute("value"), "name")
 
     def testShouldBeAbleToSwitchToFrameWithNameContainingDot(self):
         self._load_page("frameset")
-        self.driver.switch_to.frame(self.driver.find_element_by_id("sixth.iframe1"))
+        self.driver.switch_to.frame("sixth.iframe1")
         self.assertTrue("Page number 3" in self.driver.find_element(By.TAG_NAME, "body").text)
 
     def testShouldBeAbleToSwitchToAFrameUsingAPreviouslyLocatedWebElement(self):
@@ -146,7 +146,7 @@ def testShouldEnsureElementIsAFrameBeforeSwitching(self):
 
     def testFrameSearchesShouldBeRelativeToTheCurrentlySelectedFrame(self):
         self._load_page("frameset")
-        self.driver.switch_to.frame(self.driver.find_element_by_name("second"))
+        self.driver.switch_to.frame("second")
         self.assertEqual(self.driver.find_element(By.ID, "pageNumber").text, "2")
 
         try:
@@ -159,7 +159,7 @@ def testFrameSearchesShouldBeRelativeToTheCurrentlySelectedFrame(self):
         self.driver.switch_to.frame(self.driver.find_element_by_name("third"))
 
         try:
-            self.driver.switch_to.frame(self.driver.find_element_by_name("second"))
+            self.driver.switch_to.frame("second")
             self.fail("Should have thrown NoSuchElementException")
         except NoSuchElementException:
             # Do nothing