Merge lp:~abreu-alexandre/unity-webapps-qml/fix-issues-uncovered-by-qmlplugindump into lp:unity-webapps-qml

[Alexandre Abreu]

Fix issue with qmlplugindump using 100% cpu
Fix and expanded AP tests to properly test the installed webapps case

Fix issue with qmlplugindump using 100% cpu
Fix and expanded AP tests to properly test the installed webapps case

[lp:~abreu-alexandre/unity-webapps-qml/fix-issues-uncovered-by-qmlplugindump]

128. By Alexandre Abreu on 2014-07-08

update debian install file

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:128
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/136/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-amd64-ci/22/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-armhf-ci/22/console

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

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/unity-webapps-qml/fix-issues-uncovered-by-qmlplugindump]

129. By Alexandre Abreu on 2014-07-08

forgotten files

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:129
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/137/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-armhf-ci/23

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

review: Approve (continuous-integration)

=== modified file 'debian/unity-webapps-qml-autopilot.install'
--- debian/unity-webapps-qml-autopilot.install	2013-07-25 04:03:42 +0000
+++ debian/unity-webapps-qml-autopilot.install	2014-07-08 20:49:15 +0000
@@ -1,3 +1,4 @@
 tests/integration/autopilot/html/* usr/share/unity-webapps-qml/autopilot-tests/html/
+tests/integration/autopilot/data/* usr/share/unity-webapps-qml/autopilot-tests/data/
 tests/integration/autopilot/qml/* usr/share/unity-webapps-qml/autopilot-tests/qml/
 usr/lib/python*
 
=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-06-26 01:46:36 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-07-08 20:49:15 +0000
@@ -150,6 +150,15 @@
      */
     property var _opt_backendProxies: null
 
