Bug 1288863: Update Firefox Puppeteer to use lower case platformName r?whimboo draft
authorDavid Burns <dburns@mozilla.com>
Thu, 28 Jul 2016 16:25:42 +0100
changeset 394961 87a10b47bcb92a721f9d9cd37e1e143fbe58c503
parent 394960 e0b3448174f774c63530aa47b72436b6c9c95a91
child 526913 cb611f859ec34097e7ab2ca7a7cb9536a0d2a668
push id24680
push userbmo:dburns@mozilla.com
push dateMon, 01 Aug 2016 11:10:05 +0000
reviewerswhimboo
bugs1288863
milestone50.0a1
Bug 1288863: Update Firefox Puppeteer to use lower case platformName r?whimboo The capabilities, according to the webdriver specification, should all be lowercase. MozReview-Commit-ID: BKBqsi0kQh1
testing/puppeteer/firefox/firefox_puppeteer/__init__.py
testing/puppeteer/firefox/firefox_puppeteer/api/keys.py
testing/puppeteer/firefox/firefox_puppeteer/ui/windows.py
--- a/testing/puppeteer/firefox/firefox_puppeteer/__init__.py
+++ b/testing/puppeteer/firefox/firefox_puppeteer/__init__.py
@@ -61,17 +61,17 @@ class Puppeteer(object):
         """
 
     @property
     def platform(self):
         """Returns the lowercased platform name.
 
         :returns: Platform name
         """
-        return self.marionette.session_capabilities['platformName'].lower()
+        return self.marionette.session_capabilities['platformName']
 
     @use_class_as_property('api.prefs.Preferences')
     def prefs(self):
         """
         Provides an api for setting and inspecting preferences, as see in
         about:config.
 
         See the :class:`~api.prefs.Preferences` reference.
--- a/testing/puppeteer/firefox/firefox_puppeteer/api/keys.py
+++ b/testing/puppeteer/firefox/firefox_puppeteer/api/keys.py
@@ -8,13 +8,13 @@ import marionette_driver
 class Keys(marionette_driver.keys.Keys):
     """Proxy to marionette's keys with an "accel" provided for convenience
     testing across platforms."""
 
     def __init__(self, marionette_getter):
         self.marionette_getter = marionette_getter
 
         caps = self.marionette_getter().session_capabilities
-        self.isDarwin = caps['platformName'] == 'DARWIN'
+        self.isDarwin = caps['platformName'] == 'darwin'
 
     @property
     def ACCEL(self):
         return self.META if self.isDarwin else self.CONTROL
--- a/testing/puppeteer/firefox/firefox_puppeteer/ui/windows.py
+++ b/testing/puppeteer/firefox/firefox_puppeteer/ui/windows.py
@@ -393,17 +393,17 @@ class BaseWindow(BaseLib):
         :param ctrl: Optional, If `True`, the `Ctrl` modifier key is pressed. Defaults to `False`.
 
         :param meta: Optional, If `True`, the `Meta` modifier key is pressed. Defaults to `False`.
 
         :param shift: Optional, If `True`, the `Shift` modifier key is pressed.
          Defaults to `False`.
         """
 
-        platform = self.marionette.session_capabilities['platformName'].lower()
+        platform = self.marionette.session_capabilities['platformName']
 
         keymap = {
             'accel': Keys.META if platform == 'darwin' else Keys.CONTROL,
             'alt': Keys.ALT,
             'cmd': Keys.COMMAND,
             'ctrl': Keys.CONTROL,
             'meta': Keys.META,
             'shift': Keys.SHIFT,