Merge lp:~jonas-drange/ubuntu-system-settings/fix-ap-tests into lp:ubuntu-system-settings

[Jonas G. Drange]

tests

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1598
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2623/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6645
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/397
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/806
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5046
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6656
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6656/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27910

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:1598
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/7/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/594/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/594/console

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

1598. By Jonas G. Drange on 2016-02-25

use wifienabledswitch now that it works as it should

=== modified file 'plugins/hotspot/PageComponent.qml'
--- plugins/hotspot/PageComponent.qml	2015-09-18 14:18:11 +0000
+++ plugins/hotspot/PageComponent.qml	2016-02-25 16:16:01 +0000
@@ -32,20 +32,6 @@
     title: i18n.tr("Hotspot")
 
     states: [
-        State {
-            name: "disabled"
-            // Undefined WifiEnabled means Connectivity is unavailable.
-            when: typeof Connectivity.wifiEnabled === "undefined" ||
-                  Connectivity.FlightMode
-            PropertyChanges {
-                target: hotspotItem
-                enabled: false
-            }
-            PropertyChanges {
-                target: hotspotSetupButton
-                enabled: false
-            }
-        },
         State {
             name: "nowifi"
             when: Connectivity.wifiEnabled === false
@@ -80,7 +66,8 @@
             ListItem.Standard {
                 id: hotspotItem
                 text: i18n.tr("Hotspot")
-                enabled: Connectivity.hotspotStored
+                enabled: (Connectivity.hotspotStored
+                          && Connectivity.hotspotSwitchEnabled)
                 onClicked: hotspotSwitch.trigger()
                 control: Switch {
                     id: hotspotSwitch
@@ -118,6 +105,7 @@
                 width: parent.width - units.gu(4)
                 text: Connectivity.hotspotStored ?
                     i18n.tr("Change Password/Setup…") : i18n.tr("Set Up Hotspot…")
+                enabled: Connectivity.hotspotSwitchEnabled
                 onClicked: {
                     setup.setSource(Qt.resolvedUrl("HotspotSetup.qml"));
                     PopupUtils.open(setup.item, root, {});