Merge pull request #24339 from viorelaioia/bug_1068619_master

Bug 1068619 - [v2.2] [v2.1] Investigate test_browser_search failure
mozilla-b2g · Sep 24, 2014 · e17fb5e · e17fb5e
2 parents 4de939d + 4819ff6
commit e17fb5e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/tests/python/gaia-ui-tests/gaiatest/apps/homescreen/regions/search_panel.py b/tests/python/gaia-ui-tests/gaiatest/apps/homescreen/regions/search_panel.py
@@ -29,8 +29,11 @@ def go_to_url(self, url):
 
         #TODO Remove hack once Bug 1062309 is fixed
         self.marionette.switch_to_frame()
+        self.wait_for_condition(lambda m: not self.keyboard.is_keyboard_displayed)
+
         self.marionette.find_element(*self._rocketbar_input_locator).tap()
 
+        self.wait_for_condition(lambda m: self.keyboard.is_keyboard_displayed)
         self.keyboard.tap_enter()
         self.wait_for_condition(lambda m: url in self.apps.displayed_app.name)
 

diff --git a/tests/python/gaia-ui-tests/gaiatest/apps/keyboard/app.py b/tests/python/gaia-ui-tests/gaiatest/apps/keyboard/app.py
@@ -407,3 +407,7 @@ def a11y_first_predictive_word_click(self):
         self.accessibility.click(
             self.marionette.find_element(*self._predicted_word_locator))
         self.apps.switch_to_displayed_app()
+
+    @property
+    def is_keyboard_displayed(self):
+        return 'hide' not in self.marionette.find_element(*self._keyboards_locator).get_attribute('class')