+    /*!
+      \qmlproperty string UnityWebApps::_opt_homepage
+
+      Used only for testing.
+      Allows an optional a homepage to be specified when running a local http server.
+
+     */
+    property string _opt_homepage: ""
+
 
     Settings {
         id: settings
@@ -325,6 +334,9 @@
             var idx = model.getWebappIndex(webappName);
             var homepage = model.data(idx, UbuntuUnityWebApps.UnityWebappsAppModel.Homepage);
 
+            if (!homepage || homepage.length === 0) {
+                homepage = _opt_homepage;
+            }
             console.debug('Requesting the bindee to navigate to homepage: ' + homepage);
 
             // We recreate a bindee object, but we call any function that requires
@@ -352,7 +364,7 @@
 
     Component.onCompleted: {
         if (model) {
-            model.modelChanged.connect(function() { __setupNamedWebappEnvironment() });
+            __setupNamedWebappEnvironment();
         }
     }
 
@@ -360,6 +372,12 @@
       \internal
 
      */
+    onModelChanged: model.modelContentChanged.connect(__setupNamedWebappEnvironment)
+
+    /*!
+      \internal
+
+     */
     onBindeeChanged: {
         // cleanup old refs & go
         webapps.__unbind();
 
=== modified file 'src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js'
--- src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2014-06-26 01:48:23 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2014-07-08 20:49:15 +0000
@@ -71,6 +71,10 @@
             return;
 
         var context = this.webview.context;
+        if (!context) {
+            console.error('No context found for the current Oxide webview. Cannot inject user scripts.');
+            return;
+        }
 
         for (var i = 0; i < userScriptUrls.length; ++i) {
             var scriptStart = "import com.canonical.Oxide 1.0 as Oxide; Oxide.UserScript { context:";
 
=== modified file 'src/Ubuntu/UnityWebApps/plugin/plugin.pro'
--- src/Ubuntu/UnityWebApps/plugin/plugin.pro	2014-03-25 20:56:01 +0000
+++ src/Ubuntu/UnityWebApps/plugin/plugin.pro	2014-07-08 20:49:15 +0000
@@ -35,7 +35,6 @@
     unity-webapps-api-mediaplayer.cpp \
     unity-webapps-app-model.cpp \
     unity-webapps-app-manifest-parser.cpp \
-    unity-webapps-app-model-filter-proxy.cpp \
     unity-webapps-app-infos.cpp \
     unity-webapps-desktop-infos.cpp \
     unity-webapps-icon-utils.cpp \
@@ -54,7 +53,6 @@
     unity-webapps-app-model.h \
     unity-webapps-app-manifest-parser.h \
     unity-webapps-common-priv.h \
-    unity-webapps-app-model-filter-proxy.h \
     unity-webapps-app-infos.h \
     unity-webapps-desktop-infos.h \
     unity-webapps-icon-utils.h \
 
=== modified file 'src/Ubuntu/UnityWebApps/plugin/qml-plugin.cpp'
--- src/Ubuntu/UnityWebApps/plugin/qml-plugin.cpp	2014-03-21 20:07:16 +0000
+++ src/Ubuntu/UnityWebApps/plugin/qml-plugin.cpp	2014-07-08 20:49:15 +0000
@@ -26,7 +26,6 @@
 #include "unity-webapps-api-messaging-menu.h"
 #include "unity-webapps-api-launcher.h"
 #include "unity-webapps-api-mediaplayer.h"
-#include "unity-webapps-app-model-filter-proxy.h"
 #include "unity-webapps-app-model.h"
 #include "unity-webapps-app-infos.h"
 
@@ -55,7 +54,6 @@
 
     // misc
     qmlRegisterType<UnityWebappsAppModel> (uri, 0, 1, "UnityWebappsAppModel");
-    qmlRegisterType<UnityWebappsAppModelFilterProxy> (uri, 0, 1, "UnityWebappsAppModelFilterProxy");
     qmlRegisterType<UnityWebappsCallback> (uri, 0, 1, "UnityWebappsCallback");
     qmlRegisterType<UnityWebappsAppInfos> (uri, 0, 1, "UnityWebappsAppInfos");
 
 
=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-infos.cpp'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-infos.cpp	2014-03-07 16:48:42 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-infos.cpp	2014-07-08 20:49:15 +0000
@@ -28,7 +28,8 @@
 
 
 UnityWebappsAppInfos::UnityWebappsAppInfos(QObject *parent)
-    : QObject(parent)
+    : QObject(parent),
+    _model(NULL)
 {}
 
 UnityWebappsAppInfos::~UnityWebappsAppInfos()
 
=== removed file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model-filter-proxy.cpp'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model-filter-proxy.cpp	2014-01-17 15:51:27 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model-filter-proxy.cpp	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-/*
- * 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/>.
- */
-
-#include "unity-webapps-app-model-filter-proxy.h"
-
-#include "unity-webapps-app-model.h"
-
-
-UnityWebappsAppModelFilterProxy::UnityWebappsAppModelFilterProxy(QObject *parent)
-    : QSortFilterProxyModel(parent)
-{}
-
-
-UnityWebappsAppModelFilterProxy::~UnityWebappsAppModelFilterProxy()
-{}
-
-
-UnityWebappsAppModel* UnityWebappsAppModelFilterProxy::sourceModel () const
-{
-    return sourceModel();
-}
-
-
-void UnityWebappsAppModelFilterProxy::setsourceModel (UnityWebappsAppModel * model)
-{
-    setSourceModel(model);
-
-    Q_EMIT sourceModelChanged();
-}
-
-
-QString UnityWebappsAppModelFilterProxy::webappName () const
-{
-    return _name;
-}
-
-
-void UnityWebappsAppModelFilterProxy::setwebappName (const QString& name)
-{
-    _name = name;
-
-    Q_EMIT webappNameChanged();
-}
-
-
-bool UnityWebappsAppModelFilterProxy::filterAcceptsRow(int source_row,
-                                                       const QModelIndex &source_parent) const
-{
-    if (_name.isEmpty() || !sourceModel())
-    {
-        // filter out everything
-        return false;
-    }
-
-    QString rowName =
-        sourceModel()->data(sourceModel()->index(source_row, 0, source_parent),
-                            UnityWebappsAppModel::Name).toString();
-
-    return 0 == _name.toLower().compare(rowName.toLower());
-}
-
 
=== removed file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model-filter-proxy.h'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model-filter-proxy.h	2014-01-17 15:51:27 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model-filter-proxy.h	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-/*
- * 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/>.
- */
-
-#if !defined(__UNITY_WEBAPPS_APP_MODEL_FILTER_PROXY_H__)
-#define __UNITY_WEBAPPS_APP_MODEL_FILTER_PROXY_H__
-
-// Qt
-#include <QHash>
-#include <QSharedPointer>
-#include <QSortFilterProxyModel>
-
-
-class UnityWebappsAppModel;
-
-/*!
- * \brief The UnityWebappsAppModelFilterProxy class
- */
-class UnityWebappsAppModelFilterProxy : public QSortFilterProxyModel
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString webappName READ webappName WRITE setwebappName NOTIFY webappNameChanged)
-    Q_PROPERTY(UnityWebappsAppModel * sourceModel READ sourceModel WRITE setsourceModel NOTIFY sourceModelChanged)
-
-
-public:
-    UnityWebappsAppModelFilterProxy(QObject *parent = 0);
-    virtual ~UnityWebappsAppModelFilterProxy();
-
-    /*!
-     * \brief webappName
-     * \return
-     */
-    QString webappName () const;
-
-    /*!
-     * \brief setwebappName
-     * \param name
-     */
-    void setwebappName (const QString& name);
-
-    /*!
-     * \brief sourceModel
-     * \return
-     */
-    UnityWebappsAppModel * sourceModel() const;
-
-    /*!
-     * \brief setSourceModel
-     * \param model
-     */
-    void setsourceModel(UnityWebappsAppModel * model);
-
-
-Q_SIGNALS:
-
-    void webappNameChanged () const;
-    void sourceModelChanged () const;
-
-
-protected:
-
-    // From QSortFilterProxyModel::filterAcceptsRow
-    bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const;
-
-
-private:
-
-    QString _name;
-};
-
-#endif // __UNITY_WEBAPPS_APP_MODEL_FILTER_PROXY_H__
 
=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp	2014-05-22 08:54:56 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp	2014-07-08 20:49:15 +0000
@@ -301,7 +301,7 @@
                    content);
     }
 
