mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-25 11:15:34 +00:00
Bug 1470646 - Update Mn and Fxfn tests to use WebDriver conforming platformName. r=whimboo
MozReview-Commit-ID: 387jlJCbV59 --HG-- extra : rebase_source : 2b203e5e3499d483f1c1889f01bae0587b0b716e
This commit is contained in:
parent
4da52dadd7
commit
adeb44c73e
@ -21,8 +21,17 @@ class TestCapabilities(MarionetteTestCase):
|
||||
processID: Services.appinfo.processID,
|
||||
}
|
||||
""")
|
||||
self.os_name = self.marionette.execute_script(
|
||||
"return Services.sysinfo.getProperty('name')").lower()
|
||||
self.os_name = self.marionette.execute_script("""
|
||||
let name = Services.sysinfo.getProperty("name");
|
||||
switch (name) {
|
||||
case "Windows_NT":
|
||||
return "windows";
|
||||
case "Darwin":
|
||||
return "mac";
|
||||
default:
|
||||
return name.toLowerCase();
|
||||
}
|
||||
""")
|
||||
self.os_version = self.marionette.execute_script(
|
||||
"return Services.sysinfo.getProperty('version')")
|
||||
|
||||
|
@ -21,7 +21,7 @@ class TestKeyActions(WindowManagerMixin, MarionetteTestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(TestKeyActions, self).setUp()
|
||||
if self.marionette.session_capabilities["platformName"] == "darwin":
|
||||
if self.marionette.session_capabilities["platformName"] == "mac":
|
||||
self.mod_key = Keys.META
|
||||
else:
|
||||
self.mod_key = Keys.CONTROL
|
||||
|
@ -22,7 +22,7 @@ class BaseLegacyMouseAction(MarionetteTestCase):
|
||||
def setUp(self):
|
||||
super(BaseLegacyMouseAction, self).setUp()
|
||||
|
||||
if self.marionette.session_capabilities["platformName"] == "darwin":
|
||||
if self.marionette.session_capabilities["platformName"] == "mac":
|
||||
self.mod_key = Keys.META
|
||||
else:
|
||||
self.mod_key = Keys.CONTROL
|
||||
|
@ -65,7 +65,7 @@ class BaseMouseAction(MarionetteTestCase):
|
||||
def setUp(self):
|
||||
super(BaseMouseAction, self).setUp()
|
||||
|
||||
if self.marionette.session_capabilities["platformName"] == "darwin":
|
||||
if self.marionette.session_capabilities["platformName"] == "mac":
|
||||
self.mod_key = Keys.META
|
||||
else:
|
||||
self.mod_key = Keys.CONTROL
|
||||
|
@ -50,7 +50,7 @@ class BaseNavigationTestCase(WindowManagerMixin, MarionetteTestCase):
|
||||
self.test_page_remote = self.marionette.absolute_url("test.html")
|
||||
self.test_page_slow_resource = self.marionette.absolute_url("slow_resource.html")
|
||||
|
||||
if self.marionette.session_capabilities["platformName"] == "darwin":
|
||||
if self.marionette.session_capabilities["platformName"] == "mac":
|
||||
self.mod_key = Keys.META
|
||||
else:
|
||||
self.mod_key = Keys.CONTROL
|
||||
|
@ -15,7 +15,7 @@ class TestSwitchToWindowContent(WindowManagerMixin, MarionetteTestCase):
|
||||
def setUp(self):
|
||||
super(TestSwitchToWindowContent, self).setUp()
|
||||
|
||||
if self.marionette.session_capabilities["platformName"] == "darwin":
|
||||
if self.marionette.session_capabilities["platformName"] == "mac":
|
||||
self.mod_key = Keys.META
|
||||
else:
|
||||
self.mod_key = Keys.CONTROL
|
||||
|
@ -22,7 +22,7 @@ class TypingTestCase(MarionetteTestCase):
|
||||
def setUp(self):
|
||||
super(TypingTestCase, self).setUp()
|
||||
|
||||
if self.marionette.session_capabilities["platformName"] == "darwin":
|
||||
if self.marionette.session_capabilities["platformName"] == "mac":
|
||||
self.mod_key = Keys.META
|
||||
else:
|
||||
self.mod_key = Keys.CONTROL
|
||||
|
@ -31,7 +31,7 @@ class TestWindowMaximize(MarionetteTestCase):
|
||||
width=self.original_size["width"], height=self.original_size["height"])
|
||||
|
||||
def assert_window_maximized(self, actual, delta=None):
|
||||
if self.marionette.session_capabilities["platformName"] == "windows_nt":
|
||||
if self.marionette.session_capabilities["platformName"] == "windows":
|
||||
delta = 16
|
||||
else:
|
||||
delta = 22
|
||||
|
@ -186,13 +186,13 @@ class TestWindowRect(MarionetteTestCase):
|
||||
# On macOS, windows can only be moved off the screen on the
|
||||
# horizontal axis. The system menu bar also blocks windows from
|
||||
# being moved to (0,0).
|
||||
elif os == "darwin":
|
||||
elif os == "mac":
|
||||
self.assertEqual(-8, new_position["x"])
|
||||
self.assertEqual(23, new_position["y"])
|
||||
|
||||
# It turns out that Windows is the only platform on which the
|
||||
# window can be reliably positioned off-screen.
|
||||
elif os == "windows_nt":
|
||||
elif os == "windows":
|
||||
self.assertEqual(-8, new_position["x"])
|
||||
self.assertEqual(-8, new_position["y"])
|
||||
|
||||
|
@ -8,12 +8,14 @@ import marionette_driver
|
||||
|
||||
|
||||
class Keys(marionette_driver.keys.Keys):
|
||||
"""Proxy to marionette's keys with an "accel" provided for convenience
|
||||
testing across platforms."""
|
||||
"""
|
||||
Proxy to Marionette's keys with an "accel" provided for convenience
|
||||
testing across platforms.
|
||||
"""
|
||||
|
||||
def __init__(self, marionette):
|
||||
self.isDarwin = marionette.session_capabilities['platformName'] == 'darwin'
|
||||
self.is_mac = marionette.session_capabilities["platformName"] == "mac"
|
||||
|
||||
@property
|
||||
def ACCEL(self):
|
||||
return self.META if self.isDarwin else self.CONTROL
|
||||
return self.META if self.is_mac else self.CONTROL
|
||||
|
@ -246,7 +246,7 @@ class BrowserWindow(BaseWindow):
|
||||
elif trigger == 'menu':
|
||||
self.menubar.select_by_id('tools-menu', 'menu_pageInfo')
|
||||
elif trigger == 'shortcut':
|
||||
if win.marionette.session_capabilities['platformName'] == 'windows_nt':
|
||||
if win.marionette.session_capabilities['platformName'] == 'windows':
|
||||
raise ValueError('Page info shortcut not available on Windows.')
|
||||
win.send_shortcut(win.localize_entity('pageInfoCmd.commandkey'),
|
||||
accel=True)
|
||||
|
@ -394,7 +394,7 @@ class BaseWindow(BaseLib):
|
||||
platform = self.marionette.session_capabilities['platformName']
|
||||
|
||||
keymap = {
|
||||
'accel': Keys.META if platform == 'darwin' else Keys.CONTROL,
|
||||
'accel': Keys.META if platform == "mac" else Keys.CONTROL,
|
||||
'alt': Keys.ALT,
|
||||
'cmd': Keys.COMMAND,
|
||||
'ctrl': Keys.CONTROL,
|
||||
|
Loading…
Reference in New Issue
Block a user