Merge lp:~elopio/ubuntu-weather-app/fix1248648-options_object_names into lp:ubuntu-weather-app/obsolete.trunk

[Leo Arias]

Set the objectNames for the settings options.

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

PASSED: Continuous integration, rev:156
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/92/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/89
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/90
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/90
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/4

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Thanks Le. We'll do the conversion to wait_select_single separately.

[Chris Gagnon (chris.gagnon)]

review: Approve

[Martin Borho (martin-borho)]

Looks good!

review: Approve

=== modified file 'components/SettingsSheet.qml'
--- components/SettingsSheet.qml	2013-09-29 14:26:37 +0000
+++ components/SettingsSheet.qml	2013-11-06 19:41:29 +0000
@@ -30,25 +30,57 @@
         container: Column {
             anchors.left: parent.left
             anchors.right: parent.right
+
+            Component {
+                id: unitsSelectorDelegate
+                OptionSelectorDelegate { 
+                    text: i18n.tr(label)
+                    objectName: name 
+                }
+            }
+
+            ListModel {
+                id: temperatureUnitsSelectorModel
+                ListElement { name: "celsiusOption"; label: "Celsius";  }
+                ListElement { name: "fahrenheitOption"; label: "Fahrenheit";  }
+            }
+
             OptionSelector {
-                id: unitsSelector
-                objectName: "UnitsSelector"
+                id: temperatureUnitsSelector
+                objectName: "TemperatureUnitsSelector"
                 text: i18n.tr("Temperature units")
-                model: [i18n.tr("Celsius"), i18n.tr("Fahrenheit")]
+                delegate: unitsSelectorDelegate
+                model: temperatureUnitsSelectorModel
                 selectedIndex: (settings["units"] === "imperial") ? 1 : 0;
             }
+
+            ListModel {
+                id: windUnitsSelectorModel
+                ListElement { name: "kmhOption"; label: "Kilometers per hour" }
+                ListElement { name: "mphOption"; label: "Miles per hour" }
+            }
+
             OptionSelector {
                 id: windUnitsSelector
                 objectName: "WindUnitsSelector"
                 text: i18n.tr("Wind speed units")
-                model: [i18n.tr("Kilometers per hour"), i18n.tr("Miles per hour")]
+                delegate: unitsSelectorDelegate
+                model: windUnitsSelectorModel
                 selectedIndex: (settings["wind_units"] === "mph") ? 1 : 0;
             }
+
+            ListModel {
+                id: precipitationUnitsSelectorModel
+                ListElement { name: "millimetersOption"; label: "Millimeters" }
+                ListElement { name: "inchesOption"; label: "Inches" }
+            }
+
             OptionSelector {
                 id: precipitationUnitsSelector
                 objectName: "PrecipitationUnitsSelector"
                 text: i18n.tr("Precipitation units")
-                model: [i18n.tr("Millimeters"), i18n.tr("Inches")]
+                delegate: unitsSelectorDelegate
+                model: precipitationUnitsSelectorModel
                 selectedIndex: (settings["precip_units"] === "in") ? 1 : 0;
             }
         }
@@ -59,7 +91,7 @@
 
         onConfirmClicked: {
             var refresh = false,
-                selectedUnit = (unitsSelector.selectedIndex === 0) ? "metric" : "imperial",
+                selectedUnit = (temperatureUnitsSelector.selectedIndex === 0) ? "metric" : "imperial",
                 selectedWindUnit = (windUnitsSelector.selectedIndex === 0) ? "kmh" : "mph",
                 selectedPrecipUnit = (precipitationUnitsSelector.selectedIndex === 0) ? "mm" : "in";
             // check if temperaure scale was changed

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_settings.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2013-11-05 23:27:52 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2013-11-06 19:41:29 +0000
@@ -102,8 +102,8 @@
         self._open_settings_sheet()
 
         # open the value selector
-        self.assertThat(lambda: self.main_window.select_single('OptionSelector', objectName='UnitsSelector'), Eventually(Not(Is(None))))
-        units_selector = self.main_window.select_single('OptionSelector', objectName="UnitsSelector")
+        self.assertThat(lambda: self.main_window.select_single('OptionSelector', objectName='TemperatureUnitsSelector'), Eventually(Not(Is(None))))
+        units_selector = self.main_window.select_single('OptionSelector', objectName="TemperatureUnitsSelector")
         self.assertThat(units_selector.selectedIndex, Eventually(Equals(0)))
         self.assertThat(lambda: units_selector.select_many('ShapeItem')[1], Eventually(Not(Is(None))))
         current_option = units_selector.select_many('ShapeItem')[1]
@@ -124,8 +124,8 @@
 
         # switch back to metric values again
         self._open_settings_sheet()
-        self.assertThat(lambda: self.main_window.select_single('OptionSelector', objectName='UnitsSelector'), Eventually(Not(Is(None))))
-        units_selector = self.main_window.select_single('OptionSelector', objectName="UnitsSelector")
+        self.assertThat(lambda: self.main_window.select_single('OptionSelector', objectName='TemperatureUnitsSelector'), Eventually(Not(Is(None))))
+        units_selector = self.main_window.select_single('OptionSelector', objectName="TemperatureUnitsSelector")
         self.assertThat(units_selector.selectedIndex, Eventually(Equals(1)))
         self.assertThat(lambda: units_selector.select_many('ShapeItem')[2], Eventually(Not(Is(None))))
         current_option = units_selector.select_many('ShapeItem')[2]
@@ -136,7 +136,8 @@
         # click celsius option
         self._move_pointer_around()
         self.assertThat(lambda: units_selector.select_many('ShapeItem')[1], Eventually(Not(Is(None))))
-        metric_option = units_selector.select_single('Label', text='Celsius')
+        metric_option = units_selector.select_single(
+            'OptionSelectorDelegate', objectName='celsiusOption')
         self.pointing_device.click_object(metric_option)
 
         # confirm
@@ -156,8 +157,8 @@
         self._open_settings_sheet()
 
         # open the temp value selector
-        self.assertThat(lambda: self.main_window.select_single('OptionSelector', objectName='UnitsSelector'), Eventually(Not(Is(None))))
-        units_selector = self.main_window.select_single('OptionSelector', objectName="UnitsSelector")
+        self.assertThat(lambda: self.main_window.select_single('OptionSelector', objectName='TemperatureUnitsSelector'), Eventually(Not(Is(None))))
+        units_selector = self.main_window.select_single('OptionSelector', objectName="TemperatureUnitsSelector")
         self.assertThat(units_selector.selectedIndex, Eventually(Equals(0)))
         self.assertThat(lambda: units_selector.select_many('ShapeItem')[1], Eventually(Not(Is(None))))
         current_option = units_selector.select_many('ShapeItem')[1]
@@ -230,7 +231,7 @@
         self._move_pointer_around()
         self.assertThat(lambda: units_selector.select_many('ShapeItem')[1], Eventually(Not(Is(None))))
         kmh_option = units_selector.select_single(
-            'Label', text='Kilometers per hour')
+            'OptionSelectorDelegate', objectName='kmhOption')
         self.pointing_device.click_object(kmh_option)
 
         # confirm
@@ -285,7 +286,8 @@
         self.assertThat(lambda: units_selector.select_many('ShapeItem')[1], Eventually(Not(Is(None))))
         # XXX select the option by it's object name or index, using the
         # emulator from the ubuntu-ui-toolkit.
-        mm_option = units_selector.select_single('Label', text='Millimeters')
+        mm_option = units_selector.select_single(
+            'OptionSelectorDelegate', objectName='millimetersOption')
         self.pointing_device.click_object(mm_option)
 
         # confirm