Merge lp:~mterry/unity8/notify-authenticated into lp:unity8

[Michael Terry]

Always keep indicator/launcher locked state in sync with whether the user is authenticated. (LP:# 1357230)

Always keep indicator/launcher locked state in sync with whether the user is authenticated. (LP:# 1357230)

One of the properties used to determine whether the shell is locked was not notifiable for qml. This branch fixes that.

== Checklist ==

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 - No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
 - Yes

 * Did you make sure that your branch does not contain spurious tags?
 - Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 - NA

 * If you changed the UI, has there been a design review?
 - NA

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1162
http://jenkins.qa.ubuntu.com/job/unity8-ci/3942/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3625
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/943/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1036
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1036
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1036/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1036
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3515
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4872
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4872/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11585

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3942/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1162
http://jenkins.qa.ubuntu.com/job/unity8-ci/3953/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3643/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/954
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1047
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1047
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1047/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1047
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3532/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4890
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4890/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11606

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3953/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1162
http://jenkins.qa.ubuntu.com/job/unity8-ci/3988/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3682
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/989
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1082
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1082
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1082/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1082
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3565
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4929
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4929/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11640

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3988/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Test and fixes the issue.

Do you think an auto test for this makes sense?

review: Needs Information

[Michael Terry (mterry)]

> Do you think an auto test for this makes sense?

I didn't think so, because it felt like testing too small a piece. Like, we don't generally have tests to make sure a NOTIFY call works for other properties.

That said, I'd be happy to add one.

[Albert Astals Cid (aacid)]

Sure, i didn't mean testing the signal works, that we know, i mean something like testing that the swiping of the greeter works.

[Michael Terry (mterry)]

There is a test added in https://code.launchpad.net/~mterry/unity8/interactive-while-locked/+merge/231253 for checking whether the indicators and/or launcher are enabled by default and respond to changes.

[lp:~mterry/unity8/notify-authenticated]

1163. By Michael Terry on 2014-08-21

Merge from trunk

1164. By Michael Terry on 2014-08-21

Add a small test to confirm that unlocked properties are correct

[Michael Terry (mterry)]

OK, added a test to check the unlocked property and whether the edges are enabled as they should be.

[Albert Astals Cid (aacid)]

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass? If not, please explain why.
Yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1164
http://jenkins.qa.ubuntu.com/job/unity8-ci/4053/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3904
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1054
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3760
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5151
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5151/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11903

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4053/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/notify-authenticated]

1165. By Michael Terry on 2014-08-21

Merge from sim-unlock-on-boot

1166. By Michael Terry on 2014-08-21

Re-merge from sim-unlock-on-boot with its lifecycle merge

Unmerged revisions

1166. By Michael Terry on 2014-08-21

Re-merge from sim-unlock-on-boot with its lifecycle merge

=== modified file 'plugins/LightDM/Greeter.cpp'
--- plugins/LightDM/Greeter.cpp	2014-08-01 13:42:18 +0000
+++ plugins/LightDM/Greeter.cpp	2014-08-21 14:47:14 +0000
@@ -106,6 +106,7 @@
     }
 
     d->m_greeter->authenticate(username);
+    Q_EMIT isAuthenticatedChanged();
     Q_EMIT authenticationUserChanged(username);
 }
 
@@ -150,5 +151,6 @@
         Q_EMIT promptlessChanged();
     }
 
+    Q_EMIT isAuthenticatedChanged();
     Q_EMIT authenticationComplete();
 }

=== modified file 'plugins/LightDM/Greeter.h'
--- plugins/LightDM/Greeter.h	2014-08-01 13:42:18 +0000
+++ plugins/LightDM/Greeter.h	2014-08-21 14:47:14 +0000
@@ -35,7 +35,7 @@
     Q_OBJECT
 
     Q_PROPERTY(bool active READ isActive WRITE setIsActive NOTIFY isActiveChanged)
-    Q_PROPERTY(bool authenticated READ isAuthenticated)
+    Q_PROPERTY(bool authenticated READ isAuthenticated NOTIFY isAuthenticatedChanged)
     Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)
     Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)
 
