Merge lp:~elopio/ubuntu-ui-toolkit/pullToRefresh-test2 into lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/pullToRefresh

[Leo Arias]

Added a test for the cancel pull to refresh.

[Zsombor Egri (zsombi)]

thx buddy

review: Approve

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2014-05-21 12:13:27 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2014-05-22 15:47:53 +0000
@@ -183,7 +183,7 @@
     @autopilot_logging.log_action(logger.info)
     def _swipe_to_middle(self):
         start_x = stop_x = self.globalRect.x + (self.globalRect.width // 2)
-        # Start and stop just a little under the top.
+        # Start just a little under the top.
         containers = self._get_containers()
         top = _get_visible_container_top(containers) + 5
         bottom = _get_visible_container_bottom(containers)
@@ -194,6 +194,25 @@
         self.dragging.wait_for(False)
         self.moving.wait_for(False)
 
+    @autopilot_logging.log_action(logger.info)
+    def _cancel_pull_to_refresh(self):
+        """Swipe down the list and then swipe it up to cancel the refresh."""
+        # This method is kept private because it's not for the test writers to
+        # call. It's to test pull to refresh. --elopio - 2014-05-22
+        self._swipe_to_top()
+        start_x = stop_x = self.globalRect.x + (self.globalRect.width // 2)
+        # Start just a little under the top.
+        containers = self._get_containers()
+        top = _get_visible_container_top(containers) + 5
+        bottom = _get_visible_container_bottom(containers)
+
+        start_y = top
+        stop_y = bottom // 2
+        self.pointing_device.move(start_x, start_y)
+        self.pointing_device.press()
+        self.pointing_device.move(stop_x, stop_y)
+        self.pointing_device.move(start_x, start_y)
+        self.pointing_device.release()
 
 class PullToRefresh(_common.UbuntuUIToolkitCustomProxyObjectBase):
     """Autopilot helper for the PullToRefresh component."""

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_pull_to_refresh.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_pull_to_refresh.py	2014-05-21 12:15:29 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_pull_to_refresh.py	2014-05-22 15:47:53 +0000
@@ -15,6 +15,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import os
+import time
 
 import ubuntuuitoolkit
 from ubuntuuitoolkit import tests
@@ -31,6 +32,9 @@
         self.label = self.main_view.select_single(
             'Label', objectName='refreshedLabel')
         self.assertEqual(self.label.text, 'Not refreshed.')
+        self.flickable_with_pull_to_refresh = self.main_view.select_single(
+            ubuntuuitoolkit.QQuickFlickable,
+            objectName='flickableWithPullToRefresh')
 
     def test_pull_to_refresh_on_a_flickable_without_it_must_raise_error(self):
         flickable = self.main_view.select_single(
@@ -42,9 +46,13 @@
             str(error), 'The flickable has no pull to refresh functionality.')
 
     def test_pull_to_refresh_must_refresh_model(self):
-        flickable = self.main_view.select_single(
-            ubuntuuitoolkit.QQuickFlickable,
-            objectName='flickableWithPullToRefresh')
-        flickable.pull_to_refresh()
+        self.flickable_with_pull_to_refresh.pull_to_refresh()
 
         self.assertEqual(self.label.text, 'Refreshed.')
+
+    def test_cancel_pull_to_refresh_must_not_refresh_model(self):
+        self.flickable_with_pull_to_refresh._cancel_pull_to_refresh()
+        # Sleep for some time to make sure that the list is not being
+        # refreshed.
+        time.sleep(3)
+        self.assertEqual(self.label.text, 'Not refreshed.')