Merge lp:~vthompson/ubuntu-weather-app/display-temp-units into lp:ubuntu-weather-app/obsolete.trunk

[Victor Thompson]

Add unit of measure for main temperature value.

Weather app should include the unit of measurement for temperature values, per the design spec [1] and visual [2].

[1] http://design.canonical.com/2013/03/app-patterns-applied-weather-key-journeys/
[2] http://design.canonical.com/2013/05/35908/

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

FAILED: Continuous integration, rev:172
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/109/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/578
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/107
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/107
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/21

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/109/rebuild

review: Needs Fixing (continuous-integration)

[Martin Borho (martin-borho)]

Looks good to me, but I don't know why the test fails.

I can't get autopilot to work at the moment on saucy...

[Victor Thompson (vthompson)]

The tests fail on Saucy for me--almost all of them. However, the test that is failing above, ubuntu_weather_app.tests.test_locationmanager.TestLocationManager.test_del_add_bug, works fine for me on Trusty.

[Martin Borho (martin-borho)]

Tests all run fine in a trusty VM, so I'll approve it.

But I don't know how to get Jenkins picking it up again...

[Martin Borho (martin-borho)]

Looks good for me, thanks!

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-weather-app-autolanding/63/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/582
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-autolanding/63
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-autolanding/63
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-autolanding/13

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

I think the sheet used to add the location is still visible when the newly added city is verified. I updated the test to check against the objectName of the list of added locations.

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

FAILED: Continuous integration, rev:173
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/110/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/584
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/108
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/108
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/22

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/110/rebuild

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:174
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/111/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/585
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/109
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/109
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/23

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/111/rebuild

review: Approve (continuous-integration)

=== modified file 'components/CurrentWeather.qml'
--- components/CurrentWeather.qml	2013-09-29 14:26:37 +0000
+++ components/CurrentWeather.qml	2014-01-06 18:48:10 +0000
@@ -270,6 +270,7 @@
                         Components.WeatherTemperatureComponent {
                             id: currentConditionTempContent
                             currentTemp: currentWeather.currentTemp
+                            tempScale: currentWeather.tempScale
                             minTemp: currentWeather.minTemp
                             maxTemp: currentWeather.maxTemp
                             anchors.fill: parent

=== modified file 'components/WeatherTemperatureComponent.qml'
--- components/WeatherTemperatureComponent.qml	2013-09-28 10:33:59 +0000
+++ components/WeatherTemperatureComponent.qml	2014-01-06 18:48:10 +0000
@@ -24,6 +24,7 @@
     color: "transparent"
 
     property int currentTemp
+    property string tempScale
     property int maxTemp
     property int minTemp
 
@@ -51,11 +52,11 @@
     }
     Text {
         id: currentTempScale
-        text: String("°")
+        text: String("°") + tempComponent.tempScale
         style: Text.Raised
         font.bold: false
         font.family: "Ubuntu"
-        font.pointSize: FontUtils.sizeToPixels("x-large") //32
+        font.pointSize: FontUtils.sizeToPixels("medium")
         verticalAlignment: Text.AlignTop
         horizontalAlignment: Text.AlignLeft
         color: Theme.palette.normal.baseText

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2013-12-17 18:52:10 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2014-01-06 18:48:10 +0000
@@ -90,6 +90,7 @@
         firstResult = self.main_window.wait_select_single('Label', objectName='searchResult0')
         self.pointing_device.move_to_object(firstResult)
         self.pointing_device.click()
+        sleep(1)
 
         # LocationManagerPage should be visible and location added
         addedItem = self.main_window.wait_select_single('Label', text=location)