py tests moving the rest of switch_to_ -> switch_to.

py/selenium/webdriver/support/expected_conditions.py

@@ -148,10 +148,10 @@ def __init__(self, locator):
     def __call__(self, driver):
         try:
             if isinstance(self.frame_locator, tuple):
-                driver.switch_to_frame(_find_element(driver,
+                driver.switch_to.frame(_find_element(driver,
                                                      self.frame_locator))
             else:
-                driver.switch_to_frame(self.frame_locator)
+                driver.switch_to.frame(self.frame_locator)
             return True
         except NoSuchFrameException:
             return False
@@ -260,7 +260,7 @@ def __init__(self):
 
     def __call__(self, driver):
         try:
-            alert = driver.switch_to_alert()
+            alert = driver.switch_to.alert
             alert.text
             return alert
         except NoAlertPresentException:

py/test/selenium/webdriver/common/alerts_tests.py

@@ -140,7 +140,7 @@ def testAlertShouldNotAllowAdditionalCommandsIfDimissed(self):
 
     def testShouldAllowUsersToAcceptAnAlertInAFrame(self):
         self._loadPage("alerts")
-        self.driver.switch_to_frame("iframeWithAlert")
+        self.driver.switch_to.frame("iframeWithAlert")
         self.driver.find_element_by_id("alertInFrame").click()
 
         alert = self._waitForAlert()
@@ -150,8 +150,8 @@ def testShouldAllowUsersToAcceptAnAlertInAFrame(self):
 
     def testShouldAllowUsersToAcceptAnAlertInANestedFrame(self):
         self._loadPage("alerts")
-        self.driver.switch_to_frame("iframeWithIframe")
-        self.driver.switch_to_frame("iframeWithAlert")
+        self.driver.switch_to.frame("iframeWithIframe")
+        self.driver.switch_to.frame("iframeWithAlert")
 
         self.driver.find_element_by_id("alertInFrame").click()
 
@@ -226,7 +226,7 @@ def _loadSimplePage(self):
     def _loadPage(self, name):
         try:
             # just in case a previous test left open an alert
-            self.driver.switch_to_alert().dismiss()
+            self.driver.switch_to.alert().dismiss()
         except:
             pass
         self.driver.get(self._pageURL(name))

py/test/selenium/webdriver/common/api_example_tests.py

@@ -131,12 +131,12 @@ def testSwitchToWindow(self):
         self._loadPage("xhtmlTest")
         self.driver.find_element_by_link_text("Open new window").click()
         self.assertEquals(title_1, self.driver.title)
-        wait.until(lambda dr: dr.switch_to_window("result") is None)
+        wait.until(lambda dr: dr.switch_to.window("result") is None)
         self.assertEquals(title_2, self.driver.title)
 
     def testSwitchFrameByName(self):
         self._loadPage("frameset")
-        self.driver.switch_to_frame("third")
+        self.driver.switch_to.frame("third")
         checkbox = self.driver.find_element_by_id("checky")
         checkbox.click()
         checkbox.submit()

py/test/selenium/webdriver/common/element_attribute_tests.py

@@ -162,7 +162,7 @@ def testShouldReturnValueOfClassAttributeOfAnElement(self):
     # Disabled due to issues with Frames    
     #def testShouldReturnValueOfClassAttributeOfAnElementAfterSwitchingIFrame(self):
     #    self._loadPage("iframes")
-    #    self.driver.switch_to_frame("iframe1")
+    #    self.driver.switch_to.frame("iframe1")
     #
     #    wallace = self.driver.find_element_by_xpath("//div[@id='wallace']")
     #    classname = wallace.get_attribute("class")

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

@@ -38,37 +38,37 @@ def testShouldBeAbleToSwitchToAFrameByItsIndex(self):
       if self.driver.capabilities['browserName'] == 'firefox' and self.driver.capabilities['version'].startswith('3'):
         pytest.skip()
       self._loadPage("frameset")
-      self.driver.switch_to_frame(2)
+      self.driver.switch_to.frame(2)
       element = self.driver.find_element_by_id("email")
       self.assertEquals("email", element.get_attribute("type"))
 
     def testShouldBeAbleToSwitchToAnIframeByItsIndex(self):
       self._loadPage("iframes")
-      self.driver.switch_to_frame(0)
+      self.driver.switch_to.frame(0)
       element = self.driver.find_element_by_id("id-name1")
       self.assertEquals("id", element.get_attribute("value"))
 
     def testShouldBeAbleToSwitchToAFrameByItsName(self):
       self._loadPage("frameset")
-      self.driver.switch_to_frame("fourth")
+      self.driver.switch_to.frame("fourth")
       element = self.driver.find_element_by_tag_name("frame")
       self.assertEquals("child1", element.get_attribute("name"))
 
     def testShouldBeAbleToSwitchToAnIframeByItsName(self):
       self._loadPage("iframes")
-      self.driver.switch_to_frame("iframe1-name");
+      self.driver.switch_to.frame("iframe1-name");
       element = self.driver.find_element_by_name("id-name1")
       self.assertEquals("name", element.get_attribute("value"))
 
     def testShouldBeAbleToSwitchToAFrameByItsID(self):
       self._loadPage("frameset")
-      self.driver.switch_to_frame("fifth")
+      self.driver.switch_to.frame("fifth")
       element = self.driver.find_element_by_name("windowOne")
       self.assertEquals("Open new window", element.text)
 
     def testShouldBeAbleToSwitchToAnIframeByItsID(self):
       self._loadPage("iframes")
-      self.driver.switch_to_frame("iframe1");
+      self.driver.switch_to.frame("iframe1");
       element = self.driver.find_element_by_name("id-name1")
       self.assertEquals("name", element.get_attribute("value"))
 
@@ -77,90 +77,90 @@ def testShouldBeAbleToSwitchToAFrameUsingAPreviouslyLocatedWebElement(self):
         pytest.skip()
       self._loadPage("frameset")
       frame = self.driver.find_element_by_name("third")
-      self.driver.switch_to_frame(frame)
+      self.driver.switch_to.frame(frame)
       element = self.driver.find_element_by_id("email")
       self.assertEquals("email", element.get_attribute("type"))
 
     def testShouldBeAbleToSwitchToAnIFrameUsingAPreviouslyLocatedWebElement(self):
       self._loadPage("iframes")
       frame = self.driver.find_element_by_tag_name("iframe")
-      self.driver.switch_to_frame(frame)
+      self.driver.switch_to.frame(frame)
       element = self.driver.find_element_by_name("id-name1")
       self.assertEquals("name", element.get_attribute("value"))
 
     def testShouldEnsureElementIsAFrameBeforeSwitching(self):
       self._loadPage("frameset")
       frame = self.driver.find_element_by_tag_name("frameset")
       try:
-        self.driver.switch_to_frame(frame)
+        self.driver.switch_to.frame(frame)
         self.fail()
       except NoSuchFrameException:
         pass
 
     def testFrameSearchesShouldBeRelativeToTheCurrentlySelectedFrame(self):
       self._loadPage("frameset")
-      self.driver.switch_to_frame("sixth")
+      self.driver.switch_to.frame("sixth")
       element = self.driver.find_element_by_id("iframe_page_heading")
       self.assertEquals("This is the heading", element.text)
 
       try:
-        self.driver.switch_to_frame("third")
+        self.driver.switch_to.frame("third")
         self.fail()
       except NoSuchFrameException:
         pass
 
-      self.driver.switch_to_default_content()
-      self.driver.switch_to_frame("third")
+      self.driver.switch_to.default_content()
+      self.driver.switch_to.frame("third")
 
       try:
-        self.driver.switch_to_frame("third")
+        self.driver.switch_to.frame("third")
         self.fail()
       except NoSuchFrameException:
         pass
 
       # Now make sure we can go back.
-      self.driver.switch_to_default_content()
-      self.driver.switch_to_frame("sixth")
+      self.driver.switch_to.default_content()
+      self.driver.switch_to.frame("sixth")
       element = self.driver.find_element_by_id("iframe_page_heading")
       self.assertEquals("This is the heading", element.text)
 
     def testShouldBeAbleToSelectChildFrames(self):
       self._loadPage("frameset")
-      self.driver.switch_to_frame("sixth")
-      self.driver.switch_to_frame(0)
+      self.driver.switch_to.frame("sixth")
+      self.driver.switch_to.frame(0)
       element = self.driver.find_element_by_id("id-name1")
       self.assertEquals("id", element.get_attribute("value"))
 
     def testShouldThrowFrameNotFoundExceptionLookingUpSubFramesWithSuperFrameNames(self):
       self._loadPage("frameset")
-      self.driver.switch_to_frame("fourth")
+      self.driver.switch_to.frame("fourth")
 
       try:
-        self.driver.switch_to_frame("second")
+        self.driver.switch_to.frame("second")
         self.fail("Expected NoSuchFrameException")
       except NoSuchFrameException:
         pass
 
     def testShouldThrowAnExceptionWhenAFrameCannotBeFound(self):
       self._loadPage("xhtmlTest")
       try:
-        self.driver.switch_to_frame("nothing here")
+        self.driver.switch_to.frame("nothing here")
         self.fail("Should not have been able to switch")
       except NoSuchFrameException:
         pass
 
     def testShouldThrowAnExceptionWhenAFrameCannotBeFoundByIndex(self):
       self._loadPage("xhtmlTest")
       try:
-        self.driver.switch_to_frame(27)
+        self.driver.switch_to.frame(27)
         self.fail("Should not have been able to switch")
       except NoSuchFrameException:
         pass
 
     # disabled till we use the Java Webserver
     #def testThatWeStillReferToTheSameFrameOnceItHasBeenSelected(self):
     #    self._loadPage("frameset")
-    #    self.driver.switch_to_frame(2)
+    #    self.driver.switch_to.frame(2)
     #    checkbox = self.driver.find_element_by_xpath("//input[@name='cheeky']")
     #    checkbox.toggle()
     #    checkbox.submit()
@@ -177,7 +177,7 @@ def testShouldThrowAnExceptionWhenAFrameCannotBeFoundByIndex(self):
     #def testThatWeFocusOnTheReplacementWhenAFrameFollowsALinkToATopTargettedPage(self):
     #    self._loadPage("frameset")
     #    time.sleep(1)
-    #    self.driver.switch_to_frame(0)
+    #    self.driver.switch_to.frame(0)
     #    self.driver.find_element_by_link_text("top").click()
     #    time.sleep(1)
     #    self.assertEqual("XHTML Test Page", self.driver.title)
@@ -192,20 +192,20 @@ def testThatWeShouldNotAutoSwitchFocusToAnIFrameWhenAPageContainingThemIsLoaded(
 
     def testShouldAllowAUserToSwitchFromAnIframeBackToTheMainContentOfThePage(self):
         self._loadPage("iframes")
-        self.driver.switch_to_frame(0)
-        self.driver.switch_to_default_content()
+        self.driver.switch_to.frame(0)
+        self.driver.switch_to.default_content()
         self.driver.find_element_by_id('iframe_page_heading')
 
     def testShouldBeAbleToSwitchToParentFrame(self):
         self._loadPage("iframes")
-        self.driver.switch_to_frame(0)
+        self.driver.switch_to.frame(0)
         self.driver.switch_to.parent_frame()
         self.driver.find_element_by_id('iframe_page_heading')
 
     # Disabled till we use the Java WebServer
     #def testShouldAllowTheUserToSwitchToAnIFrameAndRemainFocusedOnIt(self):
     #    self._loadPage("iframes")
-    #    self.driver.switch_to_frame(0)
+    #    self.driver.switch_to.frame(0)
     #    submitButton = self.driver.find_element_by_id("greeting")
     #    submitButton.click()
 
@@ -216,19 +216,19 @@ def testShouldBeAbleToSwitchToParentFrame(self):
     # Disalbled till we used the Java Webserver
     #def testShouldBeAbleToClickInAFrame(self):
     #    self._loadPage("frameset")
-    #    self.driver.switch_to_frame("third")
+    #    self.driver.switch_to.frame("third")
     #    time.sleep(1)
     #    submitButton = self.driver.find_element_by_id("greeting")
     #    submitButton.click()
 
     #    time.sleep(0.5)
     #    hello = self.driver.find_element_by_id('greeting')
     #    self.assertEqual(hello.text, "Success!")
-    #    self.driver.switch_to_default_content()
+    #    self.driver.switch_to.default_content()
 
     def testShouldReturnFrameTitleNotWindowTitle(self):
         self._loadPage("frameset")
-        self.driver.switch_to_frame("third")
+        self.driver.switch_to.frame("third")
         self.assertEqual("Unique title", self.driver.title)
 
     def _pageURL(self, name):

py/test/selenium/webdriver/common/webdriverwait_tests.py

@@ -321,7 +321,7 @@ def testExpectedConditionAlertIsPresent(self):
             pass
         self.driver.execute_script("setTimeout(function(){alert('alerty')}, 200)")
         WebDriverWait(self.driver, 0.7).until(EC.alert_is_present())
-        alert = self.driver.switch_to_alert()
+        alert = self.driver.switch_to.alert
         self.assertEqual('alerty', alert.text)
         alert.dismiss()