Merge pull request #18886 from chirarobert/v1.4_camera_fix

Bug 1004963 - Update camera tests
mozilla-b2g · May 2, 2014 · 4a10f41 · 4a10f41
2 parents 7b2b82d + 9c80c1e
commit 4a10f41
Showing 1 changed file with 3 additions and 3 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
@@ -47,7 +47,7 @@ def take_photo(self):
         # Wait for camera to be ready to take a picture
         self.wait_for_condition(
             lambda m: m.find_element(
-                *self._controls_locator).get_attribute('enabled') == 'true', 20)
+                *self._controls_locator).get_attribute('data-enabled') == 'true', 20)
 
         self.tap_capture()
 
@@ -83,7 +83,7 @@ def tap_switch_source(self):
         self.marionette.find_element(*self._switch_button_locator).tap()
         self.wait_for_condition(
             lambda m: m.find_element(
-                *self._controls_locator).get_attribute('enabled') == 'true')
+                *self._controls_locator).get_attribute('data-enabled') == 'true')
         self.wait_for_capture_ready()
 
     def tap_toggle_flash_button(self):
@@ -99,7 +99,7 @@ def wait_for_capture_ready(self):
 
     def wait_for_video_capturing(self):
         self.wait_for_condition(lambda m: self.marionette.find_element(
-            *self._controls_locator).get_attribute('recording') == 'true')
+            *self._controls_locator).get_attribute('data-recording') == 'true')
 
     def wait_for_video_timer_not_visible(self):
         self.wait_for_element_not_displayed(*self._video_timer_locator)