1
=== modified file 'app/ui/AddLocationPage.qml'
2
--- app/ui/AddLocationPage.qml	2015-06-28 23:37:10 +0000
3
+++ app/ui/AddLocationPage.qml	2015-08-06 00:13:15 +0000
4
@@ -35,6 +35,8 @@
5
35
    */
35
    */
6
36
    flickable: null
36
    flickable: null
7
37
37
8
38
    property bool searching: citiesModel.loading || searchTimer.running
9
39
10
38
    state: "default"
40
    state: "default"
11
39
    states: [
41
    states: [
12
40
        PageHeadState {
42
        PageHeadState {
13
@@ -48,6 +50,7 @@
14
48
            actions: [
50
            actions: [
15
49
                Action {
51
                Action {
16
50
                    iconName: "search"
52
                    iconName: "search"
17
53
                    objectName: "search"
18
51
                    text: i18n.tr("City")
54
                    text: i18n.tr("City")
19
52
                    onTriggered: {
55
                    onTriggered: {
20
53
                        addLocationPage.state = "search"
56
                        addLocationPage.state = "search"
21
@@ -83,6 +86,23 @@
22
83
        }
86
        }
23
84
    ]
87
    ]
24
85
88
25
89
    // Outside component so property can bind to for autopilot
26
90
    Timer {
27
91
        id: searchTimer
28
92
        interval: 250
29
93
        onTriggered: {
30
94
            if (searchComponentLoader.item) {  // check component exists
31
95
                if (searchComponentLoader.item.text.trim() === "") {
32
96
                    loadEmpty()
33
97
                } else {
34
98
                    loadFromProvider(searchComponentLoader.item.text)
35
99
                }
36
100
            } else {
37
101
                loadEmpty()
38
102
            }
39
103
        }
40
104
    }
41
105
42
86
    Component {
106
    Component {
43
87
        id: searchComponent
107
        id: searchComponent
44
88
        TextField {
108
        TextField {
45
@@ -93,13 +113,7 @@
46
93
            placeholderText: i18n.tr("Search city")
113
            placeholderText: i18n.tr("Search city")
47
94
            hasClearButton: true
114
            hasClearButton: true
48
95
115
56
96
            onTextChanged: {
116
            onTextChanged: searchTimer.restart()
50
97
                if (text.trim() === "") {
51
98
                    loadEmpty()
52
99
                } else {
53
100
                    loadFromProvider(text)
54
101
                }
55
102
            }
57
103
        }
117
        }
58
104
    }
118
    }
59
105
119
60
@@ -206,6 +220,7 @@
61
206
220
62
207
        delegate: ListItem {
221
        delegate: ListItem {
63
208
            divider.visible: false
222
            divider.visible: false
64
223
            objectName: "addLocation" + index
65
209
            Column {
224
            Column {
66
210
                anchors {
225
                anchors {
67
211
                    left: parent.left
226
                    left: parent.left
68
212
227
69
=== modified file 'app/ui/LocationsPage.qml'
70
--- app/ui/LocationsPage.qml	2015-07-29 21:34:07 +0000
71
+++ app/ui/LocationsPage.qml	2015-08-06 00:13:15 +0000
72
@@ -38,6 +38,7 @@
73
38
            actions: [
38
            actions: [
74
39
                Action {
39
                Action {
75
40
                    iconName: "add"
40
                    iconName: "add"
76
41
                    objectName: "addLocation"
77
41
                    onTriggered: mainPageStack.push(Qt.resolvedUrl("AddLocationPage.qml"))
42
                    onTriggered: mainPageStack.push(Qt.resolvedUrl("AddLocationPage.qml"))
78
42
                }
43
                }
79
43
            ]
44
            ]
80
@@ -153,6 +154,7 @@
81
153
154
82
154
        delegate: WeatherListItem {
155
        delegate: WeatherListItem {
83
155
            id: locationsListItem
156
            id: locationsListItem
84
157
            objectName: "location" + index
85
156
            leftSideAction: Remove {
158
            leftSideAction: Remove {
86
157
                onTriggered: storage.removeLocation(index)
159
                onTriggered: storage.removeLocation(index)
87
158
            }
160
            }
88
@@ -194,6 +196,7 @@
89
194
196
90
195
                    Label {
197
                    Label {
91
196
                        id: locationName
198
                        id: locationName
92
199
                        objectName: "name"
93
197
                        elide: Text.ElideRight
200
                        elide: Text.ElideRight
94
198
                        fontSize: "medium"
201
                        fontSize: "medium"
95
199
                        text: name
202
                        text: name
96
200
203
97
=== modified file 'debian/changelog'
98
--- debian/changelog	2015-07-30 02:55:02 +0000
99
+++ debian/changelog	2015-08-06 00:13:15 +0000
100
@@ -19,6 +19,9 @@
101
19
  * Remove add location button
19
  * Remove add location button
102
20
  * Change phrasing of manual add location
20
  * Change phrasing of manual add location
103
21
  * Conditionally show "searching for current location" depending on the detectCurrentLocation setting
21
  * Conditionally show "searching for current location" depending on the detectCurrentLocation setting
104
22
  * Create autopilot test which adds a location via searching (LP: #1452497)
105
23
  * Create autopilot test which adds a location via cached results (LP: #1452497)
106
24
  * Fix for racy search bar causing incorrect search query when typed quickly
107
22
25
108
23
 -- Victor Thompson <victor.thompson@gmail.com>  Mon, 01 Jun 2015 20:11:23 -0500
26
 -- Victor Thompson <victor.thompson@gmail.com>  Mon, 01 Jun 2015 20:11:23 -0500
109
24
27
110
25
28
111
=== modified file 'po/com.ubuntu.weather.pot'
112
--- po/com.ubuntu.weather.pot	2015-07-29 20:34:57 +0000
113
+++ po/com.ubuntu.weather.pot	2015-08-06 00:13:15 +0000
114
@@ -8,7 +8,7 @@
115
8
msgstr ""
8
msgstr ""
116
9
"Project-Id-Version: ubuntu-weather-app\n"
9
"Project-Id-Version: ubuntu-weather-app\n"
117
10
"Report-Msgid-Bugs-To: \n"
10
"Report-Msgid-Bugs-To: \n"
119
11
"POT-Creation-Date: 2015-07-29 21:25+0100\n"
11
"POT-Creation-Date: 2015-08-06 01:02+0100\n"
120
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
121
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
122
14
"Language-Team: LANGUAGE <LL@li.org>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
123
@@ -82,39 +82,39 @@
124
82
msgid "Select a city"
82
msgid "Select a city"
125
83
msgstr ""
83
msgstr ""
126
84
84
128
85
#: ../app/ui/AddLocationPage.qml:45 ../app/ui/AddLocationPage.qml:66
85
#: ../app/ui/AddLocationPage.qml:47 ../app/ui/AddLocationPage.qml:69
129
86
msgid "Back"
86
msgid "Back"
130
87
msgstr ""
87
msgstr ""
131
88
88
133
89
#: ../app/ui/AddLocationPage.qml:51
89
#: ../app/ui/AddLocationPage.qml:54
134
90
msgid "City"
90
msgid "City"
135
91
msgstr ""
91
msgstr ""
136
92
92
138
93
#: ../app/ui/AddLocationPage.qml:93
93
#: ../app/ui/AddLocationPage.qml:113
139
94
msgid "Search city"
94
msgid "Search city"
140
95
msgstr ""
95
msgstr ""
141
96
96
143
97
#: ../app/ui/AddLocationPage.qml:278
97
#: ../app/ui/AddLocationPage.qml:293
144
98
msgid "No city found"
98
msgid "No city found"
145
99
msgstr ""
99
msgstr ""
146
100
100
148
101
#: ../app/ui/AddLocationPage.qml:291
101
#: ../app/ui/AddLocationPage.qml:306
149
102
msgid "Couldn't load weather data, please try later again!"
102
msgid "Couldn't load weather data, please try later again!"
150
103
msgstr ""
103
msgstr ""
151
104
104
153
105
#: ../app/ui/AddLocationPage.qml:301
105
#: ../app/ui/AddLocationPage.qml:316
154
106
msgid "Location already added."
106
msgid "Location already added."
155
107
msgstr ""
107
msgstr ""
156
108
108
158
109
#: ../app/ui/AddLocationPage.qml:304
109
#: ../app/ui/AddLocationPage.qml:319
159
110
msgid "OK"
110
msgid "OK"
160
111
msgstr ""
111
msgstr ""
161
112
112
163
113
#: ../app/ui/HomePage.qml:31 ../app/ui/LocationsPage.qml:30
113
#: ../app/ui/HomePage.qml:31 ../app/ui/LocationsPage.qml:31
164
114
msgid "Locations"
114
msgid "Locations"
165
115
msgstr ""
115
msgstr ""
166
116
116
168
117
#: ../app/ui/LocationsPage.qml:104
117
#: ../app/ui/LocationsPage.qml:106
169
118
msgid "Current Location"
118
msgid "Current Location"
170
119
msgstr ""
119
msgstr ""
171
120
120
172
121
121
173
=== modified file 'tests/autopilot/ubuntu_weather_app/__init__.py'
174
--- tests/autopilot/ubuntu_weather_app/__init__.py	2015-07-29 21:34:07 +0000
175
+++ tests/autopilot/ubuntu_weather_app/__init__.py	2015-08-06 00:13:15 +0000
176
@@ -10,7 +10,6 @@
177
10
import logging
10
import logging
178
11
from ubuntuuitoolkit import MainView, UbuntuUIToolkitCustomProxyObjectBase
11
from ubuntuuitoolkit import MainView, UbuntuUIToolkitCustomProxyObjectBase
179
12
12
180
13
181
14
logger = logging.getLogger(__name__)
13
logger = logging.getLogger(__name__)
182
15
14
183
16
15
184
@@ -51,18 +50,27 @@
185
51
50
186
52
class Page(UbuntuUIToolkitCustomProxyObjectBase):
51
class Page(UbuntuUIToolkitCustomProxyObjectBase):
187
53
    """Autopilot helper for Pages."""
52
    """Autopilot helper for Pages."""
190
54
    def __init__(self, *args):
53
    def __init__(self, *args, **kwargs):
191
55
        super(Page, self).__init__(*args)
54
        super(Page, self).__init__(*args, **kwargs)
192
55
193
56
        # Use only objectName due to bug 1350532 as it is MainView12
194
57
        self.main_view = self.get_root_instance().select_single(
195
58
            objectName="weather")
196
59
197
60
    def click_back(self):
198
61
        return self.main_view.get_header().click_back_button()
199
56
62
200
57
63
201
58
class PageWithBottomEdge(Page):
64
class PageWithBottomEdge(Page):
205
59
    """Autopilot helper for PageWithBottomEdge."""
65
    """
206
60
    def __init__(self, *args):
66
    An emulator class that makes it easy to interact with the bottom edge
207
61
        super(PageWithBottomEdge, self).__init__(*args)
67
    swipe page
208
68
    """
209
69
    def __init__(self, *args, **kwargs):
210
70
        super(PageWithBottomEdge, self).__init__(*args, **kwargs)
211
62
71
212
63
    def reveal_bottom_edge_page(self):
72
    def reveal_bottom_edge_page(self):
213
64
        """Bring the bottom edge page to the screen"""
73
        """Bring the bottom edge page to the screen"""
214
65
215
66
        self.bottomEdgePageLoaded.wait_for(True)
74
        self.bottomEdgePageLoaded.wait_for(True)
216
67
75
217
68
        try:
76
        try:
218
@@ -73,7 +81,6 @@
219
73
            start_y = (action_item.globalRect.y +
81
            start_y = (action_item.globalRect.y +
220
74
                       (action_item.height * 0.5))
82
                       (action_item.height * 0.5))
221
75
            stop_y = start_y - (self.height * 0.7)
83
            stop_y = start_y - (self.height * 0.7)
222
76
223
77
            self.pointing_device.drag(start_x, start_y,
84
            self.pointing_device.drag(start_x, start_y,
224
78
                                      start_x, stop_y, rate=2)
85
                                      start_x, stop_y, rate=2)
225
79
            self.isReady.wait_for(True)
86
            self.isReady.wait_for(True)
226
@@ -84,14 +91,36 @@
227
84
91
228
85
class AddLocationPage(Page):
92
class AddLocationPage(Page):
229
86
    """Autopilot helper for AddLocationPage."""
93
    """Autopilot helper for AddLocationPage."""
232
87
    def __init__(self, *args):
94
    def __init__(self, *args, **kwargs):
233
88
        super(AddLocationPage, self).__init__(*args)
95
        super(AddLocationPage, self).__init__(*args, **kwargs)
234
96
235
97
    @click_object
236
98
    def click_location(self, index):
237
99
        return self.select_single("UCListItem",
238
100
                                  objectName="addLocation" + str(index))
239
101
240
102
    def click_search_action(self):
241
103
        self.main_view.get_header().click_action_button("search")
242
104
243
105
    def get_search_field(self):
244
106
        header = self.main_view.get_header()
245
107
246
108
        return header.select_single("TextField", objectName="searchField")
247
109
248
110
    def search(self, value):
249
111
        self.click_search_action()
250
112
251
113
        search_field = self.get_search_field()
252
114
        search_field.write(value)
253
115
254
116
        # Wait for model to finish loading
255
117
        self.searching.wait_for(False)
256
89
118
257
90
119
258
91
class HomePage(PageWithBottomEdge):
120
class HomePage(PageWithBottomEdge):
259
92
    """Autopilot helper for HomePage."""
121
    """Autopilot helper for HomePage."""
262
93
    def __init__(self, *args):
122
    def __init__(self, *args, **kwargs):
263
94
        super(HomePage, self).__init__(*args)
123
        super(HomePage, self).__init__(*args, **kwargs)
264
95
124
265
96
    def get_location_count(self):
125
    def get_location_count(self):
266
97
        return self.wait_select_single(
126
        return self.wait_select_single(
267
@@ -103,6 +132,13 @@
268
103
    def __init__(self, *args, **kwargs):
132
    def __init__(self, *args, **kwargs):
269
104
        super(LocationsPage, self).__init__(*args, **kwargs)
133
        super(LocationsPage, self).__init__(*args, **kwargs)
270
105
134
271
135
    def click_add_location_action(self):
272
136
        self.main_view.get_header().click_action_button("addLocation")
273
137
274
138
    def get_location(self, index):
275
139
        return self.select_single(WeatherListItem,
276
140
                                  objectName="location" + str(index))
277
141
278
106
142
279
107
class MainView(MainView):
143
class MainView(MainView):
280
108
    """Autopilot custom proxy object for the MainView."""
144
    """Autopilot custom proxy object for the MainView."""
281
@@ -111,3 +147,8 @@
282
111
    def __init__(self, *args):
147
    def __init__(self, *args):
283
112
        super(MainView, self).__init__(*args)
148
        super(MainView, self).__init__(*args)
284
113
        self.visible.wait_for(True)
149
        self.visible.wait_for(True)
285
150
286
151
287
152
class WeatherListItem(UbuntuUIToolkitCustomProxyObjectBase):
288
153
    def get_name(self):
289
154
        return self.select_single("Label", objectName="name").text
290
114
155
291
=== added file 'tests/autopilot/ubuntu_weather_app/tests/test_add_location_page.py'
292
--- tests/autopilot/ubuntu_weather_app/tests/test_add_location_page.py	1970-01-01 00:00:00 +0000
293
+++ tests/autopilot/ubuntu_weather_app/tests/test_add_location_page.py	2015-08-06 00:13:15 +0000
294
@@ -0,0 +1,100 @@
295
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
296
2
# Copyright 2013, 2014, 2015 Canonical
297
3
#
298
4
# This program is free software: you can redistribute it and/or modify it
299
5
# under the terms of the GNU General Public License version 3, as published
300
6
# by the Free Software Foundation.
301
7
302
8
"""Ubuntu Weather app autopilot tests."""
303
9
304
10
from __future__ import absolute_import
305
11
306
12
import logging
307
13
from autopilot.matchers import Eventually
308
14
from testtools.matchers import Equals
309
15
310
16
311
17
from ubuntu_weather_app.tests import UbuntuWeatherAppTestCaseWithData
312
18
313
19
logger = logging.getLogger(__name__)
314
20
315
21
316
22
class TestAddLocationPage(UbuntuWeatherAppTestCaseWithData):
317
23
318
24
    """ Tests for the add locations page
319
25
        setUp jumps to add to locations page as all tests start from here """
320
26
321
27
    def setUp(self):
322
28
        super(TestAddLocationPage, self).setUp()
323
29
324
30
        # Get the start count of the homepage
325
31
        self.home_page = self.app.get_home_page()
326
32
        self.start_count = self.home_page.get_location_count()
327
33
328
34
        # Open the locations page from bottom edge
329
35
        self.home_page.reveal_bottom_edge_page()
330
36
331
37
        self.locations_page = self.app.get_locations_page()
332
38
        self.locations_page.visible.wait_for(True)
333
39
334
40
        # Select the add header action and get the add locations page
335
41
        self.locations_page.click_add_location_action()
336
42
337
43
        # Get the add locations page
338
44
        self.add_location_page = self.app.get_add_location_page()
339
45
        self.add_location_page.visible.wait_for(True)
340
46
341
47
    def test_add_location_via_cache(self):
342
48
        """ tests adding a location via cached location list """
343
49
344
50
        # Select the location
345
51
        self.add_location_page.click_location(0)
346
52
347
53
        # Check locations page is now visible
348
54
        self.assertThat(self.locations_page.visible, Eventually(Equals(True)))
349
55
350
56
        # Get the list item of the added location
351
57
        list_item = self.locations_page.get_location(self.start_count)
352
58
353
59
        # Check that the name is correct
354
60
        self.assertThat(list_item.get_name(), Equals("Amsterdam"))
355
61
356
62
        # Go back to the homepage
357
63
        self.locations_page.click_back()
358
64
359
65
        # Check homepage is now visible
360
66
        self.assertThat(self.home_page.visible, Eventually(Equals(True)))
361
67
362
68
        # Check that the location was added
363
69
        self.assertThat(self.home_page.get_location_count,
364
70
                        Eventually(Equals(self.start_count + 1)))
365
71
366
72
    def test_add_location_via_search(self):
367
73
        """ tests adding a location via searching for the location """
368
74
369
75
        location_name = "Paris"
370
76
371
77
        # Perform search
372
78
        self.add_location_page.search(location_name)
373
79
374
80
        # Select the location
375
81
        self.add_location_page.click_location(0)
376
82
377
83
        # Check locations page is now visible
378
84
        self.assertThat(self.locations_page.visible, Eventually(Equals(True)))
379
85
380
86
        # Get the list item of the added location
381
87
        list_item = self.locations_page.get_location(self.start_count)
382
88
383
89
        # Check that the name is correct
384
90
        self.assertThat(list_item.get_name(), Equals(location_name))
385
91
386
92
        # Go back to the homepage
387
93
        self.locations_page.click_back()
388
94
389
95
        # Check homepage is now visible
390
96
        self.assertThat(self.home_page.visible, Eventually(Equals(True)))
391
97
392
98
        # Check that the location was added
393
99
        self.assertThat(self.home_page.get_location_count,
394
100
                        Eventually(Equals(self.start_count + 1)))
395
0
101
396
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_empty_state.py'
397
--- tests/autopilot/ubuntu_weather_app/tests/test_empty_state.py	2015-07-29 21:34:07 +0000
398
+++ tests/autopilot/ubuntu_weather_app/tests/test_empty_state.py	2015-08-06 00:13:15 +0000
399
@@ -24,12 +24,16 @@
400
24
    def setUp(self):
24
    def setUp(self):
401
25
        super(TestEmptyState, self).setUp()
25
        super(TestEmptyState, self).setUp()
402
26
26
404
27
    def test_add_location_button(self):
27
    def test_add_locations_page_from_bottom_edge(self):
405
28
        """ tests that the add location page is shown after swiping up
28
        """ tests that the add location page is shown after swiping up
406
29
            the bottom edge"""
29
            the bottom edge"""
407
30
30
408
31
        home_page = self.app.get_home_page()
31
        home_page = self.app.get_home_page()
409
32
        home_page.visible.wait_for(True)
32
        home_page.visible.wait_for(True)
410
33
411
34
        # Check that there are no locations
412
35
        self.assertThat(home_page.get_location_count, Eventually(Equals(0)))
413
36
414
33
        home_page.reveal_bottom_edge_page()
37
        home_page.reveal_bottom_edge_page()
415
34
38
416
35
        locations_page = self.app.get_locations_page()
39
        locations_page = self.app.get_locations_page()
Reviewer	Review Type	Date Requested	Status
Victor Thompson		2015-07-27	Approve on 2015-08-06
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2015-08-06
Andrew Hayzen			Abstain on 2015-08-02
Review via email: mp+266051@code.launchpad.net