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

[Leo Arias]

Added the UbuntuListView11 autopilot helper. Fixed the swipe to the middle.

[Zsombor Egri (zsombi)]

Thanks for the help!!!

review: Approve

=== modified file 'tests/autopilot/ubuntuuitoolkit/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/__init__.py	2014-05-09 04:12:25 +0000
+++ tests/autopilot/ubuntuuitoolkit/__init__.py	2014-06-03 15:18:46 +0000
@@ -40,6 +40,7 @@
     'TextField',
     'Toolbar',
     'ToolkitException',
+    'UbuntuListView11',
     'UbuntuUIToolkitCustomProxyObjectBase',
 ]
 
@@ -70,4 +71,5 @@
     Toolbar,
     ToolkitException,
     UbuntuUIToolkitCustomProxyObjectBase,
+    UbuntuListView11,
 )

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py	2014-05-09 04:12:25 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py	2014-06-03 15:18:46 +0000
@@ -35,6 +35,7 @@
     'TextField',
     'Toolbar',
     'ToolkitException',
+    'UbuntuListView11',
     'UbuntuUIToolkitCustomProxyObjectBase',
 ]
 
@@ -62,3 +63,6 @@
 from ubuntuuitoolkit._custom_proxy_objects._tabs import Tabs
 from ubuntuuitoolkit._custom_proxy_objects._textfield import TextField
 from ubuntuuitoolkit._custom_proxy_objects._toolbar import Toolbar
+from ubuntuuitoolkit._custom_proxy_objects._ubuntulistview import (
+    UbuntuListView11
+)

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2014-05-27 04:55:40 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2014-06-03 15:18:46 +0000
@@ -199,7 +199,7 @@
         bottom = _get_visible_container_bottom(containers)
 
         start_y = top
-        stop_y = bottom // 2
+        stop_y = (self.globalRect.y + bottom) // 2
         self._slow_drag(start_x, stop_x, start_y, stop_y)
         self.dragging.wait_for(False)
         self.moving.wait_for(False)
@@ -217,13 +217,14 @@
         bottom = _get_visible_container_bottom(containers)
 
         start_y = top
-        stop_y = bottom // 2
+        stop_y = (self.globalRect.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."""
 

=== added file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_ubuntulistview.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_ubuntulistview.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_ubuntulistview.py	2014-06-03 15:18:46 +0000
@@ -0,0 +1,21 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from ubuntuuitoolkit._custom_proxy_objects import _qquicklistview
+
+
+class UbuntuListView11(_qquicklistview.QQuickListView):
+    """Autopilot helper for the UbuntuListView 1.1."""

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py	2014-05-27 13:59:18 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py	2014-06-03 15:18:46 +0000
@@ -104,7 +104,8 @@
     names = [
         'navigation', 'toggles', 'buttons', 'sliders', 'textinputs',
         'optionSelectors', 'pickers', 'progressBars', 'ubuntuShapes', 'icons',
-        'labels', 'listItems', 'ubuntuListView', 'dialogs', 'popovers', 'sheets', 'animations'
+        'labels', 'listItems', 'ubuntuListView', 'dialogs', 'popovers',
+        'sheets', 'animations'
     ]
 
     scenarios = [

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_ubuntulistview.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_ubuntulistview.py	2014-06-03 12:56:24 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_ubuntulistview.py	2014-06-03 15:18:46 +0000
@@ -22,12 +22,6 @@
 
 class UbuntuListViewTestCase(GalleryTestCase):
 
-    def setUp(self):
-        super(UbuntuListViewTestCase, self).setUp()
-        item = "Ubuntu ListView"
-        self.loadItem(item)
-        self.checkPageHeader(item)
-
     def _open_page(self):
         list_view = self.main_view.select_single(
             ubuntuuitoolkit.QQuickListView, objectName="widgetList")
@@ -43,5 +37,5 @@
     def test_pull_to_refresh_enabled(self):
         self._open_page()
         listView = self.main_view.select_single(
-            ubuntuuitoolkit.QQuickListView, objectName="ubuntu_listview")
+            ubuntuuitoolkit.UbuntuListView11, objectName="ubuntuListView")
         listView.pull_to_refresh()