-    Q_EMIT modelChanged();
+    Q_EMIT modelContentChanged();
 }
 
 QString
 
=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.h'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.h	2014-05-22 08:54:56 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.h	2014-07-08 20:49:15 +0000
@@ -137,7 +137,7 @@
 Q_SIGNALS:
 
     void searchPathChanged(const QString & path);
-    void modelChanged();
+    void modelContentChanged();
 
 
 private Q_SLOTS:
 
=== modified file 'tests/integration/autopilot/autopilot.pro'
--- tests/integration/autopilot/autopilot.pro	2013-08-26 20:16:16 +0000
+++ tests/integration/autopilot/autopilot.pro	2014-07-08 20:49:15 +0000
@@ -5,5 +5,10 @@
     $$system(ls ./html/*) \
     $$system(ls ./unity_webapps_qml/emulators/*.py) \
     $$system(ls ./unity_webapps_qml/tests/*.py) \
-    $$system(ls ./data/installed-webapps/*)
-
+    $$system(ls ./unity_webapps_qml/*.py) \
+    $$system(ls ./data/*/*) \
+    unity_webapps_qml/tests/test_installedWebapp.py \
+    unity_webapps_qml/tests/fake_servers.py \
+    qml/WebviewBackendWebkit.qml \
+    qml/WebviewBackendOxide.qml \
+    qml/message-server.js
 
=== added directory 'tests/integration/autopilot/data'
=== added directory 'tests/integration/autopilot/data/all-in-same-folder'
=== added file 'tests/integration/autopilot/data/all-in-same-folder/script.user.js'
--- tests/integration/autopilot/data/all-in-same-folder/script.user.js	1970-01-01 00:00:00 +0000
+++ tests/integration/autopilot/data/all-in-same-folder/script.user.js	2014-07-08 20:49:15 +0000
@@ -0,0 +1,1 @@
+document.getElementById('content').innerHTML="WebApp Script Injected"
 
=== added file 'tests/integration/autopilot/data/all-in-same-folder/webapp-properties.json'
--- tests/integration/autopilot/data/all-in-same-folder/webapp-properties.json	1970-01-01 00:00:00 +0000
+++ tests/integration/autopilot/data/all-in-same-folder/webapp-properties.json	2014-07-08 20:49:15 +0000
@@ -0,0 +1,8 @@
+{
+    "includes": ["http://localhost:*/*"],
+    "name": "ExtendedWebappProperties",
+    "scripts": ["script.user.js"],
+    "domain":"",
+    "homepage":"",
+    "user-agent-override": "My Override"
+}
 
=== added directory 'tests/integration/autopilot/data/unity-webapps-normal'
=== added file 'tests/integration/autopilot/data/unity-webapps-normal/manifest.json'
--- tests/integration/autopilot/data/unity-webapps-normal/manifest.json	1970-01-01 00:00:00 +0000
+++ tests/integration/autopilot/data/unity-webapps-normal/manifest.json	2014-07-08 20:49:15 +0000
@@ -0,0 +1,7 @@
+{
+    "includes": ["http://localhost:*/*"],
+    "name": "Normal",
+    "scripts": ["script.user.js"],
+    "domain":"",
+    "homepage":""
+}
 
=== added file 'tests/integration/autopilot/data/unity-webapps-normal/script.user.js'
--- tests/integration/autopilot/data/unity-webapps-normal/script.user.js	1970-01-01 00:00:00 +0000
+++ tests/integration/autopilot/data/unity-webapps-normal/script.user.js	2014-07-08 20:49:15 +0000
@@ -0,0 +1,1 @@
+document.getElementById('content').innerHTML="WebApp Script Injected"
 
