wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1114793 - Rename marionette's chrome_window_handle to current_chrome_window_handle.;r=automatedtester

Browse Source
This commit is contained in:
Chris Manchester 2015-01-08 19:13:30 -05:00
parent 3b9fc252a6
commit 23a74828c4
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/marionette/client/marionette/marionette.py
View File

@ -896,7 +896,7 @@ class Marionette(object):
return self.window
@property
def chrome_window_handle(self):
def current_chrome_window_handle(self):
"""Get the current chrome window's handle. Corresponds to
a chrome window that may itself contain tabs identified by
window_handles.
@ -909,7 +909,7 @@ class Marionette(object):
:rtype: string
"""
self.chrome_window = self._send_message("getChromeWindowHandle", "value")
self.chrome_window = self._send_message("getCurrentChromeWindowHandle", "value")
return self.chrome_window

10
testing/marionette/client/marionette/tests/unit/test_window_handles.py
View File

@ -93,7 +93,7 @@ class TestWindowHandles(MarionetteTestCase):
def test_tab_and_window_handles(self):
start_tab = self.marionette.current_window_handle
start_chrome_window = self.marionette.chrome_window_handle
start_chrome_window = self.marionette.current_chrome_window_handle
tab_open_page = self.marionette.absolute_url("windowHandles.html")
window_open_page = self.marionette.absolute_url("test_windows.html")
@ -104,7 +104,7 @@ class TestWindowHandles(MarionetteTestCase):
self.wait_for_condition(lambda mn: len(mn.window_handles) == 2)
self.assertEqual(len(self.marionette.chrome_window_handles), 1)
self.assertEqual(self.marionette.chrome_window_handle, start_chrome_window)
self.assertEqual(self.marionette.current_chrome_window_handle, start_chrome_window)
handles = self.marionette.window_handles
handles.remove(start_tab)
@ -121,7 +121,7 @@ class TestWindowHandles(MarionetteTestCase):
self.wait_for_condition(lambda mn: len(mn.window_handles) == 3)
self.assertEqual(len(self.marionette.chrome_window_handles), 2)
self.assertEqual(self.marionette.chrome_window_handle, start_chrome_window)
self.assertEqual(self.marionette.current_chrome_window_handle, start_chrome_window)
# Find the new window and switch to it.
handles = self.marionette.window_handles
@ -134,7 +134,7 @@ class TestWindowHandles(MarionetteTestCase):
self.assertEqual(self.marionette.get_url(), results_page)
self.assertEqual(len(self.marionette.chrome_window_handles), 2)
self.assertNotEqual(self.marionette.chrome_window_handle, start_chrome_window)
self.assertNotEqual(self.marionette.current_chrome_window_handle, start_chrome_window)
# Return to our original tab and close it.
self.marionette.switch_to_window(start_tab)
@ -151,4 +151,4 @@ class TestWindowHandles(MarionetteTestCase):
self.marionette.navigate("about:blank")
self.assertEqual(len(self.marionette.chrome_window_handles), 1)
self.assertEqual(self.marionette.chrome_window_handle, start_chrome_window)
self.assertEqual(self.marionette.current_chrome_window_handle, start_chrome_window)

1
testing/marionette/marionette-server.js
View File

@ -3058,6 +3058,7 @@ MarionetteServerConnection.prototype.requestTypes = {
"getWindowHandle": MarionetteServerConnection.prototype.getWindowHandle,
"getCurrentWindowHandle": MarionetteServerConnection.prototype.getWindowHandle, // Selenium 2 compat
"getChromeWindowHandle": MarionetteServerConnection.prototype.getChromeWindowHandle,
"getCurrentChromeWindowHandle": MarionetteServerConnection.prototype.getChromeWindowHandle,
"getWindow": MarionetteServerConnection.prototype.getWindowHandle, // deprecated
"getWindowHandles": MarionetteServerConnection.prototype.getWindowHandles,
"getChromeWindowHandles": MarionetteServerConnection.prototype.getChromeWindowHandles,