Merge lp:~brendan-donegan/ubuntu-clock-app/wait_for_bottomedgetip_visible into lp:ubuntu-clock-app

[Brendan Donegan]

Wait for the bottomEdgeTip 'visible' property to be True

Wait for the bottomEdgeTip 'visible' property to be True, the other wait_for's (on enable and 'hiden') were red herrings.

[Brendan Donegan (brendan-donegan)]

I've no idea how the diff got like that

[Leo Arias (elopio)]

Looks good to me. Please confirm that the tests are passing in Jenkins before merging.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:178
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/585/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/362
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/362/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/585/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_clock_app/emulators.py'
--- tests/autopilot/ubuntu_clock_app/emulators.py	2014-10-14 11:25:35 +0000
+++ tests/autopilot/ubuntu_clock_app/emulators.py	2014-11-25 15:19:01 +0000
@@ -91,8 +91,7 @@
         self.bottomEdgePageLoaded.wait_for(True)
         try:
             action_item = self.wait_select_single(objectName='bottomEdgeTip')
-            action_item.hiden.wait_for(False)
-            action_item.enabled.wait_for(True)
+            action_item.visible.wait_for(True)
             action_item.isAnimating.wait_for(False)
             start_x = (action_item.globalRect.x +
                        (action_item.globalRect.width * 0.5))
@@ -544,4 +543,4 @@
 class AlarmDelegate(ListItemWithActions):
 
     def __init__(self, *args):
-        super(AlarmDelegate, self).__init__(*args)
\ No newline at end of file
+        super(AlarmDelegate, self).__init__(*args)