=== added directory 'tests/integration/autopilot/data/unity-webapps-with-altered-ua-string'
=== added file 'tests/integration/autopilot/data/unity-webapps-with-altered-ua-string/manifest.json'
--- tests/integration/autopilot/data/unity-webapps-with-altered-ua-string/manifest.json	1970-01-01 00:00:00 +0000
+++ tests/integration/autopilot/data/unity-webapps-with-altered-ua-string/manifest.json	2014-07-08 20:49:15 +0000
@@ -0,0 +1,8 @@
+{
+    "includes": ["http://localhost:*/*"],
+    "name": "AlteredUAWebapp",
+    "scripts": ["script.user.js"],
+    "domain":"",
+    "homepage":"",
+    "user-agent-override": "My Override"
+}
 
=== added file 'tests/integration/autopilot/data/unity-webapps-with-altered-ua-string/script.user.js'
--- tests/integration/autopilot/data/unity-webapps-with-altered-ua-string/script.user.js	1970-01-01 00:00:00 +0000
+++ tests/integration/autopilot/data/unity-webapps-with-altered-ua-string/script.user.js	2014-07-08 20:49:15 +0000
@@ -0,0 +1,1 @@
+document.getElementById('content').innerHTML="WebApp Script Injected"
 
=== modified file 'tests/integration/autopilot/qml/FullWebViewApp.qml'
--- tests/integration/autopilot/qml/FullWebViewApp.qml	2014-05-13 17:48:43 +0000
+++ tests/integration/autopilot/qml/FullWebViewApp.qml	2014-07-08 20:49:15 +0000
@@ -18,10 +18,9 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.0
-import QtWebKit 3.0
-import QtWebKit.experimental 1.0
 import Ubuntu.Unity.Action 1.0 as UnityActions
 import Ubuntu.UnityWebApps 0.1
+import "."
 
 import "dom-introspection-utils.js" as DomIntrospectionUtils
 
@@ -36,15 +35,25 @@
     signal resultUpdated(string message)
 
     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)); });
+        if (webView && webView.experimental) {
+            webView.experimental.evaluateJavaScript(DomIntrospectionUtils.wrapJsCommands(expr),
+                function(result) {
+                    console.log('Result: ' + result);
+                    root.resultUpdated(DomIntrospectionUtils.createResult(result));
+                });
+        }
+        else {
+            root.resultUpdated(DomIntrospectionUtils.createResult(webView.evaluateCode("return navigator.userAgent", true)))
+        }
     }
 
-    property alias url: webView.url
+    property var webView: null
+
+    property bool useOxide: false
+    property string url: ""
     property string webappName: ""
     property string webappSearchPath: ""
+    property string webappHomepage: ""
 
     UnityActions.ActionManager {
         localContexts: [webappsActionsContext]
@@ -54,21 +63,37 @@
         active: true
     }
 
-    WebView {
-        id: webView
-        objectName: "webview"
-
+    Loader {
+        id: webviewLoader
+        onLoaded: {
+            webView = webviewLoader.item
+        }
+    }
+
+    Component.onCompleted: {
+        var webviewSource = useOxide ?
+                    Qt.resolvedUrl("WebviewBackendOxide.qml")
+                  : Qt.resolvedUrl("WebviewBackendWebkit.qml");
+        var override =  webappName && webappModel.exists(webappName) ?
+                    webappModel.userAgentOverrideFor(webappName) : ""
+        webviewLoader.setSource(webviewSource,
+            { url: root.url,
+            localUserAgentOverride: override})
+    }
+
+    Loader {
+        id: unityWebappsComponentLoader
         anchors.fill: parent
-        width: parent.width
-        height: parent.height
-
-        experimental.userScripts: []
-        experimental.preferences.navigatorQtObjectEnabled: true
-        experimental.preferences.developerExtrasEnabled: true
-
-        function getUnityWebappsProxies() {
-            return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webView);
-        }
+        sourceComponent: webView !== null && webappName.length !== 0 ? unityWebappsComponent : null
+    }
+
+    UnityWebappsAppModel {
+        id: webappModel
+        searchPath: root.webappSearchPath
+    }
+
+    Component {
+        id: unityWebappsComponent
 
         UnityWebApps {
             id: webapps
@@ -76,8 +101,8 @@
             actionsContext: webappsActionsContext
             name: root.webappName
             bindee: webView
-            //searchPath: '/home/alex/dev/work/webapps/branches/webapps-qml/latest/examples/data/userscripts'
-            model: UnityWebappsAppModel { }
+            _opt_homepage: root.webappHomepage
+            model: webappModel
         }
     }
 }
 
