Merge lp:~abreu-alexandre/unity-webapps-qml/improve-embedded-ui-params-passing into lp:unity-webapps-qml

[Alexandre Abreu]

Improve paramater passing to launchEmbedded UI

Improve paramater passing to launchEmbedded UI

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:145
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/157/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-armhf-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/157/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Does this allow arbitrary key/value pairs for properties?

review: Needs Information

[lp:~abreu-alexandre/unity-webapps-qml/improve-embedded-ui-params-passing]

145. By Alberto Mardegan on 2015-03-04

Bindings for the OnlineAccounts.Client module Fixes: #1427649
Approved by: Justin McPherson, PS Jenkins bot

146. By CI Train Bot Account on 2015-03-04

Releasing 0.1+15.04.20150304-0ubuntu1

147. By Alexandre Abreu on 2015-03-19

Add tools API that exposed helpers to webaps
Approved by: PS Jenkins bot

148. By CI Train Bot Account on 2015-03-19

Releasing 0.1+15.04.20150319-0ubuntu1

149. By Daniel Holbach on 2015-04-09

Add ./update-docs script which generates API docs locally. We can't make this part of the build as not all node dependencies of yuidocsjs are packaged in the archive.
Approved by: PS Jenkins bot, David Barth

150. By CI Train Bot Account on 2015-04-09

Releasing 0.1+15.04.20150409-0ubuntu1

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/172/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-armhf-ci/26

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/172/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:147
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/173/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-amd64-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-armhf-ci/27/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/173/rebuild

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/unity-webapps-qml/improve-embedded-ui-params-passing]

151. By Alexandre Abreu on 2015-04-16

Fix conteht hub missing api; fix tests

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:151
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/174/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-armhf-ci/28

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/174/rebuild

review: Approve (continuous-integration)

[lp:~abreu-alexandre/unity-webapps-qml/improve-embedded-ui-params-passing]

152. By Alexandre Abreu on 2015-04-17

fix tests

153. By Alexandre Abreu on 2015-04-17

nit

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:153
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/175/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-armhf-ci/29

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/175/rebuild

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

> Does this allow arbitrary key/value pairs for properties?

yes :)

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.js'
--- src/Ubuntu/UnityWebApps/UnityWebApps.js	2015-03-18 15:34:27 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.js	2015-04-17 18:58:01 +0000
@@ -33,15 +33,22 @@
     /**
      * \param parentItem
      * \param bindeeProxies
-     * \param backends
-     * \param userscriptContent
+     * \param accessPolicy
+     * \param injected_api_path
+     * \param dispatched_callback
      */
-    function _UnityWebApps(parentItem, bindeeProxies, accessPolicy, injected_api_path) {
+    function _UnityWebApps(
+            parentItem,
+            bindeeProxies,
+            accessPolicy,
+            injected_api_path,
+            dispatched_callback) {
         this._injected_unity_api_path = injected_api_path;
         this._bindeeProxies = bindeeProxies;
         this._backends = null;
         this._accessPolicy = accessPolicy;
         this._callbackManager = UnityWebAppsUtils.makeCallbackManager();
+        this._dispatchedCallback = dispatched_callback
 
         this._bind();
     };
@@ -152,8 +159,14 @@
                     return;
                 }
 
+
                 this._log ('WebApps API message being dispatch: ' + apiCallName);
 
+                if (this._dispatchedCallback &&
+                        typeof(this._dispatchedCallback) === 'function') {
+                    this._dispatchedCallback({type: "dispatching", name: apiCallName})
+                }
+
                 this._dispatchApiCall (message.name, params);
 
             } else if (target === UnityWebAppsUtils.UBUNTU_WEBAPPS_BINDING_OBJECT_METHOD_CALL_MESSAGE) {
@@ -215,6 +228,11 @@
                 }, reducetarget);
                 t.apply (null, args);
 
