Merge lp:~elopio/ubuntu-clock-app/city-objectName into lp:ubuntu-clock-app/saucy

[Leo Arias]

Add an objectName to the city labels.

[Nekhelesh Ramananthan (nik90)]

works as expected.Thanks for the test improvement.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

[Leo Arias (elopio)]

thanks to you for the review.

=== modified file 'clock/ClockPage.qml'
--- clock/ClockPage.qml	2013-10-21 17:05:09 +0000
+++ clock/ClockPage.qml	2013-10-25 04:34:53 +0000
@@ -215,6 +215,7 @@
                 delegate: ListItem.Standard {
                     Label {
                         text: cityName
+                        objectName: "city_name"
                         anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: units.gu(3) }
                         color: Theme.palette.normal.baseText
                         fontSize: "large"

=== modified file 'clock/WorldClock.qml'
--- clock/WorldClock.qml	2013-10-21 18:33:21 +0000
+++ clock/WorldClock.qml	2013-10-25 04:34:53 +0000
@@ -132,6 +132,7 @@
                     anchors { top: parent.top; topMargin: units.gu(0.5); left: parent.left; leftMargin: units.gu(3) }
                     Label {
                         id: cityDelegate
+                        objectName: "city_name"
                         text: city
                         color: Theme.palette.normal.baseText
                         fontSize: "large"

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_clock.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2013-10-17 00:59:35 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2013-10-25 04:34:53 +0000
@@ -60,11 +60,11 @@
         self.assert_no_cities_selected()
         self.main_view.open_toolbar()
         self.switch_to_world_cities_page()
-
         city = self.grab_first_city()
         city_name = self.city_name_from(city)
 
         self.select_city(city)
+
         selected_city_name = self.city_name_from(self.selected_city())
         self.assertThat(selected_city_name, Eventually(Equals(city_name)))
 
@@ -73,7 +73,7 @@
         self.assert_no_cities_selected()
 
     def city_name_from(self, city):
-        return city.select_many("Label")[0].text
+        return city.select_single('Label', objectName='city_name').text
 
     def enable_delete_button(self):
         selected_city = self.selected_city()