Merge pull request #13513 from viorelaioia/bug_935915

Bug 935915 - Change test_everything_me_search for a more generic search term

tests/python/gaia-ui-tests/gaiatest/apps/homescreen/regions/search_panel.py

@@ -13,7 +13,7 @@
 class SearchPanel(Base):
 
     _body = (By.CSS_SELECTOR, 'body')
-    _search_title_type_locator = (By.CSS_SELECTOR, '#search-title > .type')
+    _search_title_first_word_locator = (By.CSS_SELECTOR, '#search-title [data-l10n-id="evme-helper-title-prefix"]')
     _search_title_query_locator = (By.CSS_SELECTOR, '#search-title > .query')
     _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]')
@@ -28,16 +28,15 @@ def type_into_search_box(self, search_term):
         self.wait_for_condition(lambda m: self.marionette.find_element(*self._search_title_query_locator).text.lower() ==
                                 search_term.lower())
 
+        self.wait_for_element_displayed(*self._search_title_first_word_locator)
+
     def wait_for_everything_me_loaded(self):
         self.wait_for_condition(
             lambda m: 'evme-loading' not in self.marionette.find_element(*self._body).get_attribute('class'))
 
     def wait_for_everything_me_results_to_load(self):
         self.wait_for_element_displayed(*self._search_results_from_everything_me_locator)
 
-    def wait_for_type(self, type):
-        self.wait_for_condition(lambda m: type.lower() in self.marionette.find_element(*self._search_title_type_locator).text.lower())
-
     def wait_for_app_icons_displayed(self):
         self.wait_for_element_displayed(*self._app_icon_locator)
 

tests/python/gaia-ui-tests/gaiatest/tests/functional/everythingme/test_everythingme_search.py

@@ -18,15 +18,14 @@ def test_launch_everything_me_search(self):
         # Tests a search with a common string.
         # Asserts that the title and shortcuts are listed
 
-        test_string = u'skyfall'
+        test_string = u'News'
         homescreen = Homescreen(self.marionette)
         homescreen.switch_to_homescreen_frame()
 
         search_panel = homescreen.tap_search_bar()
         search_panel.wait_for_everything_me_loaded()
         search_panel.type_into_search_box(test_string)
 
-        search_panel.wait_for_type('Movies')
         search_panel.wait_for_everything_me_results_to_load()
 
         self.assertGreater(len(search_panel.results), 0)