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 #18592 from bebef1987/ev_me
Browse files Browse the repository at this point in the history
Bug 1000062 - Delete some more redundant tests
  • Loading branch information
Zac committed Apr 24, 2014
2 parents 1accf8f + 0e8fda2 commit 6699b42
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 59 deletions.
Expand Up @@ -17,8 +17,6 @@ class SearchPanel(Base):
_search_title_query_locator = (By.CSS_SELECTOR, '#search-title > .query')
_search_title_first_word_locator = (By.CSS_SELECTOR, '#search-title [data-l10n-id="evme-helper-title-prefix"]')
_search_results_from_everything_me_locator = (By.CSS_SELECTOR, '#search .evme-apps ul.cloud li[data-name]')
_search_results_installed_app_locator = (By.CSS_SELECTOR, '#search .evme-apps ul.installed li[data-name]')
_app_icon_locator = (By.CSS_SELECTOR, 'ul.cloud li[data-name]')

def type_into_search_box(self, search_term):
self.keyboard.send(search_term)
Expand All @@ -35,22 +33,11 @@ def wait_for_everything_me_loaded(self):
def wait_for_everything_me_results_to_load(self):
self.wait_for_element_displayed(*self._search_results_from_everything_me_locator)

def wait_for_app_icons_displayed(self):
self.wait_for_element_displayed(*self._app_icon_locator)

def wait_for_installed_apps_displayed(self):
self.wait_for_element_displayed(*self._search_results_installed_app_locator)

@property
def results(self):
return [self.Result(marionette=self.marionette, element=result)
for result in self.marionette.find_elements(*self._search_results_from_everything_me_locator)]

@property
def installed_apps(self):
return [self.InstalledApp(self.marionette, root_el) for root_el in
self.marionette.find_elements(*self._search_results_installed_app_locator)]

class Result(PageRegion):

@property
Expand All @@ -67,16 +54,3 @@ def tap(self):

# Wait for title to load (we cannot be more specific because the aut may change)
self.wait_for_condition(lambda m: bool(m.title))

class InstalledApp(PageRegion):

@property
def name(self):
return self.root_element.get_attribute('data-name')

def tap(self):
expected_name = self.name
self.root_element.tap()
Wait(self.marionette, ignored_exceptions=StaleElementException).until(
lambda m: self.apps.displayed_app.name.lower() == expected_name.lower())
self.apps.switch_to_displayed_app()
Expand Up @@ -21,4 +21,3 @@ skip-if = device == "desktop"
# Bug 893741 - Unable to use Everything.me on B2G desktop builds
skip-if = device == "desktop"

[test_everythingme_launch_packaged_app.py]

This file was deleted.

Expand Up @@ -35,7 +35,6 @@ skip-if = os == "mac"
[functional/contacts/test_delete_contact.py]
[functional/contacts/test_add_contact_to_favorites.py]
[functional/dialer/test_dialer_add_contact.py]
[functional/everythingme/test_everythingme_launch_packaged_app.py]
[functional/homescreen/test_homescreen_edit_mode.py]
[functional/homescreen/test_homescreen_move_app.py]
[functional/keyboard/test_email_keyboard.py]
Expand Down

0 comments on commit 6699b42

Please sign in to comment.