=== added file 'tests/integration/autopilot/qml/WebviewBackendOxide.qml'
--- tests/integration/autopilot/qml/WebviewBackendOxide.qml	1970-01-01 00:00:00 +0000
+++ tests/integration/autopilot/qml/WebviewBackendOxide.qml	2014-07-08 20:49:15 +0000
@@ -0,0 +1,87 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide 1.0 as Oxide
+import Ubuntu.UnityWebApps 0.1
+
+Oxide.WebView {
+    id: webView
+    objectName: "webview"
+
+    property string localUserAgentOverride: ""
+
+    function _waitForResult(req, timeout) {
+      var result;
+      var error;
+      req.onreply = function(response) {
+          result = response;
+          error = 0;
+      };
+      req.onerror = function(error_code, msg) {
+          result = msg;
+          error = error_code;
+      };
+      webView._waitFor(function() { return error !== undefined; },
+                            timeout);
+
+      if (error > 0) {
+          console.error('Error:' + error + ', result:' + result)
+      } else if (error === 0) {
+          return result;
+      } else {
+          throw new Error("Message call timed out");
+      }
+    }
+
+    function _waitFor(predicate, timeout) {
+      timeout = timeout || 5000000;
+      var end = Date.now() + timeout;
+      var i = Date.now();
+      while (i < end && !predicate()) {
+          qtest_testResult.wait(50);
+          i = Date.now();
+      }
+      return predicate();
+    }
+
+    function evaluateCode(code, wrap) {
+      var value = webView._waitForResult(
+          webView.rootFrame.sendMessage(
+            "webview-oxide://test/",
+            "EVALUATE-CODE",
+            { code: code,
+              wrap: wrap === undefined ? false : wrap }));
+        return value ? value.result : undefined;
+    }
+
+    context: Oxide.WebContext {
+        userAgent: webView.localUserAgentOverride.length === 0 ? undefined : webView.localUserAgentOverride
+        userScripts: [
+            Oxide.UserScript {
+                context: "webview-oxide://test/"
+                url: Qt.resolvedUrl("message-server.js")
+                matchAllFrames: true
+            }
+        ]
+    }
+
+    function getUnityWebappsProxies() {
+        return UnityWebAppsUtils.makeProxiesForWebViewBindee(webView);
+    }
+
+    onJavaScriptConsoleMessage: {
+        var msg = "[JS] (%1:%2) %3".arg(sourceId).arg(lineNumber).arg(message)
+        if (level === Oxide.WebView.LogSeverityVerbose) {
+            console.log(msg)
+        } else if (level === Oxide.WebView.LogSeverityInfo) {
+            console.info(msg)
+        } else if (level === Oxide.WebView.LogSeverityWarning) {
+            console.warn(msg)
+        } else if ((level === Oxide.WebView.LogSeverityError) ||
+                   (level === Oxide.WebView.LogSeverityErrorReport) ||
+                   (level === Oxide.WebView.LogSeverityFatal)) {
+            console.error(msg)
+        }
+    }
+
+    TestResult { id: qtest_testResult }
+}
 
=== added file 'tests/integration/autopilot/qml/WebviewBackendWebkit.qml'
--- tests/integration/autopilot/qml/WebviewBackendWebkit.qml	1970-01-01 00:00:00 +0000
+++ tests/integration/autopilot/qml/WebviewBackendWebkit.qml	2014-07-08 20:49:15 +0000
@@ -0,0 +1,19 @@
+import QtQuick 2.0
+import QtWebKit 3.0
+import QtWebKit.experimental 1.0
+import Ubuntu.UnityWebApps 0.1
+
+WebView {
+    id: webView
+    objectName: "webview"
+
+    property string localUserAgentOverride: ""
+
+    experimental.userScripts: []
+    experimental.preferences.navigatorQtObjectEnabled: true
+    experimental.preferences.developerExtrasEnabled: true
+
+    function getUnityWebappsProxies() {
+        return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webView);
+    }
+}
 
=== added file 'tests/integration/autopilot/qml/message-server.js'
--- tests/integration/autopilot/qml/message-server.js	1970-01-01 00:00:00 +0000
+++ tests/integration/autopilot/qml/message-server.js	2014-07-08 20:49:15 +0000
@@ -0,0 +1,29 @@
+// Copyright (C) 2014 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
+
+oxide.addMessageHandler("EVALUATE-CODE", function(msg) {
+    var code = msg.args.code;
+    if (msg.args.wrap) {
+        code = "(function() {" + code + "})()";
+    }
+    try {
+        var result = eval(code);
+        msg.reply({result: result});
+    } catch(e) {
+        msg.error("Code threw exception: \"" + e + "\"");
+    }
+});
+
 
