1
=== modified file 'app/ui/LocationPane.qml'
2
--- app/ui/LocationPane.qml	2015-10-15 14:15:10 +0000
3
+++ app/ui/LocationPane.qml	2015-10-18 15:24:09 +0000
4
@@ -130,6 +130,7 @@
5
130
130
6
131
    PullToRefresh {
131
    PullToRefresh {
7
132
        id: pullToRefresh
132
        id: pullToRefresh
8
133
        objectName: "pullToRefresh"
9
133
        refreshing: false
134
        refreshing: false
10
134
        onRefresh: {
135
        onRefresh: {
11
135
            locationPages.loaded = false
136
            locationPages.loaded = false
12
136
137
13
=== modified file 'debian/changelog'
14
--- debian/changelog	2015-10-16 00:12:57 +0000
15
+++ debian/changelog	2015-10-18 15:24:09 +0000
16
@@ -28,6 +28,7 @@
17
28
  * Make sure the text elides on the LocationsPage and the AddLocationPage. (LP: #1469460)
28
  * Make sure the text elides on the LocationsPage and the AddLocationPage. (LP: #1469460)
18
29
  * Make the first column of the day delegate extra info wider to accommodate other
29
  * Make the first column of the day delegate extra info wider to accommodate other
19
30
    languages.
30
    languages.
20
31
  * Create autopilot test which does a pull to refresh action (LP: #1452486)
21
31
32
22
32
  [ Andrew Hayzen ]
33
  [ Andrew Hayzen ]
23
33
  * Add mocked locations for autopilot and add a test using the data
34
  * Add mocked locations for autopilot and add a test using the data
24
34
35
25
=== modified file 'tests/autopilot/ubuntu_weather_app/__init__.py'
26
--- tests/autopilot/ubuntu_weather_app/__init__.py	2015-10-15 14:12:37 +0000
27
+++ tests/autopilot/ubuntu_weather_app/__init__.py	2015-10-18 15:24:09 +0000
28
@@ -228,6 +228,28 @@
29
228
        return self.select_single(
228
        return self.select_single(
30
229
            "AbstractButton", objectName="settingsButton")
229
            "AbstractButton", objectName="settingsButton")
31
230
230
32
231
    def pull_to_refresh_data(self):
33
232
        x, y, width, height = self.globalRect
34
233
        start_x = stop_x = x + (width // 2)
35
234
        start_y = y + (height * 0.2)
36
235
        stop_y = y + (height * 0.8)
37
236
38
237
        # Swipe down (pull), hold, and release
39
238
        self.pointing_device.move(start_x, start_y)
40
239
        self.pointing_device.press()
41
240
        self.pointing_device.move(stop_x, stop_y)
42
241
        self.release_to_refresh().wait_for(True)
43
242
        self.pointing_device.release()
44
243
        self.refreshing().wait_for(True)
45
244
46
245
    def refreshing(self):
47
246
        return self.wait_select_single(
48
247
            "PullToRefresh", objectName="pullToRefresh").refreshing
49
248
50
249
    def release_to_refresh(self):
51
250
        return self.wait_select_single(
52
251
            "PullToRefresh", objectName="pullToRefresh").releaseToRefresh
53
252
54
231
253
55
232
class LocationsPage(Page):
254
class LocationsPage(Page):
56
233
    """Autopilot helper for LocationsPage."""
255
    """Autopilot helper for LocationsPage."""
57
234
256
58
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_home_page.py'
59
--- tests/autopilot/ubuntu_weather_app/tests/test_home_page.py	2015-09-29 15:21:55 +0000
60
+++ tests/autopilot/ubuntu_weather_app/tests/test_home_page.py	2015-10-18 15:24:09 +0000
61
@@ -57,6 +57,23 @@
62
57
        self.assertThat(day_delegate.state, Eventually(Equals("expanded")))
57
        self.assertThat(day_delegate.state, Eventually(Equals("expanded")))
63
58
        self.assertEqual(day_delegate.height, day_delegate.expandedHeight)
58
        self.assertEqual(day_delegate.height, day_delegate.expandedHeight)
64
59
59
65
60
    def test_pull_to_refresh(self):
66
61
        """ tests swiping downward to refresh the app's data """
67
62
68
63
        location_pane = self.home_page.get_selected_location_pane()
69
64
70
65
        # Ensure we are not refreshing
71
66
        self.assertThat(location_pane.refreshing(), Equals(False))
72
67
73
68
        # Swipe down to refresh
74
69
        location_pane.pull_to_refresh_data()
75
70
76
71
        # Re-get home page as change in loaders changes tree
77
72
        location_pane = self.home_page.get_selected_location_pane()
78
73
79
74
        # Ensure that eventually we are not refreshing
80
75
        self.assertThat(location_pane.refreshing, Eventually(Equals(False)))
81
76
82
60
    def test_show_today_details(self):
77
    def test_show_today_details(self):
83
61
        """tests clicking on the today info to expand and contract it"""
78
        """tests clicking on the today info to expand and contract it"""
84
62
79
Reviewer	Review Type	Date Requested	Status
Jenkins Bot	continuous-integration		Needs Fixing on 2015-10-27
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2015-10-18
Andrew Hayzen		2015-08-14	Needs Fixing on 2015-10-15
Review via email: mp+268027@code.launchpad.net