@@ -59,6 +59,7 @@
     void authenticationComplete();
     void authenticationUserChanged(const QString &user);
     void isActiveChanged();
+    void isAuthenticatedChanged();
     void promptlessChanged();
     void showGreeter();
 

=== modified file 'plugins/Ubuntu/CMakeLists.txt'
--- plugins/Ubuntu/CMakeLists.txt	2014-07-30 11:08:29 +0000
+++ plugins/Ubuntu/CMakeLists.txt	2014-08-21 14:47:14 +0000
@@ -1,3 +1,4 @@
+add_subdirectory(Connectivity)
 add_subdirectory(Gestures)
 add_subdirectory(DownloadDaemonListener)
 add_subdirectory(Payments)

=== added directory 'plugins/Ubuntu/Connectivity'
=== added file 'plugins/Ubuntu/Connectivity/CMakeLists.txt'
--- plugins/Ubuntu/Connectivity/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Connectivity/CMakeLists.txt	2014-08-21 14:47:14 +0000
@@ -0,0 +1,10 @@
+set(CONNECTIVITY_SOURCES
+    plugin.cpp
+    Connectivity.cpp
+)
+
+add_library(Connectivity MODULE ${CONNECTIVITY_SOURCES})
+
+qt5_use_modules(Connectivity Qml DBus Core)
+
+add_unity8_plugin(Ubuntu.Connectivity 0.1 Ubuntu/Connectivity TARGETS Connectivity)

=== added file 'plugins/Ubuntu/Connectivity/Connectivity.cpp'
--- plugins/Ubuntu/Connectivity/Connectivity.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Connectivity/Connectivity.cpp	2014-08-21 14:47:14 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "Connectivity.h"
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusPendingCall>
+
+Connectivity::Connectivity(QObject *parent)
+    : QObject(parent)
+{
+}
+
+void Connectivity::unlockAllModems()
+{
+    QDBusInterface iface("com.ubuntu.connectivity1",
+                         "/com/ubuntu/connectivity1/Private",
+                         "com.ubuntu.connectivity1.Private");
+    iface.asyncCall("UnlockAllModems");
+}

=== added file 'plugins/Ubuntu/Connectivity/Connectivity.h'
--- plugins/Ubuntu/Connectivity/Connectivity.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Connectivity/Connectivity.h	2014-08-21 14:47:14 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CONNECTIVITY_H
+#define CONNECTIVITY_H
+
+#include <QObject>
+
+class Connectivity : public QObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(Connectivity)
+
+public:
+    explicit Connectivity(QObject *parent = 0);
+
+    Q_INVOKABLE void unlockAllModems();
+};
+
+#endif // CONNECTIVITY_H

=== added file 'plugins/Ubuntu/Connectivity/Connectivity.qmltypes'
--- plugins/Ubuntu/Connectivity/Connectivity.qmltypes	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Connectivity/Connectivity.qmltypes	2014-08-21 14:47:14 +0000
@@ -0,0 +1,17 @@
+import QtQuick.tooling 1.1
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -notrelocatable Ubuntu.Connectivity 0.1 plugins'
+
+Module {
+    Component {
+        name: "Connectivity"
+        prototype: "QObject"
+        exports: ["Ubuntu.Connectivity/Connectivity 0.1"]
+        exportMetaObjectRevisions: [0]
+        Method { name: "unlockAllModems" }
+    }
+}

=== added file 'plugins/Ubuntu/Connectivity/plugin.cpp'
--- plugins/Ubuntu/Connectivity/plugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Connectivity/plugin.cpp	2014-08-21 14:47:14 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "plugin.h"
+#include "Connectivity.h"
+
+#include <QtQml>
+
+static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new Connectivity();
+}
+
+void BackendPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Ubuntu.Connectivity"));
+
+    qmlRegisterSingletonType<Connectivity>(uri, 0, 1, "Connectivity", service_provider);
+}

=== added file 'plugins/Ubuntu/Connectivity/plugin.h'
--- plugins/Ubuntu/Connectivity/plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Connectivity/plugin.h	2014-08-21 14:47:14 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CONNECTIVITY_PLUGIN_H
+#define CONNECTIVITY_PLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+class BackendPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif // CONNECTIVITY_PLUGIN_H