+                if (this._dispatchedCallback &&
+                        typeof(this._dispatchedCallback) === 'function') {
+                    this._dispatchedCallback({type: "called", name: name})
+                }
+
             } catch (err) {
               this._log('Error while dispatching call to ' + names.join('.') + ': ' + err);
             }

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2015-03-19 14:06:48 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2015-04-17 18:58:01 +0000
@@ -178,6 +178,12 @@
      */
     signal userScriptsInjected()
 
+    /*!
+     \qmlsignal UnityWebApps::apiCallDispatched()
+
+     This signal is emitted when an api call is being dispatched to the backend.
+     */
+    signal apiCallDispatched(string type, string name)
 
     Settings {
         id: settings
@@ -236,7 +242,10 @@
                     __getPolicyForContent(settings),
                     customClientApiFileUrl && customClientApiFileUrl.length !== 0
                       ? customClientApiFileUrl
-                      : 'unity-webapps-api.js');
+                      : 'unity-webapps-api.js',
+                    function(info) {
+                        apiCallDispatched(info.type, info.name)
+                    });
 
         internal.instance = instance;
 
@@ -644,7 +653,22 @@
 
                 var uicomponent;
                 function onCreated() {
-                    var uiobject = uicomponent.createObject(p, {"fileToShare": params.fileToShare.url, "visible": true});
+                    var args = {}
+                    for (var k in params) {
+                        if (params.hasOwnProperty(k)) {
+                            args[k] = params[k]
+                        }
+                    }
+
+                    // For backward compatibility
+                    if (params.hasOwnProperty("fileToShare") &&
+                            typeof(params.fileToShare) === 'object' &&
+                            params.fileToShare.hasOwnProperty("url")) {
+                        args.fileToShare = params.fileToShare.url
+                    }
+
+                    args.visible = true
+                    var uiobject = uicomponent.createObject(p, args);
                     if ( ! uiobject.onCompleted) {
                         console.error("launchEmbeddedUI: The local UI component to be launched does not expose a mandatory 'completed' signal");
                         uiobject.destroy();

=== modified file 'src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js'
--- src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js	2014-12-02 02:19:04 +0000
+++ src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js	2015-04-17 18:58:01 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This file is part of unity-webapps-qml.
  *
@@ -239,7 +239,8 @@
                     store: self._object.store,
                     state: self._object.state,
                     selectionType: self._object.selectionType,
-                    direction: self._object.direction,
+                    contentType: self._object.contentType,
+                    direction: self._object.direction
                 }
             }
         },
@@ -285,6 +286,17 @@
             });
         },
 
+        contentType: function(callback) {
+            this._validate();
+            callback(_contentTypeToName(this._object.contentType));
+        },
+        setContentType: function(contentType, callback) {
+            this._validate();
+            this._object.contentType = _nameToContentType(contentType);
+            if (callback && typeof(callback) === 'function')
+                callback();
+        },
+
         selectionType: function(callback) {
             this._validate();
             callback(_contentTransferSelectionToName(this._object.selectionType));

=== modified file 'src/Ubuntu/UnityWebApps/bindings/content-hub/client/content-hub.js'
--- src/Ubuntu/UnityWebApps/bindings/content-hub/client/content-hub.js	2014-06-04 14:41:59 +0000
+++ src/Ubuntu/UnityWebApps/bindings/content-hub/client/content-hub.js	2015-04-17 18:58:01 +0000
@@ -44,6 +44,8 @@
              ? content.state : null;
         this._selectionType = content && content.selectionType
              ? content.selectionType : null;
+        this._contentType = content && content.contentType
+             ? content.contentType : null;
         this._direction = content && content.direction
              ? content.direction : null;
     };