=== removed directory 'tests/integration/autopilot/unity_webapps_qml/emulators'
=== removed file 'tests/integration/autopilot/unity_webapps_qml/emulators/__init__.py'
--- tests/integration/autopilot/unity_webapps_qml/emulators/__init__.py	2013-06-17 14:46:51 +0000
+++ tests/integration/autopilot/unity_webapps_qml/emulators/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
 
=== modified file 'tests/integration/autopilot/unity_webapps_qml/tests/__init__.py'
--- tests/integration/autopilot/unity_webapps_qml/tests/__init__.py	2014-04-22 15:40:04 +0000
+++ tests/integration/autopilot/unity_webapps_qml/tests/__init__.py	2014-07-08 20:49:15 +0000
@@ -15,62 +15,86 @@
 
 from testtools.matchers import Contains, Equals, GreaterThan
 from autopilot.matchers import Eventually
+from unity_webapps_qml.tests import fake_servers
 
 from unity.emulators.unity import Unity
 
 from unity.tests import UnityTestCase
 
+LOCAL_QML_LAUNCHER_APP_PATH = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../../../../tools/qml-launcher/unity-webapps-qml-launcher')
+INSTALLED_QML_LAUNCHER_APP_PATH = 'unity-webapps-qml-launcher'
+
+# TODO create __init__.py.in
+LOCAL_BROWSER_CONTAINER_PATH = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../qml/FullWebViewApp.qml')
+INSTALLED_BROWSER_CONTAINER_PATH = '/usr/share/unity-webapps-qml/autopilot-tests/qml/FullWebViewApp.qml'
+
+BASE_URL = ''
+
 class UnityWebappsTestCaseBase(UnityTestCase):
-    LOCAL_QML_LAUNCHER_APP_PATH = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../../../../tools/qml-launcher/unity-webapps-qml-launcher')
-    INSTALLED_QML_LAUNCHER_APP_PATH = 'unity-webapps-qml-launcher'
-
-    # TODO create __init__.py.in
-    LOCAL_BROWSER_CONTAINER_PATH = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../qml/FullWebViewApp.qml')
-    INSTALLED_BROWSER_CONTAINER_PATH = '/usr/share/unity-webapps-qml/autopilot-tests/qml/FullWebViewApp.qml'
-
-    BASE_URL = ''
+    def setUp(self):
+        super(UnityWebappsTestCaseBase, self).setUp()
+        self.use_oxide = False
+
+    def tearDown(self):
+        super(UnityWebappsTestCaseBase, self).tearDown()
 
     def create_file_url(self, path):
         return 'file://' + path
 
     def get_qml_browser_container_path(self):
-        if os.path.exists(self.LOCAL_BROWSER_CONTAINER_PATH):
-            return self.LOCAL_BROWSER_CONTAINER_PATH
-        return self.INSTALLED_BROWSER_CONTAINER_PATH
+        if os.path.exists(LOCAL_BROWSER_CONTAINER_PATH):
+            return LOCAL_BROWSER_CONTAINER_PATH
+        return INSTALLED_BROWSER_CONTAINER_PATH
 
     def get_qml_launcher_path(self):
-        if os.path.exists(self.LOCAL_QML_LAUNCHER_APP_PATH):
-            return self.LOCAL_QML_LAUNCHER_APP_PATH
-        return self.INSTALLED_QML_LAUNCHER_APP_PATH
-
-    def get_launch_params(self, url):
-        base_params = ['--qml=' + self.get_qml_browser_container_path(), '--url=' + url, '--app-id=unitywebappsqmllauncher', '--webappName=unitywebappsqmllauncher']
-        if os.path.exists(self.LOCAL_QML_LAUNCHER_APP_PATH):
+        if os.path.exists(LOCAL_QML_LAUNCHER_APP_PATH):
+            return LOCAL_QML_LAUNCHER_APP_PATH
+        return INSTALLED_QML_LAUNCHER_APP_PATH
+
+    def get_launch_params(self,
+                          url,
+                          webapp_name='unitywebappsqmllauncher',
+                          webapp_search_path="",
+                          webapp_homepage="",
+                          use_oxide=False):
+        base_params = ['--qml=' + self.get_qml_browser_container_path(),
+            '--app-id=' + webapp_name,
+            '--webappName=' + webapp_name,
+            '--webappSearchPath=' + webapp_search_path]
+
+        if len(webapp_homepage) != 0:
+            base_params.append('--webappHomepage=' + webapp_homepage)
+
+        if len(url) != 0:
+            base_params.append('--url=' + url)
+
+        if use_oxide:
+            base_params.append('--useOxide')
+
+        if os.path.exists(LOCAL_QML_LAUNCHER_APP_PATH):
             # we are local
