Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .isort.cfg
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion appium/saucetestcase.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 5 additions & 3 deletions test/functional/ios/helper/desired_capabilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
14 changes: 7 additions & 7 deletions test/functional/ios/safari_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down