Merge lp:~rpadovani/ubuntu-weather-app/1201705 into lp:ubuntu-weather-app/obsolete.trunk

[Riccardo Padovani]

Added test to check if, when no result is found in search list, label error is shown

Added test to check if, when no result is found in search list, label error is shown

[Martin Borho (martin-borho)]

Fine and fast. Never heard of that city, too! ;)

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'components/AddLocationPage.qml'
--- components/AddLocationPage.qml	2013-07-13 13:34:34 +0000
+++ components/AddLocationPage.qml	2013-07-16 08:30:37 +0000
@@ -81,6 +81,7 @@
         color: "transparent"
         Label {
             id: noCityError
+            objectName: "noCityError"
             visible: false
             anchors.centerIn: parent;
             font.pixelSize: 18

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2013-07-03 19:41:03 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2013-07-16 08:30:37 +0000
@@ -103,6 +103,23 @@
         locationList = self.main_window.get_object('QQuickListView', 'LocationList')
         self.assertThat(locationList.visible, Eventually(Equals(True)))
 
+    def test_no_location_found(self):
+        """Tests if label with 'No city found' is shown """
+        self._open_add_location_page()
+
+        # insert city name to search for
+        searchField = self.main_window.get_object("TextField", "SearchField")
+        self.pointing_device.move_to_object(searchField)
+        self.pointing_device.click()
+        self.keyboard.type("UbuntuCity") # Unfortunately, no UbuntuCity in the world
+        self.assertThat(searchField.text, Eventually(Equals("UbuntuCity")))
+        self.keyboard.press_and_release('Enter')
+
+        # wait for result and look if label is shown
+        errorLabel = self.main_window.get_object('Label', 'noCityError')
+        self.assertThat(errorLabel.visible, Eventually(Equals(True), timeout=30))
+
+
 class TestLocationManagerWithLocation(WeatherTestCase, DatabaseMixin):
     def setUp(self):
         self.clean_db()