Merge lp:~mardy/ubuntu-system-settings-online-accounts/single-new-hook-1596843 into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Support single account providers in new hooks

Support single account providers in new hooks

Unmerged revisions

369. By Alberto Mardegan on 2016-06-28

Support single account providers in new hooks

=== modified file 'click-hooks/accounts.cpp'
--- click-hooks/accounts.cpp	2015-11-30 09:54:01 +0000
+++ click-hooks/accounts.cpp	2016-06-28 09:31:34 +0000
@@ -304,6 +304,13 @@
     elem.appendChild(doc.createTextNode(icon));
     root.appendChild(elem);
 
+    // single account
+    if (json.value(QStringLiteral("single-account")).toBool()) {
+        elem = doc.createElement(QStringLiteral("single-account"));
+        elem.appendChild(doc.createTextNode("true"));
+        root.appendChild(elem);
+    }
+
     addProfile(doc);
     addTranslations(doc);
     addTemplate(doc, json);

=== modified file 'tests/click-hooks/tst_online_accounts_hooks2.cpp'
--- tests/click-hooks/tst_online_accounts_hooks2.cpp	2015-11-30 09:54:01 +0000
+++ tests/click-hooks/tst_online_accounts_hooks2.cpp	2016-06-28 09:31:34 +0000
@@ -581,6 +581,33 @@
         "}" <<
         package <<
         files;
+
+    package["myapp/Main.qml"] = "Something here";
+    files.clear();
+    files["providers/com.ubuntu.test_MyApp.provider"] =
+        QString("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+        "<!--this file is auto-generated by online-accounts-hooks2; do not modify-->\n"
+        "<provider id=\"com.ubuntu.test_MyApp\">\n"
+        "  <name>Google</name>\n"
+        "  <icon>google.svg</icon>\n"
+        "  <single-account>true</single-account>\n"
+        "  <profile>com.ubuntu.test_MyApp_0.2</profile>\n"
+        "  <package-dir>/tmp/hooks-test2/package</package-dir>\n"
+        "</provider>\n");
+    files["qml-plugins/com.ubuntu.test_MyApp/Main.qml"] =
+        "Something here";
+    QTest::newRow("account plugin, single account") <<
+        "com.ubuntu.test_MyApp_0.2.accounts" <<
+        "{"
+        "  \"plugin\": {"
+        "    \"name\": \"Google\","
+        "    \"icon\": \"google.svg\","
+        "    \"single-account\": true,"
+        "    \"qml\": \"myapp\""
+        "  }"
+        "}" <<
+        package <<
+        files;
 }
 
 void OnlineAccountsHooksTest::testValidHooks()