Merge lp:~abreu-alexandre/unity-webapps-qml/cleanup-and-fix-bindee-init into lp:unity-webapps-qml

[Alexandre Abreu]

Add UA override capabilities to webapps; clean some code and tests,

Add UA override capabilities to webapps; clean some code and tests,

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:115
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/113/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-amd64-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-armhf-ci/61

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

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.js'
--- src/Ubuntu/UnityWebApps/UnityWebApps.js	2014-03-18 18:52:11 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.js	2014-04-22 15:41:19 +0000
@@ -36,11 +36,11 @@
      * \param backends
      * \param userscriptContent
      */
-    function _UnityWebApps(parentItem, bindeeProxies, backends, userscripts) {
+    function _UnityWebApps(parentItem, bindeeProxies) {
         this._injected_unity_api_path = Qt.resolvedUrl('unity-webapps-api.js');
         this._bindeeProxies = bindeeProxies;
-        this._backends = backends;
-        this._userscripts = userscripts || [];
+        this._backends = null;
+        this._userscripts = [];
 
         this._bind();
     };
@@ -56,6 +56,14 @@
             return this._bindeeProxies;
         },
 
+        setUserScriptsToInject: function(userscripts) {
+            this._userscripts = userscripts;
+        },
+
+        setBackends: function(backends) {
+            this._backends = backends;
+        },
+
         /**
          * \internal
          *
@@ -168,6 +176,9 @@
          *
          */
         _dispatchApiCall: function (name, args) {
+            if ( ! this._backends)
+                return;
+
             var names = name.split('.');
             var reducetarget = this._backends;
             try {

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-03-26 15:52:46 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-04-22 15:41:19 +0000
@@ -201,15 +201,13 @@
             return;
         }
 
-        var backends = __createBackendsIfNeeded();
-
         var instance = new UnityWebAppsJs.UnityWebApps(webapps,
-                                                     bindeeProxies,
-                                                     backends,
-                                                     webappUserscripts);
-
-        internal.backends = backends;
+                                                       bindeeProxies,
+                                                       webappUserscripts);
         internal.instance = instance;
