1
=== modified file 'app/ui/LocationsPage.qml'
2
--- app/ui/LocationsPage.qml	2015-08-07 00:16:54 +0000
3
+++ app/ui/LocationsPage.qml	2015-08-17 18:47:09 +0000
4
@@ -162,7 +162,11 @@
5
162
            reorderable: true
162
            reorderable: true
6
163
163
7
164
            onItemClicked: {
164
            onItemClicked: {
9
165
                settings.current = index + 1;
165
                if (settings.addedCurrentLocation && settings.detectCurrentLocation) {
10
166
                    settings.current = index + 1;
11
167
                } else {
12
168
                    settings.current = index;
13
169
                }
14
166
170
15
167
                pageStack.pop()
171
                pageStack.pop()
16
168
            }
172
            }
17
169
173
18
=== modified file 'debian/changelog'
19
--- debian/changelog	2015-08-14 00:11:12 +0000
20
+++ debian/changelog	2015-08-17 18:47:09 +0000
21
@@ -18,6 +18,9 @@
22
18
  * Make the tests grab the top of the minimized tooltip to avoid resizing the
18
  * Make the tests grab the top of the minimized tooltip to avoid resizing the
23
19
    app
19
    app
24
20
  * Create autopilot test for no locations found from search (LP: #1452501)
20
  * Create autopilot test for no locations found from search (LP: #1452501)
25
21
  * Create autopilot test which changes the selected location (LP: #1452494)
26
22
  * When location detection is off, make sure the correct location can be
27
23
    selected (LP: #1482936)
28
21
24
29
22
  [ Andrew Hayzen ]
25
  [ Andrew Hayzen ]
30
23
  * Add mocked locations for autopilot and add a test using the data
26
  * Add mocked locations for autopilot and add a test using the data
31
24
27
32
=== modified file 'tests/autopilot/ubuntu_weather_app/__init__.py'
33
--- tests/autopilot/ubuntu_weather_app/__init__.py	2015-08-14 00:11:12 +0000
34
+++ tests/autopilot/ubuntu_weather_app/__init__.py	2015-08-17 18:47:09 +0000
35
@@ -131,9 +131,15 @@
36
131
    def __init__(self, *args, **kwargs):
131
    def __init__(self, *args, **kwargs):
37
132
        super(HomePage, self).__init__(*args, **kwargs)
132
        super(HomePage, self).__init__(*args, **kwargs)
38
133
133
39
134
    def get_location_pages(self):
40
135
        return self.wait_select_single(
41
136
            "QQuickListView", objectName="locationPages")
42
137
43
134
    def get_location_count(self):
138
    def get_location_count(self):
46
135
        return self.wait_select_single(
139
        return self.get_location_pages().count
47
136
            "QQuickListView", objectName="locationPages").count
140
48
141
    def get_selected_location_index(self):
49
142
        return self.get_location_pages().currentIndex
50
137
143
51
138
    def get_daydelegate(self, weekdaycolumn, day):
144
    def get_daydelegate(self, weekdaycolumn, day):
52
139
        weekdaycolumn = self.wait_select_single(
145
        weekdaycolumn = self.wait_select_single(
53
@@ -154,6 +160,10 @@
54
154
    def click_add_location_action(self):
160
    def click_add_location_action(self):
55
155
        self.main_view.get_header().click_action_button("addLocation")
161
        self.main_view.get_header().click_action_button("addLocation")
56
156
162
57
163
    @click_object
58
164
    def click_location(self, index):
59
165
        return self.get_location(index)
60
166
61
157
    def get_location(self, index):
167
    def get_location(self, index):
62
158
        return self.select_single(WeatherListItem,
168
        return self.select_single(WeatherListItem,
63
159
                                  objectName="location" + str(index))
169
                                  objectName="location" + str(index))
64
160
170
65
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_locations_page.py'
66
--- tests/autopilot/ubuntu_weather_app/tests/test_locations_page.py	2015-08-09 01:44:36 +0000
67
+++ tests/autopilot/ubuntu_weather_app/tests/test_locations_page.py	2015-08-17 18:47:09 +0000
68
@@ -65,3 +65,22 @@
69
65
65
70
66
        # Check homepage is now visible
66
        # Check homepage is now visible
71
67
        self.assertThat(self.home_page.visible, Eventually(Equals(True)))
67
        self.assertThat(self.home_page.visible, Eventually(Equals(True)))
72
68
73
69
    def test_changing_location(self):
74
70
        """ tests changing the selected location """
75
71
76
72
        # Get the current index for the selected location
77
73
        current_index = self.home_page.get_selected_location_index()
78
74
79
75
        # Set the index of the location to be selected
80
76
        new_index = current_index + 1
81
77
82
78
        # Select the list item of the second location
83
79
        self.locations_page.click_location(new_index)
84
80
85
81
        # Check that the selected location is now the intended location
86
82
        self.assertThat(self.home_page.get_selected_location_index(),
87
83
                        Eventually(Equals(new_index)))
88
84
89
85
        # Check homepage is now visible
90
86
        self.assertThat(self.home_page.visible, Eventually(Equals(True)))
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2015-08-17
Andrew Hayzen		2015-08-08	Approve on 2015-08-17
Review via email: mp+267446@code.launchpad.net
1	=== modified file 'app/ui/LocationsPage.qml'
2	--- app/ui/LocationsPage.qml 2015-08-07 00:16:54 +0000
3	+++ app/ui/LocationsPage.qml 2015-08-17 18:47:09 +0000
4	@@ -162,7 +162,11 @@
5	162	reorderable: true	162	reorderable: true
6	163		163
7	164	onItemClicked: {	164	onItemClicked: {
9	165	settings.current = index + 1;	165	if (settings.addedCurrentLocation && settings.detectCurrentLocation) {
10			166	settings.current = index + 1;
11			167	} else {
12			168	settings.current = index;
13			169	}
14	166		170
15	167	pageStack.pop()	171	pageStack.pop()
16	168	}	172	}
17	169		173
18	=== modified file 'debian/changelog'
19	--- debian/changelog 2015-08-14 00:11:12 +0000
20	+++ debian/changelog 2015-08-17 18:47:09 +0000
21	@@ -18,6 +18,9 @@
22	18	* Make the tests grab the top of the minimized tooltip to avoid resizing the	18	* Make the tests grab the top of the minimized tooltip to avoid resizing the
23	19	app	19	app
24	20	* Create autopilot test for no locations found from search (LP: #1452501)	20	* Create autopilot test for no locations found from search (LP: #1452501)
25			21	* Create autopilot test which changes the selected location (LP: #1452494)
26			22	* When location detection is off, make sure the correct location can be
27			23	selected (LP: #1482936)
28	21		24
29	22	[ Andrew Hayzen ]	25	[ Andrew Hayzen ]
30	23	* Add mocked locations for autopilot and add a test using the data	26	* Add mocked locations for autopilot and add a test using the data
31	24		27
32	=== modified file 'tests/autopilot/ubuntu_weather_app/__init__.py'
33	--- tests/autopilot/ubuntu_weather_app/__init__.py 2015-08-14 00:11:12 +0000
34	+++ tests/autopilot/ubuntu_weather_app/__init__.py 2015-08-17 18:47:09 +0000
35	@@ -131,9 +131,15 @@
36	131	def __init__(self, args, *kwargs):	131	def __init__(self, args, *kwargs):
37	132	super(HomePage, self).__init__(args, *kwargs)	132	super(HomePage, self).__init__(args, *kwargs)
38	133		133
39			134	def get_location_pages(self):
40			135	return self.wait_select_single(
41			136	"QQuickListView", objectName="locationPages")
42			137
43	134	def get_location_count(self):	138	def get_location_count(self):
46	135	return self.wait_select_single(	139	return self.get_location_pages().count
47	136	"QQuickListView", objectName="locationPages").count	140
48			141	def get_selected_location_index(self):
49			142	return self.get_location_pages().currentIndex
50	137		143
51	138	def get_daydelegate(self, weekdaycolumn, day):	144	def get_daydelegate(self, weekdaycolumn, day):
52	139	weekdaycolumn = self.wait_select_single(	145	weekdaycolumn = self.wait_select_single(
53	@@ -154,6 +160,10 @@
54	154	def click_add_location_action(self):	160	def click_add_location_action(self):
55	155	self.main_view.get_header().click_action_button("addLocation")	161	self.main_view.get_header().click_action_button("addLocation")
56	156		162
57			163	@click_object
58			164	def click_location(self, index):
59			165	return self.get_location(index)
60			166
61	157	def get_location(self, index):	167	def get_location(self, index):
62	158	return self.select_single(WeatherListItem,	168	return self.select_single(WeatherListItem,
63	159	objectName="location" + str(index))	169	objectName="location" + str(index))
64	160		170
65	=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_locations_page.py'
66	--- tests/autopilot/ubuntu_weather_app/tests/test_locations_page.py 2015-08-09 01:44:36 +0000
67	+++ tests/autopilot/ubuntu_weather_app/tests/test_locations_page.py 2015-08-17 18:47:09 +0000
68	@@ -65,3 +65,22 @@
69	65		65
70	66	# Check homepage is now visible	66	# Check homepage is now visible
71	67	self.assertThat(self.home_page.visible, Eventually(Equals(True)))	67	self.assertThat(self.home_page.visible, Eventually(Equals(True)))
72			68
73			69	def test_changing_location(self):
74			70	""" tests changing the selected location """
75			71
76			72	# Get the current index for the selected location
77			73	current_index = self.home_page.get_selected_location_index()
78			74
79			75	# Set the index of the location to be selected
80			76	new_index = current_index + 1
81			77
82			78	# Select the list item of the second location
83			79	self.locations_page.click_location(new_index)
84			80
85			81	# Check that the selected location is now the intended location
86			82	self.assertThat(self.home_page.get_selected_location_index(),
87			83	Eventually(Equals(new_index)))
88			84
89			85	# Check homepage is now visible
90			86	self.assertThat(self.home_page.visible, Eventually(Equals(True)))