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
46 changes: 43 additions & 3 deletions appium/webdriver/webdriver.py
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,8 @@ def find_element(self, by=By.ID, value=None):

Returns:
`WebElement`

:rtype: `MobileWebElement`
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[notice] If WebElement, it doesn't work. (import matter)

"""
# TODO: If we need, we should enable below converter for Web context
# if self.w3c:
Expand Down Expand Up @@ -281,6 +283,8 @@ def find_elements(self, by=By.ID, value=None):

Returns:
:obj:`list` of :obj:`WebElement`

:rtype: list of `MobileWebElement`
"""
# TODO: If we need, we should enable below converter for Web context
# if self.w3c:
Expand Down Expand Up @@ -311,6 +315,11 @@ def find_element_by_ios_uiautomation(self, uia_string):

Usage:
driver.find_element_by_ios_uiautomation('.elements()[1].cells()[2]')

Returns:
`WebElement`

:rtype: `MobileWebElement`
"""
return self.find_element(by=MobileBy.IOS_UIAUTOMATION, value=uia_string)

Expand All @@ -324,7 +333,9 @@ def find_elements_by_ios_uiautomation(self, uia_string):
driver.find_elements_by_ios_uiautomation('.elements()[1].cells()[2]')

Returns:
`WebElement`
:obj:`list` of :obj:`WebElement`

:rtype: list of `MobileWebElement`
"""
return self.find_elements(by=MobileBy.IOS_UIAUTOMATION, value=uia_string)

Expand All @@ -339,6 +350,8 @@ def find_element_by_ios_predicate(self, predicate_string):

Returns:
`WebElement`

:rtype: `MobileWebElement`
"""
return self.find_element(by=MobileBy.IOS_PREDICATE, value=predicate_string)

Expand All @@ -352,7 +365,9 @@ def find_elements_by_ios_predicate(self, predicate_string):
driver.find_elements_by_ios_predicate('label == "myLabel"')

Returns:
`WebElement`
:obj:`list` of :obj:`WebElement`

:rtype: list of `MobileWebElement`
"""
return self.find_elements(by=MobileBy.IOS_PREDICATE, value=predicate_string)

Expand All @@ -367,6 +382,8 @@ def find_element_by_ios_class_chain(self, class_chain_string):

Returns:
`WebElement`

:rtype: `MobileWebElement`
"""
return self.find_element(by=MobileBy.IOS_CLASS_CHAIN, value=class_chain_string)

Expand All @@ -381,6 +398,8 @@ def find_elements_by_ios_class_chain(self, class_chain_string):

Returns:
:obj:`list` of :obj:`WebElement`

:rtype: list of `MobileWebElement`
"""
return self.find_elements(by=MobileBy.IOS_CLASS_CHAIN, value=class_chain_string)

Expand All @@ -395,6 +414,8 @@ def find_element_by_android_uiautomator(self, uia_string):

Returns:
`WebElement`

:rtype: `MobileWebElement`
"""
return self.find_element(by=MobileBy.ANDROID_UIAUTOMATOR, value=uia_string)

Expand All @@ -409,6 +430,8 @@ def find_elements_by_android_uiautomator(self, uia_string):

Returns:
:obj:`list` of :obj:`WebElement`

:rtype: list of `MobileWebElement`
"""
return self.find_elements(by=MobileBy.ANDROID_UIAUTOMATOR, value=uia_string)

Expand All @@ -425,6 +448,8 @@ def find_element_by_android_viewtag(self, tag):

Returns:
`WebElement`

:rtype: `MobileWebElement`
"""
return self.find_element(by=MobileBy.ANDROID_VIEWTAG, value=tag)

Expand All @@ -441,6 +466,8 @@ def find_elements_by_android_viewtag(self, tag):

Returns:
:obj:`list` of :obj:`WebElement`

:rtype: list of `MobileWebElement`
"""
return self.find_elements(by=MobileBy.ANDROID_VIEWTAG, value=tag)

Expand All @@ -454,6 +481,8 @@ def find_element_by_image(self, img_path):

Returns:
`WebElement`

:rtype: `MobileWebElement`
"""
with open(img_path, 'rb') as i_file:
b64_data = base64.b64encode(i_file.read()).decode('UTF-8')
Expand All @@ -471,6 +500,8 @@ def find_elements_by_image(self, img_path):

Return:
:obj:`list` of :obj:`WebElement`

:rtype: list of `MobileWebElement`
"""
with open(img_path, 'rb') as i_file:
b64_data = base64.b64encode(i_file.read()).decode('UTF-8')
Expand All @@ -489,6 +520,8 @@ def find_element_by_accessibility_id(self, accessibility_id):

Returns:
`WebElement`

:rtype: `MobileWebElement`
"""
return self.find_element(by=MobileBy.ACCESSIBILITY_ID, value=accessibility_id)

Expand All @@ -503,7 +536,9 @@ def find_elements_by_accessibility_id(self, accessibility_id):
driver.find_elements_by_accessibility_id()

Returns:
`WebElement`
:obj:`list` of :obj:`WebElement`

:rtype: list of `MobileWebElement`
"""
return self.find_elements(by=MobileBy.ACCESSIBILITY_ID, value=accessibility_id)

Expand All @@ -521,6 +556,8 @@ def find_element_by_custom(self, selector):

Returns:
`WebElement`

:rtype: `MobileWebElement`
"""
return self.find_element(by=MobileBy.CUSTOM, value=selector)

Expand All @@ -538,6 +575,8 @@ def find_elements_by_custom(self, selector):

Returns:
:obj:`list` of :obj:`WebElement`

:rtype: list of `MobileWebElement`
"""
return self.find_elements(by=MobileBy.CUSTOM, value=selector)

Expand Down Expand Up @@ -567,6 +606,7 @@ def press_button(self, button_name):

Returns:
`WebDriver`

"""
data = {
'name': button_name
Expand Down
7 changes: 0 additions & 7 deletions ci-jobs/functional_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,3 @@ jobs:
pytestOpt: ${{ parameters.pytestOpt }}
testFiles: 'location_tests.py'
sdkVer: 28
- template: ./functional/run_android_test.yml
parameters:
name: 'func_test_android2'
vmImage: ${{ parameters.vmImage }}
pytestOpt: ${{ parameters.pytestOpt }}
testFiles: 'remote_fs_tests.py'
sdkVer: 28