Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Merge pull request #31485 from mwargers/1195033
Browse files Browse the repository at this point in the history
Bug 1195033 - Add more tap_element_from_system_app for places that need it
  • Loading branch information
mwargers committed Aug 24, 2015
2 parents baba4a7 + cc69fc2 commit 6a84d55
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion tests/python/gaia-ui-tests/gaiatest/apps/contacts/app.py
Expand Up @@ -134,7 +134,8 @@ def image_data_group(self):
return self.root_element.find_element(*self._image_locator).get_attribute('data-group')

def tap(self, return_class='ContactDetails'):
self.root_element.find_element(*self._name_locator).tap()
self.tap_element_from_system_app(
self.root_element.find_element(*self._name_locator), add_statusbar_height=True)
return self._return_class_from_tap(return_class)

def a11y_click(self, return_class='ContactDetails'):
Expand Down
Expand Up @@ -29,7 +29,7 @@ def tap_add_bookmark_to_home_screen_dialog_button(self):
Wait(self.marionette).until(expected.element_displayed(element))
# This sleep is necessary for the button to react to the tap call
time.sleep(0.2)
element.tap()
self.tap_element_from_system_app(element)

# Wait for the Add to bookmark frame to be dismissed
Wait(self.marionette).until(lambda m: self.apps.displayed_app.name != self.name)
Expand Down
3 changes: 2 additions & 1 deletion tests/python/gaia-ui-tests/gaiatest/apps/wallpaper/app.py
Expand Up @@ -17,6 +17,7 @@ def tap_wallpaper_by_index(self, index):
Wait(self.marionette).until(
lambda m: len(m.find_elements(*self._stock_wallpapers_locator)) >= (index + 1),
message='%d wallpaper(s) not present after timeout' % (index + 1))
self.marionette.find_elements(*self._stock_wallpapers_locator)[index].tap()
self.tap_element_from_system_app(
self.marionette.find_elements(*self._stock_wallpapers_locator)[index])
Wait(self.marionette).until(lambda m: self.apps.displayed_app.name != self.name)
self.apps.switch_to_displayed_app()

0 comments on commit 6a84d55

Please sign in to comment.