+
+        if (internal.backends)
+            internal.instance.setBackends(internal.backends)
     }
 
     /*!
@@ -229,6 +227,18 @@
     /*!
       \internal
 
+     */
+    function __initBackends() {
+        if (__isValidWebAppName(webapps.name)) {
+            internal.backends = __createBackendsIfNeeded();
+            if (internal.backends && internal.instance)
+                internal.instance.setBackends(internal.backends);
+        }
+    }
+
+    /*!
+      \internal
+
       PRIVATE FUNCTION: __isValidBindee
      */
     function __isValidBindee(bindee) {
@@ -258,26 +268,12 @@
     /*!
       \internal
 
-      PRIVATE FUNCTION: __reset
-     */
-    function __reset() {
-        __unbind();
-
-        if (typeof(name) === 'string' && name !== "")
-            UnityBackends.clearAll();
-    }
-
-    /*!
-      \internal
-
       PRIVATE FUNCTION: __unbind
      */
     function __unbind() {
-        //TODO: make sure that now leaks here
         if (internal.instance)
             internal.instance.cleanup();
         internal.instance = null;
-        internal.backends = null;
     }
 
     /*!
@@ -334,31 +330,23 @@
     /*!
       \internal
 
+      If running as a known webapp, setup the scripts are that to be injected
+      (and provided by the model), and navigate to the proper homepage.
      */
-    function __initWebappForName(name) {
-        webapps.__unbind();
-
-        if (bindee != null)
-            webapps.__bind(bindee, __isValidWebAppForModel(name) ? __gatherWebAppUserscriptsIfAny(name) : null);
-
-        if (__isValidWebAppName(name)) {
+    function __setupNamedWebappEnvironment() {
+        if (__isValidWebAppForModel(name)) {
+            if (internal.instance) {
+                var userScripts = __gatherWebAppUserscriptsIfAny(name);
+                internal.instance.setUserScriptsToInject(userScripts);
+            }
             __navigateToWebappHomepageInBindee(name);
         }
-
     }
 
     Component.onCompleted: {
-        function oncompleted() {
-            __initWebappForName(name);
-        }
-        if ( ! internal.instance)
-            oncompleted();
-
         if (model) {
-            model.modelChanged.connect(oncompleted);
+            model.modelChanged.connect(function() { __setupNamedWebappEnvironment() });
         }
-
-        internal.componentComplete = true;
     }
 
     /*!
@@ -366,7 +354,15 @@
 
      */
     onBindeeChanged: {
-        //FIXME: we shouldn't allow bindee to change
+        // cleanup old refs & go
+        webapps.__unbind();
+
+        if (bindee != null) {
+            webapps.__bind(bindee);
+
+            // if we are running as a named webapp
+            __setupNamedWebappEnvironment();
+        }
     }
 
     /*!
@@ -374,9 +370,10 @@
 
      */
     onNameChanged: {
-        //FIXME: we shouldn't allow webapp names to change
-        if (internal.componentComplete)
-            __initWebappForName(name);
+        __initBackends(webapps.name);
+
+        // if we are running as a proper named webapp
+        __setupNamedWebappEnvironment();
     }
 
     /*!
@@ -387,7 +384,6 @@
         id: internal
         property var instance: null
         property var backends: null
-        property bool componentComplete: false
     }
 
 
@@ -449,6 +445,7 @@
             return params.__unity_webapps_hidden.hostname.indexOf(params.domain) !== -1;
         };
 
+        UnityBackends.clearAll();
         UnityBackends.createBackendDelegate(webapps);
 
         return {

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js'
--- src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2014-04-02 18:16:34 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2014-04-22 15:41:19 +0000
@@ -221,7 +221,7 @@
  *   property is an object w/ a 'name' and 'type' (as in typeof()).
  */
 function formatUnityWebappsCall(type, serialized_args) {
-    return {target: "unity-webapps-call", name: type, args: serialized_args};
+    return {target: "ubuntu-webapps-binding-call", name: type, args: serialized_args};
 }
 
 

=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-manifest-parser.cpp'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-manifest-parser.cpp	2014-01-17 15:51:27 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-manifest-parser.cpp	2014-04-22 15:41:19 +0000
@@ -111,6 +111,13 @@
     }
     infos->chromeOptions = parseChromeOptions(chromeOption);
 
+    QString userAgentOverride;
+    if (object.contains("user-agent-override")
+            && object.value("user-agent-override").isString())
+    {
+        infos->userAgentOverride = object.value("user-agent-override").toString();
+    }
+
     return true;
 }
 

=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-manifest-parser.h'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-manifest-parser.h	2014-01-17 15:51:27 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-manifest-parser.h	2014-04-22 15:41:19 +0000
@@ -46,6 +46,8 @@
     QStringList requires;
     // The currently selected chrome option for this WebApp
     QStringList chromeOptions;
+    // (optional) A User Agent override string to be used for the current webapp
+    QString userAgentOverride;
 };
 
 /*!

=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp	2014-01-17 15:51:27 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp	2014-04-22 15:41:19 +0000
@@ -154,6 +154,8 @@
         roles[Urls] = "urls";
         roles[ScriptsContent] = "content";
         roles[Scripts] = "scripts";
+        roles[Chrome] = "chrome";
+        roles[UserAgentOverride] = "useragent";
       }
     return roles;
 }
@@ -301,6 +303,22 @@
     return script;
 }
 
+QString
+UnityWebappsAppModel::userAgentOverrideFor(const QString & webappName) const
+{
+    if (!exists(webappName))
+        return QString();
+
+    int idx = getWebappIndex(webappName);
+    if (Q_UNLIKELY(idx == -1))
+    {
+        qDebug() << "Invalid index for a supposedly existing webapp: " << webappName;
+        return QString();
+    }
+
+    return data(idx, UserAgentOverride).toString();
+}
+
 QStringList
 UnityWebappsAppModel::getChromeOptionsFor(const QString & webappName) const
 {
@@ -488,8 +506,12 @@
             }
             return scripts;
         }
+
     case ScriptsContent:
         return webapp.data.content;
+
+    case UserAgentOverride:
+        return webapp.data.manifest.userAgentOverride;
     }
 
     return QVariant();

=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.h'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.h	2014-01-17 15:51:27 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.h	2014-04-22 15:41:19 +0000
@@ -57,7 +57,8 @@
         Homepage,
         Scripts,
         ScriptsContent,
-        Chrome
+        Chrome,
+        UserAgentOverride
     };
 
     // QAbstractListModel implementation
@@ -101,6 +102,13 @@
      */
     Q_INVOKABLE QStringList getChromeOptionsFor(const QString & webappName) const;
 
