Merge lp:~elopio/ubuntu-calculator-app/swipe_to_delete into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Leo Arias]

Updated the swipe to delete test to do the swipe to the right.

[Leo Arias (elopio)]

The new version of ubuntu ui toolkit that's ready in a silo to land removed the swipe to delete from left to right. We need to update the test.

[lp:~elopio/ubuntu-calculator-app/swipe_to_delete]

284. By Leo Arias on 2014-06-12

Reverted the pot change.

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

PASSED: Continuous integration, rev:284
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/218/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/512
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/512/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/13

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

review: Approve (continuous-integration)

[Chris Gagnon (chris.gagnon)]

lgtm

review: Approve

[lp:~elopio/ubuntu-calculator-app/swipe_to_delete]

285. By Leo Arias on 2014-06-12

Added a link to the bug.

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

PASSED: Continuous integration, rev:285
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/219/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/513
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/513/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/14

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

review: Approve (continuous-integration)

[Christopher Lee (veebers)]

LGTM, thanks for adding the bug link.

review: Approve (code review)

[Mihir Soni (mihirsoni)]

Looks good to me.
Thanks.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_calculator_app/emulators.py'
--- tests/autopilot/ubuntu_calculator_app/emulators.py	2014-05-30 17:39:37 +0000
+++ tests/autopilot/ubuntu_calculator_app/emulators.py	2014-06-12 22:26:00 +0000
@@ -16,11 +16,17 @@
 
 """Calculator app autopilot emulators."""
 
+import logging
+
+import autopilot.logging
 from autopilot.introspection import dbus
 
 from ubuntuuitoolkit import emulators as toolkit_emulators
 
 
+logger = logging.getLogger(__name__)
+
+
 class MainView(toolkit_emulators.MainView):
     """Calculator MainView Autopilot emulator."""
 
@@ -120,10 +126,10 @@
         """
         self.swipe_previous_calculation_into_view(screen_index)
         screen = self.get_screen_by_index(screen_index)
-        screen.swipe_to_left()
+        screen.swipe_to_delete()
         self._wait_for_screen_to_finish_animation()
         if confirm:
-            screen.confirm_delete()
+            screen.confirm_removal()
         else:
             raise NotImplementedError('Not yet implemented.')
 
@@ -182,7 +188,7 @@
         self.pointing_device.click_object(sign_button)
 
 
-class Screen(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+class Screen(toolkit_emulators.Standard):
     """Screen Autopilot emulator."""
 
     def __init__(self, *args):
@@ -255,20 +261,22 @@
     def _get_number_of_labels(self):
         return len(self.select_many('CalcLabel'))
 
-    def swipe_to_left(self):
-        """Swipe the screen to the left.
-
-        If it's an old calculation, a delete dialog will appear.
-
-        """
-        x, y, w, h = self.globalRect
-        tx = x + (w - w / 8)
-        ty = y + (h / 2)
-        self.pointing_device.drag(tx, ty, (w / 10), ty)
-
-    def confirm_delete(self):
-        """Confirm the deletion of the calculation."""
-        delete_item = self.select_single(
-            'QQuickItem', objectName='confirmRemovalDialog')
-        """Click the icon"""
-        self.pointing_device.click_object(delete_item)
+    @autopilot.logging.log_action(logger.info)
+    def swipe_to_delete(self):
+        """Swipe the screen to delete the calculation."""
+        # We override it because the left side of the screen is used to
+        # add labels, so the swipe has to start where the operation starts.
+        # This is hard for a user to do, and weird for automation, which means
+        # it's an usability issue. See http://pad.lv/1329536
+        self._drag_pointing_device_to_delete()
+        self.waitingConfirmationForRemoval.wait_for(True)
+
+    def _drag_pointing_device_to_delete(self):
+        x, y, width, height = self.globalRect
+        left_x = x + (width * 0.33)
+        right_x = x + (width * 0.9)
+        start_y = stop_y = y + (height // 2)
+
+        start_x = left_x
+        stop_x = right_x
+        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)

=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py'
--- tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py	2014-05-06 16:26:36 +0000
+++ tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py	2014-06-12 22:26:00 +0000
@@ -234,8 +234,8 @@
         self.assertEquals(
             self.main_view.get_screen_by_index(0).get_result(), "17")
 
-    def test_swipe_delete_calculation_right_left(self):
-        """Delete a calculation swiping it from right to left"""
+    def test_swipe_to_delete_calculation(self):
+        """Delete a calculation swiping on it to the side."""
         self.main_view.calculate_operation("9+5")
         self.main_view.clear_with_swipe()