Fix CI fails (Updated iOS ver) (appium#440)

ki4070ma · web-flow · commit aaeb8e9363f6 · 2019-09-28T08:09:13.000+09:00
* Updated iOS ver to fix CI fails

* Update capability for safari test on ios

* Fix travis CI fails
diff --git a/.isort.cfg b/.isort.cfg
@@ -1,4 +1,4 @@
 [settings]
 multi_line_output = 3
-known_third_party = dateutil,httpretty,pytest,selenium,setuptools,urllib3,mock
+known_third_party = dateutil,httpretty,pytest,selenium,setuptools,urllib3,mock,sauceclient
 known_first_party = test
diff --git a/appium/saucetestcase.py b/appium/saucetestcase.py
@@ -20,9 +20,10 @@
 import sys
 import unittest
 
-from appium import webdriver
 from sauceclient import SauceClient
 
+from appium import webdriver
+
 SAUCE_USERNAME = os.environ.get('SAUCE_USERNAME')
 SAUCE_ACCESS_KEY = os.environ.get('SAUCE_ACCESS_KEY')
 sauce = SauceClient(SAUCE_USERNAME, SAUCE_ACCESS_KEY)
diff --git a/test/functional/ios/helper/desired_capabilities.py b/test/functional/ios/helper/desired_capabilities.py
@@ -24,17 +24,19 @@ def PATH(p): return os.path.abspath(
 BUNDLE_ID = 'com.example.apple-samplecode.UICatalog'
 
 
-def get_desired_capabilities(app):
+def get_desired_capabilities(app=None):
     desired_caps = {
         'deviceName': iphone_device_name(),
         'platformName': 'iOS',
-        'platformVersion': '12.2',
-        'app': PATH('../../../apps/{}'.format(app)),
+        'platformVersion': '12.4',
         'automationName': 'XCUITest',
         'allowTouchIdEnroll': True,
         'wdaLocalPort': wda_port(),
     }
 
+    if app is not None:
+        desired_caps['app'] = PATH('../../../apps/{}'.format(app))
+
     return desired_caps
 
 
diff --git a/test/functional/ios/safari_tests.py b/test/functional/ios/safari_tests.py
@@ -16,18 +16,18 @@
 
 from appium import webdriver
 
+from .helper.desired_capabilities import get_desired_capabilities
+
 
 class SafariTests(unittest.TestCase):
     def setUp(self):
-        desired_caps = {
+        desired_caps = get_desired_capabilities()
+        desired_caps.update({
             'browserName': 'safari',
-            'platformName': 'iOS',
-            'platformVersion': '12.2',
-            'deviceName': 'iPhone Simulator',
             'nativeWebTap': True,
-            'safariIgnoreFraudWarning': True,
-            'automationName': 'XCUITest'
-        }
+            'safariIgnoreFraudWarning': True
+        })
+
         self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
 
     def tearDown(self):