-            base_params.append('--import=' + os.path.join (os.path.dirname(os.path.realpath(__file__)), '../../../../../src'))
+            base_params.append('--import=' + os.path.join (os.path.dirname(os.path.realpath(__file__)),
+                               '../../../../../src'))
+
         return base_params
 
     def launch_with_html_filepath(self, html_filepath):
         self.assertThat(os.path.exists(html_filepath), Equals(True))
-
         url = self.create_file_url(html_filepath)
-        params = self.get_launch_params(url)
-
-        print 'Launching test with params:', params
+
+        self.launch_application(self.get_launch_params(url))
+        self.assert_url_eventually_loaded(url)
+
+    def launch_application(self, args):
+        print 'Launching test with params:', args, "with", self.get_qml_launcher_path()
+
         self.app = self.launch_test_application(self.get_qml_launcher_path(),
-            *params,
+            *args,
             app_type='qt')
 
-        self.assert_url_eventually_loaded(url)
         self.webviewContainer = self.get_webviewContainer()
         self.watcher = self.webviewContainer.watch_signal('resultUpdated(QString)')
 
-    def setUp(self):
-        super(UnityWebappsTestCaseBase, self).setUp()
-
-    def tearDown(self):
-        super(UnityWebappsTestCaseBase, self).tearDown()
-
     def pick_app_launcher(self, app_path):
         # force Qt app introspection:
         from autopilot.introspection.qt import QtApplicationLauncher
@@ -99,3 +123,14 @@
         results = json.loads(webview.get_signal_emissions('resultUpdated(QString)')[-1][0])
         return results.has_key('result') and results['result'] or None
 
+class WebappsTestCaseBaseWithLocalHttpContentBase(UnityWebappsTestCaseBase):
+    def setUp(self):
+        super(WebappsTestCaseBaseWithLocalHttpContentBase, self).setUp()
+        self.http_server = fake_servers.WebappsQmlContentHttpServer()
+        self.addCleanup(self.http_server.shutdown)
+        self.base_url = "http://localhost:{}/".format(self.http_server.port)
+
+    def launch_with_webapp(self, name, webapp_search_path, use_oxide=False):
+        self.use_oxide = use_oxide
+        self.launch_application(self.get_launch_params("", name, webapp_search_path, self.base_url, use_oxide))
+        self.assert_url_eventually_loaded(self.base_url)
 
=== added file 'tests/integration/autopilot/unity_webapps_qml/tests/fake_servers.py'
--- tests/integration/autopilot/unity_webapps_qml/tests/fake_servers.py	1970-01-01 00:00:00 +0000
+++ tests/integration/autopilot/unity_webapps_qml/tests/fake_servers.py	2014-07-08 20:49:15 +0000
@@ -0,0 +1,70 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2014 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# 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/>.
+
+""" Autopilot tests for the unity_webapps_qml package """
+
+import BaseHTTPServer
+import logging
+import threading
+
+
+class RequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+    def serve_content(self, content, mime_type='text/html'):
+        self.send_header('Content-type', mime_type)
+        self.end_headers()
+        self.wfile.write(content.encode())
+
+    def basic_html_content(self):
+        return """
+<html>
+<head>
+<title>Some content</title>
+</head>
+<body>
+<div id='content'>
+This is some content
+</div>
+</body>
+</html>
+        """
+
+    def do_GET(self):
+        if self.path == '/':
+            self.send_response(200)
+            self.serve_content(self.basic_html_content())
+        else:
+            self.send_error(404)
+
+
+class WebappsQmlContentHttpServer(object):
+    def __init__(self):
+        super(WebappsQmlContentHttpServer, self).__init__()
+        self.server = BaseHTTPServer.HTTPServer(("", 0), RequestHandler)
+        self.server.allow_reuse_address = True
+        self.server_thread = threading.Thread(target=self.server.serve_forever)
+        self.server_thread.start()
+        logging.info("now serving on port {}".format(self.server.server_port))
+
+    @property
+    def port(self):
+        return self.server.server_port
+
+    def run(self):
+        self.server.serve_forever()
+
+    def shutdown(self):
+        self.server.shutdown()
+        self.server.server_close()
+        self.server_thread.join()
 