+
+    /*!
+     * \brief
+     */
+    Q_INVOKABLE QString userAgentOverrideFor(const QString & webappName) const;
+
+
     /*!
      * \brief
      */

=== modified file 'tests/integration/autopilot/html/test_webapps_api_injected.html'
--- tests/integration/autopilot/html/test_webapps_api_injected.html	2013-07-09 12:45:17 +0000
+++ tests/integration/autopilot/html/test_webapps_api_injected.html	2014-04-22 15:41:19 +0000
@@ -4,6 +4,23 @@
 <title>Unity Webapps QML test</title>
 
 <script>
+
+var unity;
+function onInit() {
+  document.getElementById('content').innerHTML = 'initialized';
+}
+
+var UBUNTU_WEBAPPS_API_READY_KEY = 'ubuntu-webapps-api-ready-key';
+document.addEventListener('ubuntu-webapps-api-ready', function () {
+  if ( ! window.localStorage[UBUNTU_WEBAPPS_API_READY_KEY]) {
+    window.localStorage[UBUNTU_WEBAPPS_API_READY_KEY] = 0;
+  }
+  window.localStorage[UBUNTU_WEBAPPS_API_READY_KEY] ++;
+
+  unity = window.external.getUnityObject('1.0');
+  unity.init({name: 'unity-webapps-qml-launcher', onInit: onInit});
+}, false);
+
 </script>
 
 </head>

=== modified file 'tests/integration/autopilot/html/test_webapps_hud.html'
--- tests/integration/autopilot/html/test_webapps_hud.html	2013-09-05 21:38:15 +0000
+++ tests/integration/autopilot/html/test_webapps_hud.html	2014-04-22 15:41:19 +0000
@@ -1,4 +1,4 @@
-<html>
+    <html>
 
 <head>
 <title>Unity Webapps QML test: HUD</title>
