Bug 963166 - Add getWindowHandles end-point for WebDriver compatibility. r=dburns, a=test-only
authorAndreas Tolfsen <ato@mozilla.com>
Mon, 27 Jan 2014 08:18:27 -0500
changeset 176200 9a8f844bfa1d031e6c5495d349f42c1a2763e7c5
parent 176199 286d29768633fc7410fa1bd5aad3ad4e25edff6f
child 176201 4bf8c252e4782e57fdd0bedc9f5d67949cbbb08b
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdburns, test-only
bugs963166
milestone28.0a2
Bug 963166 - Add getWindowHandles end-point for WebDriver compatibility. r=dburns, a=test-only
testing/marionette/client/marionette/marionette.py
testing/marionette/marionette-server.js
--- a/testing/marionette/client/marionette/marionette.py
+++ b/testing/marionette/client/marionette/marionette.py
@@ -789,18 +789,17 @@ class Marionette(object):
 
         Each window handle is assigned by the server, and the list of
         strings returned does not have a guaranteed ordering.
 
         :returns: unordered list of unique window handles as strings
 
         """
 
-        response = self._send_message("getCurrentWindowHandles",
-                                      "value")
+        response = self._send_message("getWindowHandles", "value")
         return response
 
     @property
     def page_source(self):
         '''
         A string representation of the DOM.
         '''
         response = self._send_message('getPageSource', 'value')
--- a/testing/marionette/marionette-server.js
+++ b/testing/marionette/marionette-server.js
@@ -2437,17 +2437,18 @@ MarionetteServerConnection.prototype.req
   "goUrl": MarionetteServerConnection.prototype.get,  // deprecated
   "getCurrentUrl": MarionetteServerConnection.prototype.getCurrentUrl,
   "getUrl": MarionetteServerConnection.prototype.getCurrentUrl,  // deprecated
   "goBack": MarionetteServerConnection.prototype.goBack,
   "goForward": MarionetteServerConnection.prototype.goForward,
   "refresh":  MarionetteServerConnection.prototype.refresh,
   "getCurrentWindowHandle":  MarionetteServerConnection.prototype.getCurrentWindowHandle,
   "getWindow":  MarionetteServerConnection.prototype.getCurrentWindowHandle,  // deprecated
-  "getCurrentWindowHandles": MarionetteServerConnection.prototype.getWindowHandles,
+  "getWindowHandles": MarionetteServerConnection.prototype.getWindowHandles,
+  "getCurrentWindowHandles": MarionetteServerConnection.prototype.getWindowHandles,  // Selenium 2 compat
   "getWindows":  MarionetteServerConnection.prototype.getWindowHandles,  // deprecated
   "getActiveFrame": MarionetteServerConnection.prototype.getActiveFrame,
   "switchToFrame": MarionetteServerConnection.prototype.switchToFrame,
   "switchToWindow": MarionetteServerConnection.prototype.switchToWindow,
   "deleteSession": MarionetteServerConnection.prototype.deleteSession,
   "emulatorCmdResult": MarionetteServerConnection.prototype.emulatorCmdResult,
   "importScript": MarionetteServerConnection.prototype.importScript,
   "clearImportedScripts": MarionetteServerConnection.prototype.clearImportedScripts,