=== added file 'tests/integration/autopilot/unity_webapps_qml/tests/test_installedWebapp.py'
--- tests/integration/autopilot/unity_webapps_qml/tests/test_installedWebapp.py	1970-01-01 00:00:00 +0000
+++ tests/integration/autopilot/unity_webapps_qml/tests/test_installedWebapp.py	2014-07-08 20:49:15 +0000
@@ -0,0 +1,59 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2013 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+
+from __future__ import absolute_import
+
+import time
+import os
+
+from testtools.matchers import Equals, GreaterThan, NotEquals
+from autopilot.matchers import Eventually
+
+from unity_webapps_qml.tests import WebappsTestCaseBaseWithLocalHttpContentBase
+
+LOCAL_HTML_TEST_FILE = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../data')
+INSTALLED_HTML_TEST_FILE = '/usr/share/unity-webapps-qml/autopilot-tests/data'
+
+class InstalledWebappsTestCaseBase(WebappsTestCaseBaseWithLocalHttpContentBase):
+    def setUp(self):
+        super(InstalledWebappsTestCaseBase, self).setUp()
+
+    def get_webapp_install_folder(self):
+        if os.path.exists(LOCAL_HTML_TEST_FILE):
+            return os.path.abspath(LOCAL_HTML_TEST_FILE)
+        return INSTALLED_HTML_TEST_FILE
+
+    def test_normalWebappFound(self):
+        self.launch_with_webapp('Normal', self.get_webapp_install_folder())
+
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
+
+        expression = """
+            var contentElement = document.getElementById('content');
+            return contentElement.innerHTML;
+        """
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(Equals("WebApp Script Injected")))
+
+    def test_webappWithUAOverrideFound(self):
+        self.launch_with_webapp('AlteredUAWebapp', self.get_webapp_install_folder(), True)
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return navigator.userAgent;'), Eventually(Equals("My Override")))
+
+    def test_webappFoundWithSpecialWebappPropertiesFile(self):
+        self.launch_with_webapp('ExtendedWebappProperties', self.get_webapp_install_folder() + '/all-in-same-folder')
+
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
+
+        expression = """
+            var contentElement = document.getElementById('content');
+            return contentElement.innerHTML;
+        """
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(Equals("WebApp Script Injected")))
+
+    def test_webappPropertiesFileWithUA(self):
+        self.launch_with_webapp('ExtendedWebappProperties', self.get_webapp_install_folder() + '/all-in-same-folder', True)
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return navigator.userAgent;'), Eventually(Equals("My Override")))
+
 
=== removed file 'tests/integration/test-server.py'
--- tests/integration/test-server.py	2013-05-29 15:03:32 +0000
+++ tests/integration/test-server.py	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/usr/bin/env python
-
-import SocketServer
-import SimpleHTTPServer
-import urllib
-
-PORT = 8181
-
-class Proxy(SimpleHTTPServer.SimpleHTTPRequestHandler):
-    def do_GET(self):
-        if self.path == '/':
-            self.path = '/unity-integration.html'
-        return SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self)
-
-httpd = SocketServer.TCPServer(('0.0.0.0', PORT), Proxy)
-print "serving at port", PORT
-httpd.serve_forever()
-
 
=== modified file 'tools/qml-launcher/qml-launcher.cpp'
--- tools/qml-launcher/qml-launcher.cpp	2014-04-22 15:40:04 +0000
+++ tools/qml-launcher/qml-launcher.cpp	2014-07-08 20:49:15 +0000
@@ -68,6 +68,7 @@
     const QString QML_FILE_IMPORT_ARG_HEADER = "--import=";
     const QString QML_APP_ID_ARG_HEADER = "--app-id=";
     const QString QML_INSPECTOR_ARG_HEADER = "--inspector=";
+    const QString QML_USE_OXIDE_ARG_HEADER = "--useOxide";
     const QString ARG_HEADER = "--";
     const QString VALUE_HEADER = "=";
     QHash<QString, QString> properties;
@@ -75,6 +76,7 @@
     QString appid;
     QString importPath;
     QString inspector;
+    bool useOxide = false;
     bool maximized = false;
 
     Q_FOREACH(QString argument, app.arguments())
@@ -99,6 +101,11 @@
             inspector = argument.right(argument.count() - QML_INSPECTOR_ARG_HEADER.count());
         }
         else
+        if (argument.contains(QML_USE_OXIDE_ARG_HEADER))
+        {
+            useOxide = true;
+        }
+        else
         if (argument.contains(QML_MAXIMIZED_ARG))
         {
             maximized = true;
@@ -169,7 +176,7 @@
     QQmlContext *context = new QQmlContext(engine.rootContext());
 
     QQmlComponent component(&engine, qmlfile);
-    QObject *object = component.create(context);
+    QObject *object = component.beginCreate(context);
 
     if (!component.isReady()) {
         qWarning() << component.errorString();
@@ -192,6 +199,12 @@
         object->setProperty(it.key().toStdString().c_str(), QUrl(it.value()));
     }
 
+    if (useOxide) {
+        object->setProperty("useOxide", true);
+    }
+
+    component.completeCreate();
+
     if (window)
     {
         if (maximized)