Merge lp:~nskaggs/ubuntu-calculator-app/fix-swipe into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Nicholas Skaggs]

Small fix to autopilot tests for swiping on larger screens (and smaller :-) )

Small fix to autopilot tests for swiping on larger screens (and smaller :-) )

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

PASSED: Continuous integration, rev:137
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/85/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/77
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/85
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/85
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/77

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

[Mihir Soni (mihirsoni)]

Thanks for the fix.

review: Approve

=== modified file 'tests/autopilot/ubuntu_calculator_app/emulators.py'
--- tests/autopilot/ubuntu_calculator_app/emulators.py	2013-08-08 15:40:16 +0000
+++ tests/autopilot/ubuntu_calculator_app/emulators.py	2013-08-14 22:15:24 +0000
@@ -229,7 +229,7 @@
         x, y, w, h = self.globalRect
         tx = x + (w - w / 8)
         ty = y + (h / 2)
-        self.pointing_device.drag(tx, ty, tx / 8, ty)
+        self.pointing_device.drag(tx, ty, tx + (w - w / 8), ty)
 
     def confirm_delete(self):
         """Confirm the deletion of the calculation."""