@@ -7,7 +7,7 @@
 
 var unity;
 function onInit() {
-  unity.addAction('This is an action', function() {
+  unity.addAction('Hello', function() {
     document.getElementById('content').style.display = 'none';
   });
   unity.addAction('Another action', function() {

=== modified file 'tests/integration/autopilot/qml/FullWebViewApp.qml'
--- tests/integration/autopilot/qml/FullWebViewApp.qml	2013-07-31 16:29:07 +0000
+++ tests/integration/autopilot/qml/FullWebViewApp.qml	2014-04-22 15:41:19 +0000
@@ -37,6 +37,7 @@
 
     function evalInPageUnsafe(expr) {
         var tid = DomIntrospectionUtils.gentid();
+        console.log(DomIntrospectionUtils.wrapJsCommands(expr))
         webView.experimental.evaluateJavaScript(DomIntrospectionUtils.wrapJsCommands(expr),
             function(result) { console.log('Result: ' + result); root.resultUpdated(DomIntrospectionUtils.createResult(result)); });
     }
@@ -61,7 +62,7 @@
         width: parent.width
         height: parent.height
 
-        experimental.userScripts: [Qt.resolvedUrl("injected-script.js")]
+        experimental.userScripts: []
         experimental.preferences.navigatorQtObjectEnabled: true
         experimental.preferences.developerExtrasEnabled: true
 

=== modified file 'tests/integration/autopilot/unity_webapps_qml/tests/__init__.py'
--- tests/integration/autopilot/unity_webapps_qml/tests/__init__.py	2013-09-19 01:07:00 +0000
+++ tests/integration/autopilot/unity_webapps_qml/tests/__init__.py	2014-04-22 15:41:19 +0000
@@ -96,5 +96,6 @@
         prev_emissions = self.watcher.num_emissions
         webview.slots.evalInPageUnsafe(expr)
         self.assertThat(lambda: self.watcher.num_emissions, Eventually(GreaterThan(prev_emissions)))
-        return json.loads(webview.get_signal_emissions('resultUpdated(QString)')[-1][0])['result']
+        results = json.loads(webview.get_signal_emissions('resultUpdated(QString)')[-1][0])
+        return results.has_key('result') and results['result'] or None
 

=== modified file 'tests/integration/autopilot/unity_webapps_qml/tests/test_hud.py'
--- tests/integration/autopilot/unity_webapps_qml/tests/test_hud.py	2013-09-23 19:59:29 +0000
+++ tests/integration/autopilot/unity_webapps_qml/tests/test_hud.py	2014-04-22 15:41:19 +0000
@@ -40,7 +40,7 @@
         self.unity.hud.ensure_visible()
         self.addCleanup(self.unity.hud.ensure_hidden)
 
-        self.keyboard.type("This is an action")
+        self.keyboard.type("Hello")
         self.keyboard.press_and_release("Enter")
 
         self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('content').style.display;"), Eventually(Equals('none')))
@@ -48,7 +48,7 @@
     def test_clearAction(self):
         self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('actionadded')))
         expr = """
-           var e = new CustomEvent ("unity-webapps-do-call", {"detail": JSON.stringify({"name": 'clearAction', 'args': ['This is an action']})});
+           var e = new CustomEvent ("unity-webapps-do-call", {"detail": JSON.stringify({"name": 'clearAction', 'args': ['Hello']})});
            document.dispatchEvent (e);
            return true;
         """
@@ -57,9 +57,8 @@
         self.unity.hud.ensure_visible()
         self.addCleanup(self.unity.hud.ensure_hidden)
 
-        self.keyboard.type("This is an action")
+        self.keyboard.type("Hello")
         self.keyboard.press_and_release("Enter")
-
         self.assertThat(self.eval_expression_in_page_unsafe("return document.getElementById('content').style.display;"), NotEquals('none'))
 
     def test_clearActions(self):
@@ -72,7 +71,7 @@
 
         self.eval_expression_in_page_unsafe(expr)
 
-        actions = ['This is an action', 'Another action']
+        actions = ['Hello', 'Another action']
         for action in actions:
             self.unity.hud.ensure_visible()
             self.addCleanup(self.unity.hud.ensure_hidden)

=== modified file 'tests/integration/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py'
--- tests/integration/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py	2013-09-05 21:38:15 +0000
+++ tests/integration/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py	2014-04-22 15:41:19 +0000
@@ -30,46 +30,46 @@
         self.launch_with_html_filepath(self.get_html_test_file())
 
     def test_getUnityObjectFound(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject(1.0) != null;'), Eventually(NotEquals(None)))
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null'), Eventually(Equals(True)))
 
     def test_actionsApiFound(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject(1.0) != null;'), Eventually(NotEquals(None)))
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
 
         expression = """
-            var unity = window.external.getUnityObject(1.0);
-            return unity.addAction != null && unity.clearAction && unity.clearActions != null;
+            var unity = window.external.getUnityObject("1.0");
+            return unity.addAction != null && unity.clearActions != null && unity.clearAction != null;
         """
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(NotEquals(None)))
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(Equals(True)))
 
     def test_notificationApiFound(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject(1.0) != null;'), Eventually(NotEquals(None)))
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
 
         expression = """
-            var unity = window.external.getUnityObject(1.0);
+            var unity = window.external.getUnityObject("1.0");
             return unity.Notification != null && unity.Notification.showNotification != null;
         """
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(NotEquals(None)))
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(Equals(True)))
 
     def test_messagingIndicatorApiFound(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject(1.0) != null;'), Eventually(NotEquals(None)))
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
 
         expression = """
-            var unity = window.external.getUnityObject(1.0);
+            var unity = window.external.getUnityObject("1.0");
             return unity.MessagingIndicator != null &&
                 unity.MessagingIndicator.addAction != null &&
                 unity.MessagingIndicator.clearIndicator != null &&
                 unity.MessagingIndicator.clearIndicators != null &&
                 unity.MessagingIndicator.showIndicator != null;
         """
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(NotEquals(None)))
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(Equals(True)))
 
     def test_ubuntuReadyEventSent(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject(1.0) != null;'), Eventually(NotEquals(None)))
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
 
         expression = """
             var api_ready_count = window.localStorage['ubuntu-webapps-api-ready-key'];
             return api_ready_count != null && api_ready_count > 0;
         """
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(NotEquals(None)))
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(Equals(True)))
 
 

