Merge lp:~abreu-alexandre/ubuntu-html5-theme/rtm-content-picker-ui-fix into lp:ubuntu-html5-theme/rtm-14.09

[Alexandre Abreu]

re-parent the UnityWebappsBindings so that the content picker UI call can properly overlay the content

re-parent the UnityWebappsBindings so that the content picker UI call can properly overlay the content

[lp:~abreu-alexandre/ubuntu-html5-theme/rtm-content-picker-ui-fix]

189. By Alexandre Abreu on 2015-03-30

remove old qml

190. By Alexandre Abreu on 2015-04-01

Add AP tests

191. By Alexandre Abreu on 2015-04-02

add content hub deps

=== modified file 'debian/control'
--- debian/control	2015-03-06 15:00:25 +0000
+++ debian/control	2015-04-02 17:06:45 +0000
@@ -102,6 +102,7 @@
          qml-module-qtwebkit,
          qtdeclarative5-qtquick2-plugin,
          ubuntu-html5-container (>= ${binary:Version}),
+         qtdeclarative5-ubuntu-content1,
          ${misc:Depends},
          ${python:Depends},
 Description: Autopilot tests for the Ubuntu HTML5 QML container component for HTML5 touch apps.

=== removed file 'src/ubuntu-html5-app-launcher/UbuntuJavascriptBindings.qml'
--- src/ubuntu-html5-app-launcher/UbuntuJavascriptBindings.qml	2015-02-12 18:07:26 +0000
+++ src/ubuntu-html5-app-launcher/UbuntuJavascriptBindings.qml	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This file is part of ubuntu-html5-container.
- *
- * ubuntu-html5-container 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.
- *
- * webbrowser-app 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 Ubuntu.UnityWebApps 0.1
-
-
-Item {
-    id: root
-
-    property var bindingMainWebview: null
-
-    /*!
-      \internal
-     */
-    function getUnityWebappsProxies() {
-        return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(bindingMainWebview);
-    }
-
-    /*!
-      \internal
-     */
-    Loader {
-        id: webappBindingsLoader
-        visible: false
-        anchors.fill: parent
-        sourceComponent: bindingMainWebview ? webappBindingsComponent : undefined
-    }
-
-    /*!
-      \internal
-     */
-    Component {
-        id: webappBindingsComponent
-
-        UnityWebApps {
-            id: webapps
-            bindee: root
-            injectExtraUbuntuApis: true
-            requiresInit: false
-        }
-    }
-}
-

=== modified file 'src/ubuntu-html5-app-launcher/main.qml'
--- src/ubuntu-html5-app-launcher/main.qml	2015-02-12 18:20:03 +0000
+++ src/ubuntu-html5-app-launcher/main.qml	2015-04-02 17:06:45 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components 1.0
 import Ubuntu.Components.Extras.Browser 0.1
 import QtWebKit.experimental 1.0
