Merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1441873 into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Return the error name to the client

Return the error name to the client

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:268
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/212/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2739
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2364
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2737
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2737/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20409

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

review: Approve (continuous-integration)

[lp:~mardy/ubuntu-system-settings-online-accounts/lp1441873]

269. By Alberto Mardegan on 2015-06-18

Connect to the signals when we actually have a request

270. By Alberto Mardegan on 2015-06-18

Check for null

=== modified file 'client/OnlineAccountsClient/setup.cpp'
--- client/OnlineAccountsClient/setup.cpp	2014-09-15 12:16:50 +0000
+++ client/OnlineAccountsClient/setup.cpp	2015-06-18 14:06:12 +0000
@@ -134,6 +134,7 @@
     QDBusPendingReply<QVariantMap> reply = *watcher;
     if (reply.isError()) {
         qWarning() << "RequestAccess failed:" << reply.error();
+        response.insert("errorName", reply.error().name());
     } else {
         // At the moment, we don't have any use for the reply.
         response = reply.value();

=== modified file 'plugins/module/WebView.qml'
--- plugins/module/WebView.qml	2014-09-30 11:20:11 +0000
+++ plugins/module/WebView.qml	2015-06-18 14:06:12 +0000
@@ -7,7 +7,7 @@
 
     property QtObject signonRequest
 
-    Component.onCompleted: {
+    onSignonRequestChanged: if (signonRequest) {
         signonRequest.authenticated.connect(onAuthenticated)
         url = signonRequest.startUrl
     }

=== modified file 'tests/client/tst_client.cpp'
--- tests/client/tst_client.cpp	2014-09-15 12:16:50 +0000
+++ tests/client/tst_client.cpp	2015-06-18 14:06:12 +0000
@@ -24,6 +24,7 @@
 
 #include <OnlineAccountsClient/Setup>
 #include <QDBusConnection>
+#include <QDBusContext>
 #include <QDebug>
 #include <QFile>
 #include <QProcessEnvironment>
@@ -32,7 +33,7 @@
 
 using namespace OnlineAccountsClient;
 
-class Service: public QObject
+class Service: public QObject, QDBusContext
 {
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface",
@@ -42,14 +43,21 @@
     Service(): QObject() {}
     QVariantMap options() const { return m_options; }
 
+    void setError(const QString &name) { m_errorName = name; }
+
 public Q_SLOTS:
     QVariantMap requestAccess(const QVariantMap &options) {
         m_options = options;
+        if (!m_errorName.isEmpty()) {
+            sendErrorReply(m_errorName, "Some error");
+            m_errorName = QString();
+        }
         return QVariantMap();
     }
 
 private:
     QVariantMap m_options;
+    QString m_errorName;
 };
 
 class SetupTest: public QObject
@@ -67,6 +75,7 @@
     void testExecWithProvider();
     void testExecWithServiceType();
     void testExecWithApplication();
+    void testError();
     void testWindowId();
 
 private:
@@ -170,6 +179,21 @@
              uint(window.winId()));
 }
 
+void SetupTest::testError()
+{
+    m_service.setError("com.ubuntu.SomeError");
+
+    Setup setup;
+
+    QSignalSpy finished(&setup, SIGNAL(finished(QVariantMap)));
+    setup.exec();
+
+    QVERIFY(finished.wait(10000));
+    QCOMPARE(finished.count(), 1);
+    QCOMPARE(finished.at(0).at(0).toMap().value("errorName").toString(),
+             QString("com.ubuntu.SomeError"));
+}
+
 QTEST_MAIN(SetupTest);
 
 #include "tst_client.moc"