[py] Fix W3C switching to window by name.

Author: juangj

py/selenium/webdriver/remote/switch_to.py

@@ -18,7 +18,7 @@
 from .command import Command
 from selenium.webdriver.common.alert import Alert
 from selenium.webdriver.common.by import By
-from selenium.common.exceptions import NoSuchElementException, NoSuchFrameException
+from selenium.common.exceptions import NoSuchElementException, NoSuchFrameException, NoSuchWindowException
 
 try:
     basestring
@@ -106,7 +106,27 @@ def window(self, window_name):
         :Usage:
             driver.switch_to.window('main')
         """
-        data = {'name': window_name}
         if self._driver.w3c:
-            data = {'handle': window_name}
+           self._w3c_window(window_name)
+           return
+        data = {'name': window_name}
         self._driver.execute(Command.SWITCH_TO_WINDOW, data)
+
+    def _w3c_window(self, window_name):
+        def send_handle(h):
+            self._driver.execute(Command.SWITCH_TO_WINDOW, {'handle': h})
+
+        try:
+            # Try using it as a handle first.
+            send_handle(window_name)
+        except NoSuchWindowException as e:
+            # Check every window to try to find the given window name.
+            original_handle = self._driver.current_window_handle
+            handles = self._driver.window_handles
+            for handle in handles:
+                send_handle(handle)
+                current_name = self._driver.execute_script('return window.name')
+                if window_name == current_name:
+                    return
+            send_handle(original_handle)
+            raise e

py/test/selenium/webdriver/common/window_switching_tests.py

@@ -42,6 +42,15 @@ def testShouldSwitchFocusToANewWindowWhenItIsOpenedAndNotStopFutureOperations(dr
     assert driver.current_window_handle == handle
 
 
+def testCanSwitchToWindowByName(driver, pages):
+    pages.load("xhtmlTest.html")
+    handles = driver.window_handles
+    driver.find_element(By.LINK_TEXT, "Open new window").click()
+    WebDriverWait(driver, 3).until(EC.new_window_is_opened(handles))
+    driver.switch_to.window("result")
+    assert driver.title == "We Arrive Here"
+
+
 def testShouldThrowNoSuchWindowException(driver, pages):
     pages.load("xhtmlTest.html")
     with pytest.raises(NoSuchWindowException):