=== added file 'plugins/Ubuntu/Connectivity/qmldir'
--- plugins/Ubuntu/Connectivity/qmldir	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Connectivity/qmldir	2014-08-21 14:47:14 +0000
@@ -0,0 +1,3 @@
+module Ubuntu.Connectivity
+plugin Connectivity
+typeinfo Connectivity.qmltypes

=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
--- qml/Notifications/NotificationMenuItemFactory.qml	2014-08-14 01:28:23 +0000
+++ qml/Notifications/NotificationMenuItemFactory.qml	2014-08-21 14:47:14 +0000
@@ -127,6 +127,11 @@
             onCancel: {
                 menuModel.activate(menuIndex, false);
             }
+
+            onEmergencyCall: {
+                shell.activateApplication("dialer-app")
+                menuModel.activate(menuIndex, false)
+            }
         }
     }
 }

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-08-20 09:19:32 +0000
+++ qml/Shell.qml	2014-08-21 14:47:14 +0000
@@ -20,6 +20,7 @@
 import Unity.Application 0.1
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 1.0
+import Ubuntu.Connectivity 0.1
 import Ubuntu.Gestures 0.1
 import Ubuntu.SystemImage 0.1
 import Unity.Launcher 0.1
@@ -416,6 +417,10 @@
                 }
             }
 
+            Component.onCompleted: {
+                Connectivity.unlockAllModems()
+            }
+
             onUnlocked: greeter.hide()
             onSelected: {
                 // Update launcher items for new user

=== modified file 'tests/mocks/Ubuntu/CMakeLists.txt'
--- tests/mocks/Ubuntu/CMakeLists.txt	2014-07-30 11:08:29 +0000
+++ tests/mocks/Ubuntu/CMakeLists.txt	2014-08-21 14:47:14 +0000
@@ -1,3 +1,4 @@
+add_subdirectory(Connectivity)
 add_subdirectory(DownloadDaemonListener)
 add_subdirectory(Payments)
 add_subdirectory(SystemImage)

=== added directory 'tests/mocks/Ubuntu/Connectivity'
=== added file 'tests/mocks/Ubuntu/Connectivity/CMakeLists.txt'
--- tests/mocks/Ubuntu/Connectivity/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/Connectivity/CMakeLists.txt	2014-08-21 14:47:14 +0000
@@ -0,0 +1,10 @@
+set(MOCK_CONNECTIVITY_SOURCES
+    plugin.cpp
+    MockConnectivity.cpp
+)
+
+add_library(MockConnectivity MODULE ${MOCK_CONNECTIVITY_SOURCES})
+
+qt5_use_modules(MockConnectivity Qml Quick Core)
+
+add_unity8_mock(Ubuntu.Connectivity 0.1 Ubuntu/Connectivity TARGETS MockConnectivity)

=== added file 'tests/mocks/Ubuntu/Connectivity/Connectivity.qmltypes'
--- tests/mocks/Ubuntu/Connectivity/Connectivity.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/Connectivity/Connectivity.qmltypes	2014-08-21 14:47:14 +0000
@@ -0,0 +1,18 @@
+import QtQuick.tooling 1.1
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -notrelocatable Ubuntu.Connectivity 0.1 plugins'
+
+Module {
+    Component {
+        name: "MockConnectivity"
+        prototype: "QObject"
+        exports: ["Ubuntu.Connectivity/Connectivity 0.1"]
+        exportMetaObjectRevisions: [0]
+        Signal { name: "unlockingAllModems" }
+        Method { name: "unlockAllModems" }
+    }
+}

=== added file 'tests/mocks/Ubuntu/Connectivity/MockConnectivity.cpp'
--- tests/mocks/Ubuntu/Connectivity/MockConnectivity.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/Connectivity/MockConnectivity.cpp	2014-08-21 14:47:14 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MockConnectivity.h"
+
+MockConnectivity::MockConnectivity(QObject *parent)
+    : QObject(parent)
+{
+}
+
+void MockConnectivity::unlockAllModems()
+{
+    Q_EMIT unlockingAllModems();
+}

=== added file 'tests/mocks/Ubuntu/Connectivity/MockConnectivity.h'
--- tests/mocks/Ubuntu/Connectivity/MockConnectivity.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/Connectivity/MockConnectivity.h	2014-08-21 14:47:14 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCK_CONNECTIVITY_H
+#define MOCK_CONNECTIVITY_H
+
+#include <QObject>
+
+class MockConnectivity : public QObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(MockConnectivity)
+
+public:
+    explicit MockConnectivity(QObject *parent = 0);
+
+    Q_INVOKABLE void unlockAllModems();
+
+Q_SIGNALS:
+    void unlockingAllModems(); // only for mock
+};
+
+#endif // MOCK_CONNECTIVITY_H