@@ -148,6 +150,31 @@
         },
 
         /**
+         * Retrieves the current content type.
+         *
+         * @method contentType
+         * @param callback {Function(ContentTransfer.ContentType)}
+         */
+        contentType: function(callback) {
+            if (callback && typeof(callback) === 'function') {
+                this._proxy.call('contentType', [], callback);
+                return;
+            }
+            return this._contentType;
+        },
+        /**
+         * Sets the content type.
+         *
+         * @method setContentType
+         * @param contentType {ContentTransfer.ContentType}
+         * @param callback {Function()} called when the state has been updated
+         */
+        setContentType: function(contentType, callback) {
+            this._contentType = contentType;
+            this._proxy.call('setContentType', [contentType, callback]);
+        },
+
+        /**
          * Retrieves the current transfer direction.
          *
          * If the callback parameter is not set, the current "local" value is retrieved.

=== added file 'tests/unit/test_qml/embeddedUI.qml'
--- tests/unit/test_qml/embeddedUI.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/test_qml/embeddedUI.qml	2015-04-17 18:58:01 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-webapps-qml.
+ *
+ * unity-webapps-qml 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.
+ *
+ * unity-webapps-qml 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/>.
+ */
+
+import QtQuick 2.0
+
+Rectangle {
+    property string fileToShare
+    property string p
+    property string q
+
+    color: Qt.red
+}

=== added file 'tests/unit/test_qml/empty.html'
--- tests/unit/test_qml/empty.html	1970-01-01 00:00:00 +0000
+++ tests/unit/test_qml/empty.html	2015-04-17 18:58:01 +0000
@@ -0,0 +1,6 @@
+<html>
+<head>
+</head>
+<body>
+</body>
+</html>

=== modified file 'tests/unit/test_qml/test_qml.pro'
--- tests/unit/test_qml/test_qml.pro	2014-01-21 19:58:04 +0000
+++ tests/unit/test_qml/test_qml.pro	2015-04-17 18:58:01 +0000
@@ -19,7 +19,15 @@
 
 OTHER_FILES += \
     $$system(ls *.qml) \
-    $$system(ls *.sh)
+    $$system(ls *.sh) \
+    tst_api_contenthub.qml \
+    tst_api_contenthub.html \
+    tst_api_contenthub.js \
+    tst_api_launchEmbeddedUI.qml \
+    tst_api_launchEmbeddedUI.html \
+    embeddedUI.qml \
+    tst_api_launchEmbeddedUI.js \
+    empty.html
 
 
 # make check target

=== added file 'tests/unit/test_qml/tst_api_contenthub.html'
--- tests/unit/test_qml/tst_api_contenthub.html	1970-01-01 00:00:00 +0000
+++ tests/unit/test_qml/tst_api_contenthub.html	2015-04-17 18:58:01 +0000
@@ -0,0 +1,42 @@
+<html>
+
+<head>
+<script>
+
+var activeTransfer
+
+function _shareRequested(transfer) {
+    activeTransfer = transfer;
+
+    var e = new CustomEvent("onsharerequest", { bubbles: true, detail: { } });
+    document.documentElement.dispatchEvent(e);
+
+    activeTransfer.contentType(function(type) {
+        var e = new CustomEvent("received-object-value",
+            { bubbles: true, detail: { value: type } });
+        document.documentElement.dispatchEvent(e);
+    })
+}
+
+function setup() {
+    var api = external.getUnityObject('1.0');
+    var hub = api.ContentHub;
+    hub.onShareRequested(_shareRequested);
+}
+
+window.onload = function () {
+    if (window.external && window.external.getUnityObject) {
+        setup()
+    } else {
+        document.addEventListener('ubuntu-webapps-api-ready', function() {
+            setup()
+        });
+    }
+}
+</script>
+</head>
+
+<body>
+</body>
+
+</html>

