Merge lp:~jonas-drange/ubuntu-system-settings/fix-broken-global into lp:ubuntu-system-settings

[Jonas G. Drange]

fix cases where check label is really long (via translations)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1698
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/125/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1284/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1284
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1150
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1150
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1150
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1133/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1133/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1133
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1133/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1133
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1133/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1133
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1133/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1133
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1133/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1133
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1133/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1133
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1133/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1133
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1133/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/125/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

[Jonas G. Drange (jonas-drange)]

Test failure here was click client, which is being addressed in lp:~jonas-drange/ubuntu-system-settings/harden-clickclient-test

=== modified file 'plugins/system-update/Global.qml'
--- plugins/system-update/Global.qml	2016-08-11 13:05:45 +0000
+++ plugins/system-update/Global.qml	2016-08-24 09:56:06 +0000
@@ -78,6 +78,9 @@
         }
 
         Label {
+            objectName: "checkLabel"
+            Layout.fillWidth: true
+            elide: Text.ElideRight
             text: i18n.tr("Checking for updates…")
         }
 
 
=== modified file 'tests/plugins/system-update/tst_systemupdate_global.qml'
--- tests/plugins/system-update/tst_systemupdate_global.qml	2016-08-11 13:05:45 +0000
+++ tests/plugins/system-update/tst_systemupdate_global.qml	2016-08-24 09:56:06 +0000
@@ -293,5 +293,16 @@
             if (data.batchMode) instance.batchMode = data.batchMode
             compare(instance.hidden, data.hidden, "had wrong visibility");
         }
+
+        function test_longCheckLabel() {
+            // Prerequisites for the global area to be visible.
+            instance.status = true;
+            instance.online = true;
+            instance.updatesCount = true;
+
+            var checkLabel = findChild(instance, "checkLabel");
+            checkLabel.text = "Really really really really really long translated string";
+            verify(checkLabel.width < checkLabel.implicitWidth, "global area was too wide");
+        }
     }
 }