+import Ubuntu.UnityWebApps 0.1
 
 MainView {
     id: root
@@ -30,66 +31,88 @@
     anchorToKeyboard: true
     automaticOrientation: true
 
-    Timer {
-        id: checkTimer
-        running: true
-        repeat: false
-        onTriggered: {
-            webviewComponentLoader.sourceComponent =
-                    webviewComponent
-            checkTimer.stop()
-        }
-        interval: 100
-    }
-
     Page {
-        anchors.fill: parent
+        id: page
+
+        title: ""
+
+        Timer {
+            id: checkTimer
+            running: true
+            repeat: false
+            onTriggered: {
+                webviewComponentLoader.sourceComponent = webviewComponent
+                checkTimer.stop()
+            }
+            interval: 100
+        }
+
         Loader {
             id: webviewComponentLoader
             anchors.fill: parent
-            onLoaded: {
-                bindings.bindingMainWebview =
-                        webviewComponentLoader.item;
-            }
-        }
-    }
-
-    Component {
-        id: webviewComponent
-
-        UbuntuWebView {
-            maximumFlickVelocity: height * 5
-
-            url: HtmlIndexDirectory !== "" ? ('file://' + HtmlIndexDirectory + '/index.html') : ""
-
-            experimental.preferences.localStorageEnabled: true
-            experimental.preferences.offlineWebApplicationCacheEnabled: true
-            experimental.preferences.universalAccessFromFileURLsAllowed: true
-            experimental.preferences.webGLEnabled: true
-
-            experimental.databaseQuotaDialog: Item {
-                Timer {
-                    interval: 1
-                    running: true
-                    onTriggered: {
-                        model.accept(model.expectedUsage)
-                    }
-                }
-            }
-
-            // port in QTWEBKIT_INSPECTOR_SERVER enviroment variable
-            experimental.preferences.developerExtrasEnabled: true
-
-            onNewTabRequested: {
-                if (url.toString().indexOf("file://") !== 0) {
-                    Qt.openUrlExternally(url.toString())
-                    return
-                }
-            }
-        }
-    }
-
-    UbuntuJavascriptBindings {
-        id: bindings
+            onLoaded: webappsComponentLoader.sourceComponent = webappsComponent
+        }
+
+        Component {
+            id: webviewComponent
+
+            UbuntuWebView {
+                objectName: 'webview'
+                maximumFlickVelocity: height * 5
+
+                experimental.preferences.localStorageEnabled: true
+                experimental.preferences.offlineWebApplicationCacheEnabled: true
+                experimental.preferences.universalAccessFromFileURLsAllowed: true
+                experimental.preferences.webGLEnabled: true
+
+                experimental.databaseQuotaDialog: Item {
+                    Timer {
+                        interval: 1
+                        running: true
+                        onTriggered: {
+                            model.accept(model.expectedUsage)
+                        }
+                    }
+                }
+
+                // port in QTWEBKIT_INSPECTOR_SERVER enviroment variable
+                experimental.preferences.developerExtrasEnabled: true
+
+                onNewTabRequested: {
+                    if (url.toString().indexOf("file://") !== 0) {
+                        Qt.openUrlExternally(url.toString())
+                        return
+                    }
+                }
+            }
+        }
+
+        function getUnityWebappsProxies() {
+            return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(
+                        webviewComponentLoader.item);
+        }
+
+        Loader {
+            id: webappsComponentLoader
+            anchors.fill: parent
+            onLoaded: webviewComponentLoader.sourceComponent = webviewComponent
+        }
+
+        Component {
+            id: webappsComponent
+
+            UnityWebApps {
+                id: webapps
+                bindee: page
+                injectExtraUbuntuApis: true
+                requiresInit: false
+
+                Component.onCompleted: {
+                    webviewComponentLoader.item.url =
+                            HtmlIndexDirectory !== "" ?
+                                ('file://' + HtmlIndexDirectory + '/index.html') : ""
+                }
+            }
+        }
     }
 }

=== modified file 'tests/autopilot/ubuntu_html5_container/tests/__init__.py'
--- tests/autopilot/ubuntu_html5_container/tests/__init__.py	2014-12-08 18:08:39 +0000
+++ tests/autopilot/ubuntu_html5_container/tests/__init__.py	2015-04-02 17:06:45 +0000
@@ -12,8 +12,11 @@
 
 LAUNCHER_EXEC_NAME = 'ubuntu-html5-app-launcher'
 
-LOCAL_LAUNCHER_PATH = os.path.abspath("%s/%s" % (os.path.dirname(os.path.realpath(__file__))
-                                        , '../../../../src/ubuntu-html5-app-launcher/' + LAUNCHER_EXEC_NAME))
+LOCAL_LAUNCHER_PATH = os.path.abspath(
+    "%s/%s" % (
+        os.path.dirname(
+            os.path.realpath(__file__))
+        , '../../../../src/ubuntu-html5-app-launcher/' + LAUNCHER_EXEC_NAME))
 INSTALLED_LAUNCHER_PATH = '/usr/bin/' + LAUNCHER_EXEC_NAME
 
 
@@ -35,7 +38,11 @@
 
     def launch_with_argument(self, args):
         try:
-            self.app = self.launch_test_application(self.get_launcher_path(), args)
+            self.app = self.launch_test_application(
+                self.get_launcher_path(),
+                args,
+                app_type='qt')
         except Exception, e:
+            print e
             pass
 

=== modified file 'tests/autopilot/ubuntu_html5_container/tests/test_appLaunch.py'
--- tests/autopilot/ubuntu_html5_container/tests/test_appLaunch.py	2014-12-08 18:08:39 +0000
+++ tests/autopilot/ubuntu_html5_container/tests/test_appLaunch.py	2015-04-02 17:06:45 +0000
@@ -7,7 +7,7 @@
 
 from __future__ import absolute_import
 
-from testtools.matchers import Equals
+from testtools.matchers import Equals, NotEquals
 
 from ubuntu_html5_container.tests import UbuntuHtml5LauncherTestCase
 
@@ -16,7 +16,7 @@
     def setUp(self):
         super(UbuntuHtml5LauncherAppLaunchTestCase, self).setUp()
 
