Merge lp:~abreu-alexandre/unity-webapps-qml/fix-local-script-handling into lp:unity-webapps-qml

[Alexandre Abreu]

When using a webapp-properties file for an unamed webapp the user script does not get injected.

When using a webapp-properties file for an unamed webapp the user script does not get injected.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-11-22 00:43:42 +0000
+++ debian/control	2015-01-09 15:55:30 +0000
@@ -28,7 +28,7 @@
 
 Package: unity-webapps-qml
 Architecture: any
-Depends: liboxideqt-qmlplugin (>= 1.2.0) | qml-module-qtwebkit,
+Depends: liboxideqt-qmlplugin (>= 1.3.0) | qml-module-qtwebkit,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-unity-action-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.js'
--- src/Ubuntu/UnityWebApps/UnityWebApps.js	2014-11-21 21:12:26 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.js	2015-01-09 15:55:30 +0000
@@ -40,7 +40,6 @@
         this._injected_unity_api_path = injected_api_path;
         this._bindeeProxies = bindeeProxies;
         this._backends = null;
-        this._userscripts = [];
         this._accessPolicy = accessPolicy;
         this._callbackManager = UnityWebAppsUtils.makeCallbackManager();
 
@@ -50,16 +49,22 @@
     _UnityWebApps.prototype = {
 
         cleanup: function() {
-            if (this._bindeeProxies.cleanup && typeof(this._bindeeProxies.cleanup) == 'function')
+            if (this._bindeeProxies.cleanup
+                    && typeof(this._bindeeProxies.cleanup) == 'function') {
                 this._bindeeProxies.cleanup();
+            }
         },
 
         proxies: function() {
             return this._bindeeProxies;
         },
 
-        setUserScriptsToInject: function(userscripts) {
-            this._userscripts = userscripts;
+        injectWebappUserScripts: function(userscripts) {
+            if (this._bindeeProxies) {
+                this._bindeeProxies.injectUserScripts(
+                         userscripts.map(function(script) {
+                             return Qt.resolvedUrl(script); }));
+            }
         },
 
         setBackends: function(backends) {
@@ -75,24 +80,18 @@
             var cb = this._onMessageReceivedCallback.bind(self);
             self._bindeeProxies.messageReceivedConnect(cb);
 
-            this._onLoadingStartedCallback();
+            this._injectCoreBindingUserScripts();
         },
 
         /**
          * \internal
          *
          */
-        _onLoadingStartedCallback: function () {
-            var scripts = [this._injected_unity_api_path];
-            for(var i = 0; i < this._userscripts.length; ++i) {
-                scripts.push(Qt.resolvedUrl(this._userscripts[i]));
+        _injectCoreBindingUserScripts: function () {
+            if (this._bindeeProxies) {
+                this._bindeeProxies.injectUserScripts(
+                         [Qt.resolvedUrl(this._injected_unity_api_path)]);
             }
-
-            for (i = 0; i < scripts.length; ++i)
-                console.debug('Injecting webapps script[' + i + '] : '
-                              + scripts[i]);
-
-            this._bindeeProxies.injectUserScripts(scripts);
         },
 
         /**

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-11-25 19:38:40 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2015-01-09 15:55:30 +0000
@@ -234,7 +234,7 @@
                     __getPolicyForContent(settings),
                     customClientApiFileUrl && customClientApiFileUrl.length !== 0
                       ? customClientApiFileUrl
-                      : Qt.resolvedUrl('unity-webapps-api.js'));
+                      : 'unity-webapps-api.js');
 
         internal.instance = instance;
 
@@ -374,7 +374,7 @@
         if (__isValidWebAppForModel(name)) {
             if (internal.instance) {
                 var userScripts = __gatherWebAppUserscriptsIfAny(name);
-                internal.instance.setUserScriptsToInject(userScripts);
+                internal.instance.injectWebappUserScripts(userScripts);
             }
             __navigateToWebappHomepageInBindee(name);
         }

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js'
--- src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2014-11-22 00:43:42 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2015-01-09 15:55:30 +0000
@@ -63,14 +63,12 @@
     this.webview = webview;
     this.disposer = disposer;
     this.makeSignalDisconnecter = makeSignalDisconnecter;
-    this._userScriptInjected = false;
     this._WEBAPPS_USER_SCRIPT_CONTEXT = "oxide://main-world";
+    this._injectedUserScripts = [];
+    this._scriptMessageReceivedHandler = null;
 }
 OxideWebviewAdapter.prototype = {
     injectUserScripts: function(userScriptUrls) {
-        if (this._userScriptInjected)
-            return;
-
         var context = this.webview.context;
         if (!context) {
             console.error('No context found for the current Oxide webview. Cannot inject user scripts.');
@@ -78,25 +76,33 @@
         }
 
         for (var i = 0; i < userScriptUrls.length; ++i) {
-            var scriptStart = "import com.canonical.Oxide 1.0 as Oxide; Oxide.UserScript { context:";
+            var script = userScriptUrls[i];
+            if (this._injectedUserScripts.some(
+                        function(e) { return e === script; })) {
+                console.log('Skipping already injected script: ' + script)
+                continue;
+            }
+
+            var scriptStart = "import com.canonical.Oxide 1.0 as Oxide; \
+Oxide.UserScript { ";
             var scriptEnd = " }";
-            var statement = scriptStart +
-                    '"' +
-                    this._WEBAPPS_USER_SCRIPT_CONTEXT +
-                    '"' +
-                    '; matchAllFrames: false; emulateGreasemonkey: true; url: "' +
-                    userScriptUrls[i] +
-                    '";'
+            var statement = scriptStart
+                    + 'context: "' +   this._WEBAPPS_USER_SCRIPT_CONTEXT + '";'
+                    + 'matchAllFrames: false;'
+                    + 'emulateGreasemonkey: true;'
+                    + 'url: "' + script + '";'
                     + scriptEnd;
 
-            context.addUserScript(Qt.createQmlObject(statement, this.webview));
+            context.addUserScript(
+                        Qt.createQmlObject(statement, this.webview));
         }
-
-        this._userScriptInjected = true;
+        this._injectedUserScripts.push(script);
     },
     sendToPage: function (message) {
         this.webview.rootFrame.sendMessageNoReply(
-                 this._WEBAPPS_USER_SCRIPT_CONTEXT, "UnityWebappApi-Host-Message", JSON.parse(message));
+                 this._WEBAPPS_USER_SCRIPT_CONTEXT,
+                 "UnityWebappApi-Host-Message",
+                 JSON.parse(message));
     },
     loadingStartedConnect: function (onLoadingStarted) {
         function handler(loadEvent) {
@@ -109,17 +115,24 @@
         this.disposer.addDisposer(this.makeSignalDisconnecter(this.webview.loadingChanged, handler));
     },
     messageReceivedConnect: function (onMessageReceived) {
-        function handler(msg, frame) {
+        function _handler(msg, frame) {
             onMessageReceived(msg.args);
         }
 
-        var script = 'import com.canonical.Oxide 1.0 as Oxide; ' +
-                ' Oxide.ScriptMessageHandler { msgId: "UnityWebappApi-Message"; contexts: ["' +
-                this._WEBAPPS_USER_SCRIPT_CONTEXT +
-                '"]; ' +
-                '}';
-        var messageHandler = Qt.createQmlObject(script, this.webview);
-        messageHandler.callback = handler;
+        if ( ! this._scriptMessageReceivedHandler) {
+            var script = 'import com.canonical.Oxide 1.0 as Oxide; ' +
+            ' Oxide.ScriptMessageHandler { '
+                + 'msgId: "UnityWebappApi-Message"; '
+                + 'contexts: ["' + this._WEBAPPS_USER_SCRIPT_CONTEXT + '"]; ' +
+            '}';
+            this._scriptMessageReceivedHandler =
+                 Qt.createQmlObject(script, this.webview);
+        }
+
+        this._scriptMessageReceivedHandler.callback = _handler;
+    },
+    cleanupAdapterInternals: function() {
+        this._scriptMessageReceivedHandler.callback = function() {};
     }
 }
 
@@ -203,6 +216,11 @@
         // called from the UnityWebApps side
         proxy.cleanup = function() {
             disposer.disposeAndCleanupAll();
+
+            if (this.cleanupAdapterInternals
+                    && typeof(this.cleanupAdapterInternals) === "function") {
+                this.cleanupAdapterInternals();
+            }
         };
 
         return proxy;

=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp	2014-11-25 14:54:02 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp	2015-01-09 15:55:30 +0000
@@ -198,8 +198,6 @@
         QFileInfo manifestFileInfo =
                 installationDir.absolutePath() + QDir::separator() + manifestFileName;
         if ( ! manifestFileInfo.isFile()) {
-            qDebug() << "Skipping" << manifestFileName << "as a webapp definition search: "
-                     << manifestFileInfo.absoluteFilePath();
             continue;
         }
 
@@ -347,7 +345,6 @@
             installationSearchPath + QDir::separator() + _commonScriptsDirName;
     READ_USER_SCRIPT(requires,COMMON_BASE_PATH);
     READ_USER_SCRIPT(scripts,userscriptPath.absolutePath());
-
     return script;
 }
 

=== modified file 'tests/autopilot/data/all-in-same-folder/script.user.js'
--- tests/autopilot/data/all-in-same-folder/script.user.js	2014-07-08 20:49:12 +0000
+++ tests/autopilot/data/all-in-same-folder/script.user.js	2015-01-09 15:55:30 +0000
@@ -1,1 +1,3 @@
-document.getElementById('content').innerHTML="WebApp Script Injected"
+window.onload = function() {
+    document.getElementById('content').innerHTML="WebApp Script Injected"
+}

=== modified file 'tests/autopilot/data/all-in-same-folder/webapp-properties.json'
--- tests/autopilot/data/all-in-same-folder/webapp-properties.json	2014-07-08 20:49:12 +0000
+++ tests/autopilot/data/all-in-same-folder/webapp-properties.json	2015-01-09 15:55:30 +0000
@@ -1,8 +1,8 @@
 {
-    "includes": ["http://localhost:*/*"],
+    "includes": ["http://www.test.com/*"],
     "name": "ExtendedWebappProperties",
     "scripts": ["script.user.js"],
     "domain":"",
-    "homepage":"",
+    "homepage":"http://www.test.com/",
     "user-agent-override": "My Override"
 }

=== modified file 'tests/autopilot/data/unity-webapps-normal/manifest.json'
--- tests/autopilot/data/unity-webapps-normal/manifest.json	2014-07-08 20:49:12 +0000
+++ tests/autopilot/data/unity-webapps-normal/manifest.json	2015-01-09 15:55:30 +0000
@@ -1,7 +1,9 @@
 {
-    "includes": ["http://localhost:*/*"],
     "name": "Normal",
-    "scripts": ["script.user.js"],
-    "domain":"",
-    "homepage":""
+    "domain": "test.com",
+    "homepage": "http://www.test.com/",
+    "includes": [
+        "http://www.test.com/*"
+    ],
+    "scripts": [ "script.user.js" ]
 }

=== modified file 'tests/autopilot/data/unity-webapps-normal/script.user.js'
--- tests/autopilot/data/unity-webapps-normal/script.user.js	2014-07-08 20:49:12 +0000
+++ tests/autopilot/data/unity-webapps-normal/script.user.js	2015-01-09 15:55:30 +0000
@@ -1,1 +1,3 @@
-document.getElementById('content').innerHTML="WebApp Script Injected"
+window.onload = function() {
+    document.getElementById('content').innerHTML="WebApp Script Injected"
+}

=== modified file 'tests/autopilot/data/unity-webapps-with-altered-ua-string/manifest.json'
--- tests/autopilot/data/unity-webapps-with-altered-ua-string/manifest.json	2014-07-08 20:49:12 +0000
+++ tests/autopilot/data/unity-webapps-with-altered-ua-string/manifest.json	2015-01-09 15:55:30 +0000
@@ -1,8 +1,8 @@
 {
-    "includes": ["http://localhost:*/*"],
+    "includes": ["http://www.test.com/*"],
     "name": "AlteredUAWebapp",
     "scripts": ["script.user.js"],
-    "domain":"",
-    "homepage":"",
+    "domain":"test.com",
+    "homepage":"http://www.test.com/",
     "user-agent-override": "My Override"
 }

=== modified file 'tests/autopilot/data/unity-webapps-with-altered-ua-string/script.user.js'
--- tests/autopilot/data/unity-webapps-with-altered-ua-string/script.user.js	2014-07-08 20:49:12 +0000
+++ tests/autopilot/data/unity-webapps-with-altered-ua-string/script.user.js	2015-01-09 15:55:30 +0000
@@ -1,1 +1,3 @@
-document.getElementById('content').innerHTML="WebApp Script Injected"
+window.onload = function() {
+    document.getElementById('content').innerHTML="WebApp Script Injected"
+}

=== modified file 'tests/autopilot/qml/FullWebViewApp.qml'
--- tests/autopilot/qml/FullWebViewApp.qml	2014-11-19 20:23:07 +0000
+++ tests/autopilot/qml/FullWebViewApp.qml	2015-01-09 15:55:30 +0000
@@ -35,7 +35,8 @@
     signal resultUpdated(string message)
 
     function evalInPageUnsafe(expr) {
-        return webView.evaluateCode(expr, true);
+        var val = webView.evaluateCode(expr, true);
+        resultUpdated(DomIntrospectionUtils.createResult(val))
     }
 
     property string url: ""

=== modified file 'tests/autopilot/qml/WebviewBackendOxide.qml'
--- tests/autopilot/qml/WebviewBackendOxide.qml	2014-11-21 21:12:26 +0000
+++ tests/autopilot/qml/WebviewBackendOxide.qml	2015-01-09 15:55:30 +0000
@@ -1,9 +1,10 @@
 import QtQuick 2.0
 import QtTest 1.0
 import com.canonical.Oxide 1.0 as Oxide
+import Ubuntu.Web 0.2
 import Ubuntu.UnityWebApps 0.1
 
-Oxide.WebView {
+WebView {
     id: webView
     objectName: "webview"
 
@@ -56,7 +57,7 @@
         return value ? value.result : undefined;
     }
 
-    context: Oxide.WebContext {
+    context: WebContext {
         userAgent: webView.localUserAgentOverride.length === 0
                    ? "" : webView.localUserAgentOverride
         userScripts: [

=== modified file 'tests/autopilot/unity_webapps_qml/tests/__init__.py'
--- tests/autopilot/unity_webapps_qml/tests/__init__.py	2014-11-19 20:23:07 +0000
+++ tests/autopilot/unity_webapps_qml/tests/__init__.py	2015-01-09 15:55:30 +0000
@@ -8,9 +8,10 @@
 """unity-webapps-qml autopilot tests."""
 
 import os
+import json
 import os.path
 
-from testtools.matchers import Equals
+from testtools.matchers import Equals, GreaterThan
 from autopilot.matchers import Eventually
 from unity_webapps_qml.tests import fake_servers
 
@@ -80,9 +81,9 @@
             # we are local
             base_params.append(
                 '--import={}'.format(
-                    os.path.join(os.path.dirname(os.path.realpath(__file__))),
-                    '../../../../src'))
-
+                    os.path.join(
+                        os.path.dirname(os.path.realpath(__file__)),
+                        '../../../../src')))
         base_params += extra_params
 
         return base_params
@@ -101,7 +102,11 @@
                 extra_params))
         self.assert_url_eventually_loaded(url)
 
-    def launch_application(self, args):
+    def launch_application(self, args, envvars={}):
+        if envvars:
+            for envvar_key in envvars:
+                self.patch_environment(envvar_key, envvars[envvar_key])
+
         self.app = self.launch_test_application(
             self.get_qml_launcher_path(),
             *args,
@@ -133,17 +138,37 @@
 
     def eval_expression_in_page_unsafe(self, expr):
         webview = self.get_webviewContainer()
-        return webview.slots.evalInPageUnsafe(expr)
+        p = self.watcher.num_emissions
+        webview.slots.evalInPageUnsafe(expr)
+        self.assertThat(
+            lambda: self.watcher.num_emissions,
+            Eventually(GreaterThan(p)))
+        results = json.loads(
+            webview.get_signal_emissions(
+                'resultUpdated(QString)')[-1][0])
+        return 'result' in results and results['result'] or None
 
 
 class WebappsTestCaseBaseWithLocalHttpContentBase(UnityWebappsTestCaseBase):
+    BASE_URL_SCHEME = 'http://'
+
     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.base_url = "{}localhost:{}".format(
+            self.BASE_URL_SCHEME, self.http_server.port)
+
+    def get_base_url_hostname(self):
+        return self.base_url[len(self.BASE_URL_SCHEME):]
+
+    def launch_with_webapp(
+            self,
+            name,
+            webapp_search_path,
+            envvars={},
+            use_oxide=False,
+            expected_homepage=''):
         self.use_oxide = use_oxide
         self.launch_application(
             self.get_launch_params(
@@ -151,5 +176,10 @@
                 name,
                 webapp_search_path,
                 self.base_url,
-                use_oxide))
-        self.assert_url_eventually_loaded(self.base_url)
+                use_oxide),
+            envvars)
+
+        url = self.base_url
+        if expected_homepage:
+            url = expected_homepage
+        self.assert_url_eventually_loaded(url)

=== modified file 'tests/autopilot/unity_webapps_qml/tests/test_installedWebapp.py'
--- tests/autopilot/unity_webapps_qml/tests/test_installedWebapp.py	2014-11-19 20:23:07 +0000
+++ tests/autopilot/unity_webapps_qml/tests/test_installedWebapp.py	2015-01-09 15:55:30 +0000
@@ -33,7 +33,13 @@
         return INSTALLED_HTML_TEST_FILE
 
     def test_normalWebappFound(self):
-        self.launch_with_webapp('Normal', self.get_webapp_install_folder())
+        rule = 'MAP *.test.com:80 ' + self.get_base_url_hostname()
+        self.launch_with_webapp(
+            'Normal',
+            self.get_webapp_install_folder(),
+            {'UBUNTU_WEBVIEW_HOST_MAPPING_RULES': rule},
+            False,
+            'http://www.test.com/')
 
         self.assertThat(
             lambda: self.eval_expression_in_page_unsafe(
@@ -49,18 +55,26 @@
             Eventually(Equals("WebApp Script Injected")))
 
     def test_webappWithUAOverrideFound(self):
+        rule = 'MAP *.test.com:80 ' + self.get_base_url_hostname()
         self.launch_with_webapp(
             'AlteredUAWebapp',
-            self.get_webapp_install_folder(), True)
+            self.get_webapp_install_folder(),
+            {'UBUNTU_WEBVIEW_HOST_MAPPING_RULES': rule},
+            True,
+            'http://www.test.com/')
         self.assertThat(
             lambda: self.eval_expression_in_page_unsafe(
                 'return navigator.userAgent;'),
             Eventually(Equals("My Override")))
 
     def test_webappFoundWithSpecialWebappPropertiesFile(self):
+        rule = 'MAP *.test.com:80 ' + self.get_base_url_hostname()
         self.launch_with_webapp(
             'ExtendedWebappProperties',
-            self.get_webapp_install_folder() + '/all-in-same-folder')
+            self.get_webapp_install_folder() + '/all-in-same-folder',
+            {'UBUNTU_WEBVIEW_HOST_MAPPING_RULES': rule},
+            False,
+            'http://www.test.com/')
 
         self.assertThat(
             lambda: self.eval_expression_in_page_unsafe(
@@ -76,18 +90,26 @@
             Eventually(Equals("WebApp Script Injected")))
 
     def test_webappPropertiesFileWithUA(self):
+        rule = 'MAP *.test.com:80 ' + self.get_base_url_hostname()
         self.launch_with_webapp(
             'ExtendedWebappProperties',
-            self.get_webapp_install_folder() + '/all-in-same-folder', True)
+            self.get_webapp_install_folder() + '/all-in-same-folder',
+            {'UBUNTU_WEBVIEW_HOST_MAPPING_RULES': rule},
+            True,
+            'http://www.test.com/')
         self.assertThat(
             lambda: self.eval_expression_in_page_unsafe(
                 'return navigator.userAgent;'),
             Eventually(Equals("My Override")))
 
     def test_webappPropertiesNameUpdated(self):
+        rule = 'MAP *.test.com:80 ' + self.get_base_url_hostname()
         self.launch_with_webapp(
             '',
-            self.get_webapp_install_folder() + '/all-in-same-folder')
+            self.get_webapp_install_folder() + '/all-in-same-folder',
+            {'UBUNTU_WEBVIEW_HOST_MAPPING_RULES': rule},
+            False,
+            'http://www.test.com/')
         self.assertThat(
             lambda: self.eval_expression_in_page_unsafe(
                 'return window.external.getUnityObject("1.0") != null;'),

=== modified file 'tests/autopilot/unity_webapps_qml/tests/test_launcher.py'
--- tests/autopilot/unity_webapps_qml/tests/test_launcher.py	2014-11-19 20:23:07 +0000
+++ tests/autopilot/unity_webapps_qml/tests/test_launcher.py	2015-01-09 15:55:30 +0000
@@ -7,8 +7,6 @@
 
 import os
 
-from gi.repository import Unity
-
 from testtools.matchers import Equals, NotEquals
 from testtools import skipUnless
 
@@ -38,13 +36,14 @@
 
     @skipUnless(platform.model() == 'Desktop', "Only runs on the Desktop")
     def test_checkCounts(self):
+        from gi.repository import Unity
         self.assertThat(
             lambda: self.eval_expression_in_page_unsafe(
                 "return document.getElementById('status').innerHTML;"),
             Eventually(Equals('launcher-updated')))
 
-        launcher_icon = self.unity.launcher.model.get_icon(
-            desktop_id='unitywebappsqmllauncher.desktop')
+        launcher_icon = Unity.LauncherEntry.get_for_desktop_id(
+            'unitywebappsqmllauncher.desktop')
         self.assertThat(launcher_icon, NotEquals(None))
 
         expr = """
@@ -70,17 +69,20 @@
                 "return document.getElementById('status').innerHTML;"),
             Eventually(Equals('42')))
 
-        # self.assertThat(launcher.get_property('progress'), Equals(0.09375))
+#        self.assertThat(
+#            lambda: launcher_icon.get_property("count"),
+#            Eventually(Equals(42)))
 
     @skipUnless(platform.model() == 'Desktop', "Only runs on the Desktop")
     def test_checkProgress(self):
+        from gi.repository import Unity
         self.assertThat(
             lambda: self.eval_expression_in_page_unsafe(
                 "return document.getElementById('status').innerHTML;"),
             Eventually(Equals('launcher-updated')))
 
-        launcher_icon = self.unity.launcher.model.get_icon(
-            desktop_id='unitywebappsqmllauncher.desktop')
+        launcher_icon = Unity.LauncherEntry.get_for_desktop_id(
+            'unitywebappsqmllauncher.desktop')
         self.assertThat(launcher_icon, NotEquals(None))
 
         expr = """

=== modified file 'tests/autopilot/unity_webapps_qml/tests/test_mediaplayer.py'
--- tests/autopilot/unity_webapps_qml/tests/test_mediaplayer.py	2014-11-19 20:23:07 +0000
+++ tests/autopilot/unity_webapps_qml/tests/test_mediaplayer.py	2015-01-09 15:55:30 +0000
@@ -7,8 +7,6 @@
 
 import os
 
-from gi.repository import Unity
-
 from testtools.matchers import Equals
 from testtools import skipUnless