=== added file 'tests/unit/test_qml/tst_api_contenthub.js'
--- tests/unit/test_qml/tst_api_contenthub.js	1970-01-01 00:00:00 +0000
+++ tests/unit/test_qml/tst_api_contenthub.js	2015-04-17 18:58:01 +0000
@@ -0,0 +1,28 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library 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
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+// ==UserScript==
+// @run-at document-start
+// ==/UserScript==
+
+oxide.addMessageHandler("evalcode", function(msg) {
+  var code = msg.args.code;
+  if (msg.args.wrap) {
+    code = "(function() {" + code + "})()";
+  }
+  eval(code);
+});

=== added file 'tests/unit/test_qml/tst_api_contenthub.qml'
--- tests/unit/test_qml/tst_api_contenthub.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/test_qml/tst_api_contenthub.qml	2015-04-17 18:58:01 +0000
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-webapps-qml.
+ *
+ * unity-webapps-qml 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.
+ *
+ * unity-webapps-qml 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/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Web 0.2
+import com.canonical.Oxide 1.0 as Oxide
+import Ubuntu.UnityWebApps 0.1
+
+
+TestCase {
+    id: testcase
+
+    name: "ContentHubApiTest"
+
+    signal messageReceived()
+
+    SignalSpy {
+      id: spyMessageReceived
+      target: testcase
+      signalName: "messageReceived"
+    }
+
+    function setup() {
+        callbacks = []
+        objects = {}
+        lastReceivedMethod = ""
+        webview.url = "empty.html"
+        spyMessageReceived.clear()
+    }
+
+    property var callbacks: []
+    property var objects: null
+    property var backends: getContentHubBackend()
+    property string lastReceivedMethod
+
+    function serializeContentTransferObject(id, content, selection, handlerFuncs) {
+        if (!objects) {
+            objects = {}
+        }
+
+        objects[id] = {
+            content: content,
+            selection: selection,
+            handlerFuncs: handlerFuncs
+        };
+        return {
+            type: 'object-proxy',
+            apiid: 'ContentHub',
+            objecttype: 'ContentTransfer',
+            objectid: id,
+
+            content: {
+                store: "store",
+                state: "state",
+                selectionType: selection,
+                contentType: content,
+                direction: "direction"
+            }
+        }
+    }
+
+    function getContentHubBackend() {
+        return  {
+            ContentHub: {
+                onShareRequested: function(callback) {
+                    callbacks.push(callback)
+                    lastReceivedMethod = 'onShareRequested'
+                    testcase.messageReceived()
+                },
+                dispatchToObject: function(infos) {
+                    var args = infos.args;
+                    var callback = infos.callback;
+                    var method_name = infos.method_name;
+
+                    verify(objects != null && objects[infos.objectid] != null)
+
+                    verify(objects[infos.objectid].handlerFuncs[method_name] != null)
+                    testcase.messageReceived()
+
+                    var r
+                    try {
+                        r = objects[infos.objectid].handlerFuncs[method_name].apply(objects[infos.objectid], args)
+                    } catch(e) {
+                        verify(0 && "Exception " + e.toString())
+                    }
+
+                    if (callback) {
+                        verify (typeof(callback) === 'function')
+                        callback(r)
+                    }
+                }
+            }
+        }
+    }
+
+    function test_call_shareRequested() {
+        setup();
+
+        webview.url = "tst_api_contenthub.html"
+
+        spyMessageReceived.wait()
+        compare(spyMessageReceived.count, 1, "Should have had 1 apiCallDispatched signal");
+        compare(lastReceivedMethod, 'onShareRequested', "Should have had 2 apiCallDispatched signal");
+        compare(callbacks.length, 1, "Should have had 1 callback object");
+    }
+
+    function test_invoke_shareRequestedCallback() {
+        setup();
+
+        var transferObject = { contentType: function() { return "Pictures"; } }
+
+        webview.url = "tst_api_contenthub.html"
+
+        spyMessageReceived.wait()
+        compare(spyMessageReceived.count, 1, "Should have had 2 apiCallDispatched signal");
+        compare(lastReceivedMethod, 'onShareRequested', "Should have had 2 apiCallDispatched signal");
+        compare(callbacks.length, 1, "Should have had 1 callback object");
+
+        evaluateCode("document.addEventListener('onsharerequest', function(e) { \
+oxide.sendMessage('share-request-received', { type: e.detail.type }); \
+})")
+
+        evaluateCode("document.addEventListener('received-object-value', function(e) { \
+oxide.sendMessage('share-request-received', { type: e.detail.type }); \
+})")
+
+        callbacks[0](
+            serializeContentTransferObject(
+                "1", "", "", transferObject))
+
+        spyMessageReceived.wait()
+        compare(spyMessageReceived.count, 2, "Should have had 1 messageReceived signal");
+    }
+
+    UnityWebApps {
+        id: webapps
+        bindee: webview
+        injectExtraUbuntuApis: true
+        injectExtraContentShareCapabilities: true
+        customBackendProxies: backends
+    }
+
+    function evaluateCode(code, wrap) {
+      webview.rootFrame.sendMessageNoReply(
+        "oxide://test-msg-handler/",
+        "evalcode",
+        { code: code,
+          wrap: wrap === undefined ? false : wrap });
+    }
+
+    WebView {
+        id: webview
+
+        anchors.fill: parent
+
+        messageHandlers: [
+            Oxide.ScriptMessageHandler {
+                msgId: "share-request-received"
+                contexts: [ "oxide://test-msg-handler/" ]
+                callback: function(msg) {
+                    testcase.lastReceivedMethod = msg.args;
+                    testcase.messageReceived()
+                }
+            }
+        ]
+
+        context: WebContext {
+            userScripts: [
+              Oxide.UserScript {
+                context: "oxide://test-msg-handler/"
+                url: Qt.resolvedUrl("tst_api_contenthub.js")
+                incognitoEnabled: true
+                matchAllFrames: true
+              }
+            ]
+        }
+
+        function getUnityWebappsProxies() {
+            return UnityWebAppsUtils.makeProxiesForWebViewBindee(webview);
+        }
+    }
+}