-    def test_launcherFailsWithNoWWW(self):
+    def test_launcherSucceedsWithNoWWW(self):
         self.launch_with_argument('')
-        self.assertThat(self.get_app(), Equals(None))
+        self.assertThat(self.get_app(), NotEquals(None))
 

=== added file 'tests/autopilot/ubuntu_html5_container/tests/test_contentPickerLaunch.py'
--- tests/autopilot/ubuntu_html5_container/tests/test_contentPickerLaunch.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_html5_container/tests/test_contentPickerLaunch.py	2015-04-02 17:06:45 +0000
@@ -0,0 +1,57 @@
+# -*- 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 Lesser General Public License version 3, as published
+# by the Free Software Foundation.
+
+from __future__ import absolute_import
+
+import os
+
+from testtools.matchers import Equals, NotEquals
+from autopilot.matchers import Eventually
+
+from ubuntu_html5_container.tests import UbuntuHtml5LauncherTestCase
+import ubuntuuitoolkit as uitk
+
+LOCAL_HTML_EXAMPLES_PATH = os.path.abspath(
+    "%s/%s" % (
+        os.path.dirname(
+            os.path.realpath(__file__)),
+        '../../../../tests'))
+INSTALLED_HTML_EXAMPLES_PATH = '/usr/share/ubuntu-html5-ui-toolkit/tests/'
+
+    
+class UbuntuHtml5LauncherAppLaunchTestCase(UbuntuHtml5LauncherTestCase):
+    def setUp(self):
+        self.pointing_device = uitk.get_pointing_device()
+        super(UbuntuHtml5LauncherAppLaunchTestCase, self).setUp()
+
+    def get_webviewContainer(self):
+        return self.app.select_single(objectName="webview")
+
+    def get_base_path(self):
+        if os.path.exists(LOCAL_HTML_EXAMPLES_PATH):
+            return LOCAL_HTML_EXAMPLES_PATH
+        else:
+            return INSTALLED_HTML_EXAMPLES_PATH
+
+    def get_local_html_url(self, html_filename):
+        return self.get_base_path() + '/data/html/' + html_filename
+
+    def test_contentPickerIsLaunched(self):
+        print self.get_local_html_url('test-content-picker-launch')
+        self.launch_with_argument(
+            '--www=' + self.get_local_html_url('test-content-picker-launch'))
+        self.assertThat(self.get_app(), NotEquals(None))
+        self.assertThat(
+            lambda: self.get_webviewContainer(),
+            Eventually(NotEquals(None)))
+        self.pointing_device.click_object(
+            self.get_webviewContainer())
+        self.assertThat(
+            lambda: len(self.get_app().select_many(
+                'ContentPeerPicker10')),
+            Eventually(NotEquals(0)))
+

=== added directory 'tests/data/html/test-content-picker-launch'
=== added file 'tests/data/html/test-content-picker-launch/index.html'
--- tests/data/html/test-content-picker-launch/index.html	1970-01-01 00:00:00 +0000
+++ tests/data/html/test-content-picker-launch/index.html	2015-04-02 17:06:45 +0000
@@ -0,0 +1,66 @@
+<!--
+ Copyright (C) 2013 Adnane Belmadiaf <[e-mail]>
+
+ This file is part of ubuntu-html5-ui-toolkit.
+
+ This package 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 3 of the 
+ License, or
+ (at your option) any later version.
+ 
+ This package 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 Lesser General Public 
+ License along with this program. If not, see 
+ <http://www.gnu.org/licenses/>.
+-->
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="copyright" content="Adnane Belmadiaf <[e-mail]>">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <title>Ubuntu UI HTML5: Application Template</title>
+
+    <script>
+
+      window.onload = function () {
+          document.addEventListener('click', doContentPeerPicking);
+
+      function doContentPeerPicking() {
+        var api = external.getUnityObject('1.0');
+        var hub = api.ContentHub;
+
+        var transferState = hub.ContentTransfer.State;
+        var pictureContentType = hub.ContentType.Pictures;
+document.getElementById('result').innerHTML = 'hub.launchContentPeerPicker'
+        hub.launchContentPeerPicker(
+            {
+                contentType: hub.ContentType.Pictures,
+                handler: hub.ContentHandler.Source,
+            },
+            function(peer) { },
+            function() { }
+        );
+    };
+      };
+    </script>
+
+</head>
+
+<body>
+<div style="height: 100%; width: 100%">
+            <div>
+              Start Content Peer picking to import content:
+            </div>
+            <div id="result">
+            </div>
+</div>
+</body>
+
+</html>