=== added file 'tests/mocks/Ubuntu/Connectivity/plugin.cpp'
--- tests/mocks/Ubuntu/Connectivity/plugin.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/Connectivity/plugin.cpp	2014-08-21 14:47:14 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "plugin.h"
+#include "MockConnectivity.h"
+
+#include <QtQml>
+
+static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new MockConnectivity();
+}
+
+void BackendPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Ubuntu.Connectivity"));
+
+    qmlRegisterSingletonType<MockConnectivity>(uri, 0, 1, "Connectivity", service_provider);
+}

=== added file 'tests/mocks/Ubuntu/Connectivity/plugin.h'
--- tests/mocks/Ubuntu/Connectivity/plugin.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/Connectivity/plugin.h	2014-08-21 14:47:14 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCK_CONNECTIVITY_PLUGIN_H
+#define MOCK_CONNECTIVITY_PLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+class BackendPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif // MOCK_CONNECTIVITY_PLUGIN_H

=== added file 'tests/mocks/Ubuntu/Connectivity/qmldir'
--- tests/mocks/Ubuntu/Connectivity/qmldir	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/Connectivity/qmldir	2014-08-21 14:47:14 +0000
@@ -0,0 +1,3 @@
+module Ubuntu.Connectivity
+plugin MockConnectivity
+typeinfo Connectivity.qmltypes

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2014-07-29 11:35:10 +0000
+++ tests/qmltests/tst_Shell.qml	2014-08-21 14:47:14 +0000
@@ -21,6 +21,7 @@
 import QtTest 1.0
 import GSettings 1.0
 import LightDM 0.1 as LightDM
+import Ubuntu.Connectivity 0.1
 import Unity.Application 0.1
 import Unity.Test 0.1 as UT
 import Powerd 0.1
@@ -28,6 +29,7 @@
 import "../../qml"
 
 Item {
+    id: root
     width: shell.width
     height: shell.height
 
@@ -51,6 +53,11 @@
         id: shell
     }
 
+    Component {
+        id: shellComponent
+        Shell {}
+    }
+
     SignalSpy {
         id: sessionSpy
         signalName: "sessionStarted"
@@ -61,6 +68,12 @@
         signalName: "setCurrentScopeCalled"
     }
 
+    SignalSpy {
+        id: unlockAllModemsSpy
+        target: Connectivity
+        signalName: "unlockingAllModems"
+    }
+
     UT.UnityTestCase {
         name: "Shell"
         when: windowShown
@@ -431,5 +444,24 @@
 
             touchRelease(shell);
         }
+
+        function test_unlockedProperties() {
+            // Confirm that various properties have the correct values when unlocked
+            tryCompare(shell, "locked", false)
+
+            var launcher = findChild(shell, "launcher")
+            tryCompare(launcher, "available", true)
+
+            var indicators = findChild(shell, "indicators")
+            tryCompare(indicators, "available", true)
+        }
+
+        function test_unlockAllModemsOnBoot() {
+            unlockAllModemsSpy.clear()
+            // actually create an object so we notice the onCompleted signal
+            var greeter = shellComponent.createObject(root)
+            tryCompare(unlockAllModemsSpy, "count", 1)
+            greeter.destroy()
+        }
     }
 }