Bug 963166 - Add getWindowHandles end-point for WebDriver compatibility. r=dburns
authorAndreas Tolfsen <ato@mozilla.com>
Mon, 27 Jan 2014 08:18:27 -0500
changeset 181329 63761c123ba41d4729e76bbc744a310c08226237
parent 181328 01c406c513473eef5c98940ba8d3040c456044d8
child 181330 0783396d03423b0ffe1d1db11f2f2ab2c113ea14
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdburns
bugs963166
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 963166 - Add getWindowHandles end-point for WebDriver compatibility. r=dburns
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
@@ -803,18 +803,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
@@ -2439,17 +2439,18 @@ MarionetteServerConnection.prototype.req
   "getCurrentUrl": MarionetteServerConnection.prototype.getCurrentUrl,
   "getUrl": MarionetteServerConnection.prototype.getCurrentUrl,  // deprecated
   "goBack": MarionetteServerConnection.prototype.goBack,
   "goForward": MarionetteServerConnection.prototype.goForward,
   "refresh":  MarionetteServerConnection.prototype.refresh,
   "getWindowHandle": MarionetteServerConnection.prototype.getWindowHandle,
   "getCurrentWindowHandle":  MarionetteServerConnection.prototype.getWindowHandle,  // Selenium 2 compat
   "getWindow":  MarionetteServerConnection.prototype.getWindowHandle,  // 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,