Merge lp:~ken-vandine/ubuntu-system-settings/rtm-lp1205294 into lp:ubuntu-system-settings/rtm-14.09

[Ken VanDine]

[about] properly display IMEI values for no devices ("None"), one device and multiple devices. Remove test now redundant.

[about] properly display IMEI values for no devices ("None"), one device and multiple devices. Remove test now redundant.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:965
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/32/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/10
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17159

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-rtm-14.09-ci/31/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Looks fine to me, thanks

review: Approve

=== modified file 'plugins/about/PageComponent.qml'
--- plugins/about/PageComponent.qml	2015-01-09 13:10:56 +0000
+++ plugins/about/PageComponent.qml	2015-01-16 15:29:27 +0000
@@ -33,6 +33,7 @@
 
     title: i18n.tr("About this phone")
     flickable: scrollWidget
+    property var modemsSorted: manager.modems.slice(0).sort()
 
     UbuntuStorageAboutPanel {
         id: backendInfos
@@ -52,7 +53,7 @@
             if (manager.modems.length === 1) {
                 phoneNumbers.setSource("PhoneNumber.qml", {path: manager.modems[0]})
             } else if (manager.modems.length > 1) {
-                phoneNumbers.setSource("PhoneNumbers.qml", {paths: manager.modems.slice(0).sort()})
+                phoneNumbers.setSource("PhoneNumbers.qml", {paths: modemsSorted})
             }
         }
     }
@@ -121,8 +122,23 @@
                 property string imeiNumber
                 imeiNumber: deviceInfos.imei(0)
                 text: "IMEI"
-                value: imeiNumber
-                visible: imeiNumber
+                value: modemsSorted.length ? (imeiNumber || i18n.tr("None")) :
+                    i18n.tr("None")
+                visible: modemsSorted.length <= 1
+            }
+
+            ListItem.MultiValue {
+                text: "IMEI"
+                objectName: "imeiItems"
+                values: {
+                    var imeis = [];
+                    modemsSorted.forEach(function (path, i) {
+                        var imei = deviceInfos.imei(i);
+                        imei ? imeis.push(imei) : imeis.push(i18n.tr("None"));
+                    });
+                    return imeis;
+                }
+                visible: modemsSorted.length > 1
             }
 
             ListItem.SingleValue {

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2015-01-13 19:46:25 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2015-01-16 15:29:27 +0000
@@ -407,7 +407,7 @@
     @classmethod
     def validate_dbus_object(cls, path, state):
         name = introspection.get_classname_from_path(path)
-        if name == b'ItemPage':
+        if name == b'PageComponent':
             if state['objectName'][1] == 'aboutPage':
                 return True
         return False

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_about.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_about.py	2015-01-12 16:22:55 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_about.py	2015-01-16 15:29:27 +0000
@@ -132,13 +132,6 @@
             displayed_imei = self.about_page.get_imei()
             self.assertThat(displayed_imei, Equals(device_imei))
 
-    def test_device_without_imei_must_not_display_it(self):
-        device_imei = self._get_imei_from_dbus()
-        if device_imei:
-            self.skipTest('The device has imei.')
-        else:
-            self.assertFalse(self.about_page.is_imei_visible())
-
     def test_phone_number(self):
         self.assertEqual(str(self.about_page.get_number('numberItem')),
                          '123456789')