Add the ability to handle windows with the W3C Dialect of the JSON Protocol

Author: AutomatedTester

Diff for: py/selenium/webdriver/remote/command.py

@@ -57,8 +57,10 @@ class Command(object):
     GET_CURRENT_WINDOW_HANDLE = "getCurrentWindowHandle"
     GET_WINDOW_HANDLES = "getWindowHandles"
     GET_WINDOW_SIZE = "getWindowSize"
+    W3C_GET_WINDOW_SIZE = "w3cGetWindowSize"
     GET_WINDOW_POSITION = "getWindowPosition"
     SET_WINDOW_SIZE = "setWindowSize"
+    W3C_SET_WINDOW_SIZE = "w3cSetWindowSize"
     SET_WINDOW_POSITION = "setWindowPosition"
     SWITCH_TO_WINDOW = "switchToWindow"
     SWITCH_TO_FRAME = "switchToFrame"
@@ -89,6 +91,7 @@ class Command(object):
     SET_SCRIPT_TIMEOUT = "setScriptTimeout"
     SET_TIMEOUTS = "setTimeouts"
     MAXIMIZE_WINDOW = "windowMaximize"
+    W3C_MAXIMIZE_WINDOW = "w3cMaximizeWindow"
     GET_LOG = "getLog"
     GET_AVAILABLE_LOG_TYPES = "getAvailableLogTypes"
 

Diff for: py/selenium/webdriver/remote/remote_connection.py

@@ -289,14 +289,20 @@ def __init__(self, remote_server_addr, keep_alive=False):
                 ('POST', '/session/$sessionId/moveto'),
             Command.GET_WINDOW_SIZE:
                 ('GET', '/session/$sessionId/window/$windowHandle/size'),
+            Command.W3C_GET_WINDOW_SIZE:
+                ('GET', '/session/$sessionId/window/size'),
             Command.SET_WINDOW_SIZE:
                 ('POST', '/session/$sessionId/window/$windowHandle/size'),
+            Command.W3C_SET_WINDOW_SIZE:
+                ('POST', '/session/$sessionId/window/size'),
             Command.GET_WINDOW_POSITION:
                 ('GET', '/session/$sessionId/window/$windowHandle/position'),
             Command.SET_WINDOW_POSITION:
                 ('POST', '/session/$sessionId/window/$windowHandle/position'),
             Command.MAXIMIZE_WINDOW:
                 ('POST', '/session/$sessionId/window/$windowHandle/maximize'),
+            Command.W3C_MAXIMIZE_WINDOW:
+                ('POST', '/session/$sessionId/window/maximize'),
             Command.SET_SCREEN_ORIENTATION:
                 ('POST', '/session/$sessionId/orientation'),
             Command.GET_SCREEN_ORIENTATION:

Diff for: py/selenium/webdriver/remote/switch_to.py

@@ -86,4 +86,7 @@ def window(self, window_name):
         :Usage:
             driver.switch_to.window('main')
         """
-        self._driver.execute(Command.SWITCH_TO_WINDOW, {'name': window_name})
+        data = {'name': window_name}
+        if self._driver.capabilities['marionette'] == True:
+            data = {'handle': window_name}
+        self._driver.execute(Command.SWITCH_TO_WINDOW, data)

Diff for: py/selenium/webdriver/remote/webdriver.py

@@ -138,6 +138,8 @@ def start_session(self, desired_capabilities, browser_profile=None):
         self.session_id = response['sessionId']
         self.capabilities = response['value']
 
+        self.capabilities["marionette"] = desired_capabilities.get("marionette", False)
+
     def _wrap_value(self, value):
         if isinstance(value, dict):
             converted = {}
@@ -500,7 +502,10 @@ def maximize_window(self):
         """
         Maximizes the current window that webdriver is using
         """
-        self.execute(Command.MAXIMIZE_WINDOW, {"windowHandle": "current"})
+        command = Command.MAXIMIZE_WINDOW
+        if self.capabilities['marionette'] == True:
+            command = Command.W3C_MAXIMIZE_WINDOW
+        self.execute(command, {"windowHandle": "current"})
 
     @property
     def switch_to(self):
@@ -777,7 +782,10 @@ def set_window_size(self, width, height, windowHandle='current'):
         :Usage:
             driver.set_window_size(800,600)
         """
-        self.execute(Command.SET_WINDOW_SIZE, {'width': int(width), 'height': int(height),
+        command = Command.SET_WINDOW_SIZE
+        if self.capabilities["marionette"] == True:
+            command = Command.W3C_SET_WINDOW_SIZE
+        self.execute(command, {'width': int(width), 'height': int(height),
           'windowHandle': windowHandle})
 
     def get_window_size(self, windowHandle='current'):
@@ -787,8 +795,16 @@ def get_window_size(self, windowHandle='current'):
         :Usage:
             driver.get_window_size()
         """
-        return self.execute(Command.GET_WINDOW_SIZE,
-            {'windowHandle': windowHandle})['value']
+        command = Command.GET_WINDOW_SIZE
+        if self.capabilities['marionette'] == True:
+            command = Command.W3C_GET_WINDOW_SIZE
+        size = self.execute(command,
+            {'windowHandle': windowHandle})
+
+        if size.get('value', None) != None:
+            return size['value']
+        else:
+            return size
 
     def set_window_position(self, x, y, windowHandle='current'):
         """