=== added file 'tests/unit/test_plugin/data/manifests/valid-with-ua-override.json'
--- tests/unit/test_plugin/data/manifests/valid-with-ua-override.json	1970-01-01 00:00:00 +0000
+++ tests/unit/test_plugin/data/manifests/valid-with-ua-override.json	2014-04-22 15:41:19 +0000
@@ -0,0 +1,15 @@
+{
+    "includes": ["http://www.bbc.co.uk/news/", "http://www.bbc.com/news/"],
+    "requires": ["utils.js"],
+    "name": "BBCNews",
+    "scripts": ["BBCNews.user.js"],
+    "maintainer": "Webapps Team <[e-mail]>",
+    "manifest-version": "1.0",
+    "integration-version": "2.3",
+    "package-name": "BBCNews",
+    "icons": {"128":"128/unity-webapps-bbc.png"},
+    "domain":"bbc.co.uk",
+    "homepage":"http://www.bbc.co.uk/news/",
+    "license":"GPL-3",
+    "user-agent-override": "My Override"
+}

=== modified file 'tests/unit/test_plugin/test_plugin.pro'
--- tests/unit/test_plugin/test_plugin.pro	2014-01-17 15:51:27 +0000
+++ tests/unit/test_plugin/test_plugin.pro	2014-04-22 15:41:19 +0000
@@ -42,7 +42,8 @@
 OTHER_FILES += \
     $$system(ls ./data/*/*) \
     $$system(ls ./data/*/*/*) \
-    $$system(ls *.sh)
+    $$system(ls *.sh) \
+    data/manifests/valid-with-ua-override.json
 
 # manually add the 'check' target
 check.depends = $${TARGET}

=== modified file 'tests/unit/test_plugin/tst_manifestParser.cpp'
--- tests/unit/test_plugin/tst_manifestParser.cpp	2014-01-17 15:51:27 +0000
+++ tests/unit/test_plugin/tst_manifestParser.cpp	2014-04-22 15:41:19 +0000
@@ -118,3 +118,11 @@
         verifyChrome(filename, result);
     }
 }
+
+void ManifestParserTest::testParseUserOverride()
+{
+    UnityWebappsAppManifestParser parser;
+    ManifestFileInfoOption result =
+            parser.parse(manifestsDataPath + "/valid-with-ua-override.json");
+    QVERIFY(result.value().userAgentOverride == "My Override");
+}

=== modified file 'tests/unit/test_plugin/tst_manifestParser.h'
--- tests/unit/test_plugin/tst_manifestParser.h	2014-01-17 15:51:27 +0000
+++ tests/unit/test_plugin/tst_manifestParser.h	2014-04-22 15:41:19 +0000
@@ -37,7 +37,7 @@
     // tests
     void testParseManifest();
     void testParseChromeOptions();
-
+    void testParseUserOverride();
 
 private:
 

=== modified file 'tests/unit/test_qml/tst_cleanup.qml'
--- tests/unit/test_qml/tst_cleanup.qml	2013-07-26 18:47:08 +0000
+++ tests/unit/test_qml/tst_cleanup.qml	2014-04-22 15:41:19 +0000
@@ -47,11 +47,10 @@
     function createWebAppsDispatcherWithSimpleBackend(mockedwebview) {
         var simple_backend = {This: { Is: { A: {Backend: function (args) { mockedWebView.called(args) } } } } };
 
-        var bindeeProxies = UnityWebAppsUtils.makeProxiesForQtWebViewBindee(mockedwebview);
-        return new UnityWebAppsJs.UnityWebApps(null,
-                                               bindeeProxies,
-                                               simple_backend,
-                                               []);
+        var bindeeProxies = UnityWebAppsUtils.makeProxiesForWebViewBindee(mockedwebview);
+        var bridge = new UnityWebAppsJs.UnityWebApps(null, bindeeProxies);
+        bridge.setBackends(simple_backend);
+        return bridge;
     }
 
     function test_cleanupOnce() {

=== modified file 'tests/unit/test_qml/tst_dispatch.qml'
--- tests/unit/test_qml/tst_dispatch.qml	2013-09-12 17:45:05 +0000
+++ tests/unit/test_qml/tst_dispatch.qml	2014-04-22 15:41:19 +0000
@@ -6,7 +6,7 @@
     name: "WebAppsDispatchTest"
 
     function setup() {
-        webapps.__reset();
+        webapps.__unbind();
         mockedWebView.disconnectAll();
     }
 
@@ -22,7 +22,6 @@
         webapps._opt_backendProxies = simple_backend;
         webapps.name = "test_properBackendDispatched";
         webapps.bindee = mockedWebView;
-        webapps.__bind(webapps.bindee, []);
 
         mockedWebView.messageReceived(UnityWebAppsUtils.formatUnityWebappsCall('This.Is.A.Backend', JSON.stringify([1, 2, "AAU"])));
 
@@ -51,7 +50,6 @@
         webapps._opt_backendProxies = simple_backend;
         webapps.name = "test_backendDispatchedWithProperArguments";
         webapps.bindee = mockedWebView;
-        webapps.__bind(webapps.bindee);
 
         mockedWebView.messageReceived(UnityWebAppsUtils.formatUnityWebappsCall('This.Is.A.Backend', JSON.stringify(params)));
 
@@ -70,7 +68,6 @@
         webapps._opt_backendProxies = invalid_backend;
         webapps.name = "test_invalidBackendNotDispatched";
         webapps.bindee = mockedWebView;
-        webapps.__bind(webapps.bindee);
 
         mockedWebView.messageReceived(UnityWebAppsUtils.formatUnityWebappsCall('This.Is.A.Backend', JSON.stringify([1, 2, "AAU"])));
 
@@ -100,7 +97,6 @@
         webapps._opt_backendProxies = backend;
         webapps.name = "test_callbacksAreWrapped";
         webapps.bindee = mockedWebView;
-        webapps.__bind(webapps.bindee);
 
         //We assume a bit about the implementation there ('callbackid')
         mockedWebView.messageReceived(UnityWebAppsUtils.formatUnityWebappsCall('This.Is.A.Backend', JSON.stringify([1, {'callbackid': 1}, "AAU"])));

=== modified file 'tests/unit/test_qml/tst_init.qml'
--- tests/unit/test_qml/tst_init.qml	2013-09-12 17:45:05 +0000
+++ tests/unit/test_qml/tst_init.qml	2014-04-22 15:41:19 +0000
@@ -6,7 +6,7 @@
     name: "WebAppsComponentInitTests"
 
     function setup() {
-        webapps.__reset();
+        webapps.__unbind();
         mockedWebView.disconnectAll();
     }
 
@@ -18,7 +18,6 @@
         spy.signalName = "injected";
 
         webapps.name = "test_nullInit";
-        webapps.__bind(webapps.bindee, []);
 
         compare(spy.count, 0, "Invalid (null) init call");
     }
@@ -32,7 +31,6 @@
 
         webapps.name = "test_initAndInjected";
         webapps.bindee = mockedWebView;
-        webapps.__bind(webapps.bindee, []);
 
         mockedWebView.loadingStarted();
 
@@ -48,7 +46,6 @@
 
         webapps.name = "test_initAndMessageHandlerAdded";
         webapps.bindee = mockedWebView;
-        webapps.__bind(webapps.bindee, []);
 
         compare(spy.count, 1, "WebApp message connected on load started");
     }
@@ -62,7 +59,6 @@
 
         webapps.name = "test_initWithNoName";
         webapps.bindee = mockedWebView;
-        webapps.__bind(webapps.bindee, []);
 
         compare(spy.count, 1, "WebApp message received connected");
     }

=== modified file 'tools/qml-launcher/qml-launcher.cpp'
--- tools/qml-launcher/qml-launcher.cpp	2014-01-17 15:51:27 +0000
+++ tools/qml-launcher/qml-launcher.cpp	2014-04-22 15:41:19 +0000
@@ -153,6 +153,9 @@
     if ( ! appid.isEmpty())
     {
         qputenv("APP_ID", appid.toLatin1());
+        QCoreApplication::setApplicationName(appid.toLatin1());
+
+        qDebug() << "Using:" << appid.toLatin1();
     }
 
     if ( ! inspector.isEmpty())