up

mozilla-b2g · Jan 6, 2015 · 894446b · 894446b
1 parent 4ecf243
commit 894446b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/tests/python/gaia-ui-tests/gaiatest/apps/camera/app.py b/tests/python/gaia-ui-tests/gaiatest/apps/camera/app.py
@@ -40,7 +40,10 @@ class Camera(Base):
 
     def launch(self):
         Base.launch(self)
+        self.wait_for_loading_spinner_hidden()
         self.wait_for_capture_ready()
+
+    def wait_for_loading_spinner_hidden(self):
         self.wait_for_element_not_displayed(*self._loading_screen_locator)
 
     @property

diff --git a/tests/python/gaia-ui-tests/gaiatest/apps/system/regions/activities.py b/tests/python/gaia-ui-tests/gaiatest/apps/system/regions/activities.py
@@ -53,6 +53,7 @@ def tap_camera(self):
         camera = Camera(self.marionette)
         self.wait_for_condition(lambda m: self.apps.displayed_app.name == camera.name)
         self.apps.switch_to_displayed_app()
+        camera.wait_for_loading_spinner_hidden()
         camera.wait_for_capture_ready()
         return camera