appium-uiautomator2-driver 2.4.0 → 2.4.3

package/README.md

@@ -83,7 +83,7 @@ appium:enforceAppInstall | If set to `true` then the application under test is a
 
 Capability Name | Description
 --- | ---
-appium:localeScript | Canonical name of the locale to be set for the app under test, for example `zh-Hans-CN`. See https://developer.android.com/reference/java/util/Locale.html for more details.
+appium:localeScript | Canonical name of the locale to be set for the app under test, for example `Hans` in `zh-Hans-CN`. See https://developer.android.com/reference/java/util/Locale.html for more details.
 appium:language | Name of the language to extract application strings for. Strings are extracted for the current system language by default. Also sets the language for the app under test. See https://developer.android.com/reference/java/util/Locale.html for more details. Example: en, ja
 appium:locale | Sets the locale for the app under test. See https://developer.android.com/reference/java/util/Locale.html for more details. Example: EN, JA
 
@@ -804,8 +804,7 @@ Name | Type | Required | Description | Example
 resolution | string | no | The resolution of the resulting video, which usually equals to Full HD 1920x1080 on most phones, however you could change it to one of the following supported resolutions: "1920x1080", "1280x720", "720x480", "320x240", "176x144" | 1280x720
 maxDurationSec | number | no | The maximum number of seconds allowed for the recording to run. 900 seconds by default (15 minutes) | 300
 priority | string | no | Recording thread priority is set to maximum (`high`) by default. However if you face performance drops during testing with recording enabled, you could reduce the recording priority to `normal` or `low`. | low
-filename | string | no | You can type recording video file name as you want,
-but recording currently supports only "mp4" format so your filename must end with ".mp4". An invalid file name will fail to start the recording. If not provided then the current timestamp will be used as file name. | screen.mp4
+filename | string | no | You can type recording video file name as you want, but recording currently supports only "mp4" format so your filename must end with ".mp4". An invalid file name will fail to start the recording. If not provided then the current timestamp will be used as file name. | screen.mp4
 
 #### Returned Result
 
@@ -895,42 +894,38 @@ Useful links:
 import pytest
 
 from appium import webdriver
+# Options are available in Python client since v2.6.0
+from appium.options.android import UiAutomator2Options
 
 
-def generate_caps():
+def generate_options():
     common_caps = {
-        # automationName capability presence is mandatory for this UiAutomator2 Driver to be selected
-        'appium:automationName': 'UiAutomator2',
-        'platformName': 'linux',
-        # The real device udid could be retrieved from `adb devices -l` output
-        # If it is omitted then the first available device will be used
+        # A real device udid could be retrieved from `adb devices -l` output
+        # If it is ommitted then the first available device will be used
         'appium:udid': '123456',
-        # Or run the test on the emulator
+        # ...or run the test on an emulator
         # 'appium:avd': 'emulator-5554',
     }
-    app_caps = {
-        **common_caps,
-        'appium:app': '/Projects/myapp.apk',
-        # It might also be necessary to provide more info about app activities
-        # Read https://github.com/appium/appium/blob/master/docs/en/writing-running-appium/android/activity-startup.md
-        # for more details
-        # 'appium:appPackage': 'com.mypackage',
-        # 'appium:appActivity': '.myMainActivity',
-        # 'appium:appWaitActivity': '.mySplashScreenActivity',
-    }
-    browser_caps = {
-        **common_caps,
-        'browserName': 'chrome',
-        # Read https://github.com/appium/appium/blob/master/docs/en/writing-running-appium/web/chromedriver.md
-        # Read https://github.com/appium/appium/blob/master/docs/en/writing-running-appium/web/hybrid.md
-        'appium:chromedriverExecutable': '/Project/chromedriver_linux64',
-    }
-    return [app_caps, browser_caps]
-
-
-@pytest.fixture(params=generate_caps())
+    app_options = UiAutomator2Options().load_capabilities(common_caps)
+    app_options.app = '/Projects/myapp.apk'
+    # It might also be necessary to provide more info about app activities
+    # Read https://github.com/appium/appium/blob/master/docs/en/writing-running-appium/android/activity-startup.md
+    # for more details
+    # app_options.appPackage = 'com.mypackage'
+    # app_options.appActivity = '.myMainActivity'
+    # app_options.appWaitActivity = '.mySplashScreenActivity'
+    chrome_options = UiAutomator2Options().load_capabilities(common_caps)
+    chrome_options.browser_name = 'chrome'
+    # Read https://github.com/appium/appium/blob/master/docs/en/writing-running-appium/web/chromedriver.md
+    # Read https://github.com/appium/appium/blob/master/docs/en/writing-running-appium/web/hybrid.md
+    chrome_options.chromedriver_executable = '/Project/chromedriver_linux64'
+    return [app_options, chrome_options]
+
+
+@pytest.fixture(params=generate_options())
 def driver(request):
-    drv = webdriver.Remote('http://localhost:4723/wd/hub', request.param)
+    # The default URL is http://127.0.0.1:4723/wd/hub in Appium1
+    drv = webdriver.Remote('http://localhost:4723', options=request.param)
     yield drv
     drv.quit()