=== added file 'tests/unit/test_qml/tst_api_launchEmbeddedUI.html'
--- tests/unit/test_qml/tst_api_launchEmbeddedUI.html	1970-01-01 00:00:00 +0000
+++ tests/unit/test_qml/tst_api_launchEmbeddedUI.html	2015-04-17 18:58:01 +0000
@@ -0,0 +1,21 @@
+<html>
+
+<head>
+<script>
+
+function callback() {}
+
+window.onload = function() {
+    document.addEventListener('launchEmbeddedUI', function(e) {
+        var api = external.getUnityObject('1.0');
+        api.launchEmbeddedUI('embeddedUI', callback, { fileToShare: "me", p: "you", q: "them" })
+    })
+}
+
+</script>
+</head>
+
+<body>
+</body>
+
+</html>

=== added file 'tests/unit/test_qml/tst_api_launchEmbeddedUI.js'
--- tests/unit/test_qml/tst_api_launchEmbeddedUI.js	1970-01-01 00:00:00 +0000
+++ tests/unit/test_qml/tst_api_launchEmbeddedUI.js	2015-04-17 18:58:01 +0000
@@ -0,0 +1,28 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library 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
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+// ==UserScript==
+// @run-at document-start
+// ==/UserScript==
+
+oxide.addMessageHandler("evalcode", function(msg) {
+  var code = msg.args.code;
+  if (msg.args.wrap) {
+    code = "(function() {" + code + "})()";
+  }
+  eval(code);
+});

=== added file 'tests/unit/test_qml/tst_api_launchEmbeddedUI.qml'
--- tests/unit/test_qml/tst_api_launchEmbeddedUI.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/test_qml/tst_api_launchEmbeddedUI.qml	2015-04-17 18:58:01 +0000
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-webapps-qml.
+ *
+ * unity-webapps-qml 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.
+ *
+ * unity-webapps-qml 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/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Web 0.2
+import com.canonical.Oxide 1.0 as Oxide
+import Ubuntu.UnityWebApps 0.1
+
+
+TestCase {
+    id: testcase
+
+    name: "LaunchEmbeddedUIApiTest"
+
+    SignalSpy {
+      id: spy
+      target: webview
+      signalName: "visibleChanged"
+    }
+
+    function setup() {
+        spy.clear()
+    }
+
+    function test_invoke_shareRequestedCallback() {
+        setup();
+
+        webview.url = "tst_api_launchEmbeddedUI.html"
+
+        evaluateCode("var e = new CustomEvent('launchEmbeddedUI', { bubbles: true }); document.dispatchEvent(e);")
+
+//        spy.wait()
+//        compare(spy.count, 1, "Should have had 1 messageReceived signal");
+    }
+
+    UnityWebApps {
+        id: webapps
+        bindee: webview
+        injectExtraUbuntuApis: true
+        injectExtraContentShareCapabilities: true
+    }
+
+    function evaluateCode(code, wrap) {
+      webview.rootFrame.sendMessageNoReply(
+        "oxide://test-ui/",
+        "evalcode",
+        { code: code,
+          wrap: wrap === undefined ? false : wrap });
+    }
+    visible: true
+
+    WebView {
+        id: webview
+
+        width: 200
+        height: 200
+
+        visible: true
+
+        context: WebContext {
+            userScripts: [
+              Oxide.UserScript {
+                context: "oxide://test-ui/"
+                url: Qt.resolvedUrl("tst_api_launchEmbeddedUI.js")
+                incognitoEnabled: true
+                matchAllFrames: true
+              }
+            ]
+        }
+
+        function getUnityWebappsProxies() {
+            return UnityWebAppsUtils.makeProxiesForWebViewBindee(webview);
+        }
+    }
+}

=== modified file 'tests/unit/test_qml/tst_cleanup.qml'
--- tests/unit/test_qml/tst_cleanup.qml	2014-04-14 20:57:17 +0000
+++ tests/unit/test_qml/tst_cleanup.qml	2015-04-17 18:58:01 +0000
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of unity-webapps-qml.
+ *
+ * unity-webapps-qml 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.
+ *
+ * unity-webapps-qml 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/>.
+ */
+
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.UnityWebApps 0.1

=== modified file 'tests/unit/test_qml/tst_dispatch.qml'
--- tests/unit/test_qml/tst_dispatch.qml	2014-07-11 17:13:18 +0000
+++ tests/unit/test_qml/tst_dispatch.qml	2015-04-17 18:58:01 +0000
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of unity-webapps-qml.
+ *
+ * unity-webapps-qml 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.
+ *
+ * unity-webapps-qml 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/>.
+ */
+
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.UnityWebApps 0.1
@@ -112,6 +130,7 @@
         id: webapps
         name: ""
         bindee: null
+        injectExtraUbuntuApis: true
     }
 
     // 'mocks' the 'bindee'

=== modified file 'tests/unit/test_qml/tst_init.qml'
--- tests/unit/test_qml/tst_init.qml	2014-04-14 20:57:17 +0000
+++ tests/unit/test_qml/tst_init.qml	2015-04-17 18:58:01 +0000
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of unity-webapps-qml.
+ *
+ * unity-webapps-qml 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.
+ *
+ * unity-webapps-qml 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/>.
+ */
+
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.UnityWebApps 0.1
@@ -37,19 +55,6 @@
         compare(spy.count, 1, "Script has been injected");
     }
 
-    function test_initAndMessageHandlerAdded() {
-        setup();
-
-        spy.clear();
-        spy.target = mockedWebView;
-        spy.signalName = "loadingStartedConnected";
-
-        webapps.name = "test_initAndMessageHandlerAdded";
-        webapps.bindee = mockedWebView;
-
-        compare(spy.count, 1, "WebApp message connected on load started");
-    }
-
     function test_initWithNoName() {
         setup();