Merge lp:~osomon/webbrowser-app/geolocation-permission into lp:webbrowser-app

[Olivier Tilloy]

Re-enable the geolocation permission request dialog, now that it is implemented in oxide.
Fix it in the webkit-based webapp container.

[Olivier Tilloy (osomon)]

Note: this requires a recent version of oxide (≥ bzr revision 548), not released yet as of now.

[lp:~osomon/webbrowser-app/geolocation-permission]

531. By Olivier Tilloy on 2014-06-18

Add autopilot tests.

532. By Olivier Tilloy on 2014-06-18

Updated translation template.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:530
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/875/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/981
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/887
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/74
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/74/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1366
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1747
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1747/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8564
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/765
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1029
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1029/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/875/rebuild

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/geolocation-permission]

533. By Olivier Tilloy on 2014-06-18

Merge the latest changes from trunk and resolve a conflict.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:532
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/876/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/995
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/896
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/75
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/75/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1379
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1765
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1765/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8579
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/773
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1038
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1038/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/876/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:533
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/878/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1005
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/906
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/77
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/77/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1389
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1775
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1775/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8590
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/782
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1048
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1048/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/878/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'po/webbrowser-app.pot'
--- po/webbrowser-app.pot	2014-05-27 09:37:45 +0000
+++ po/webbrowser-app.pot	2014-06-18 13:57:31 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: webbrowser-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-06 16:25+0100\n"
+"POT-Creation-Date: 2014-06-18 10:33+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -89,7 +89,7 @@
 msgid "Forward"
 msgstr ""
 
-#: src/app/Chrome.qml:127 src/app/webbrowser/ActivityView.qml:36
+#: src/app/Chrome.qml:126 src/app/webbrowser/ActivityView.qml:36
 msgid "Activity"
 msgstr ""
 
@@ -120,14 +120,22 @@
 msgid "Please choose a file"
 msgstr ""
 
+#: src/app/GeolocationPermissionRequest.qml:28
 #: src/app/PermissionRequest.qml:28
 msgid "Permission Request"
 msgstr ""
 
+#: src/app/GeolocationPermissionRequest.qml:29
+#: src/app/webcontainer/WebViewImplWebkit.qml:69
+msgid "This page wants to know your device’s location."
+msgstr ""
+
+#: src/app/GeolocationPermissionRequest.qml:33
 #: src/app/PermissionRequest.qml:31
 msgid "Deny"
 msgstr ""
 
+#: src/app/GeolocationPermissionRequest.qml:43
 #: src/app/PermissionRequest.qml:40
 msgid "Allow"
 msgstr ""
@@ -246,39 +254,39 @@
 msgid "Currently viewing (%1)"
 msgstr ""
 
-#: src/app/webbrowser/TabsList.qml:68
+#: src/app/webbrowser/TabsList.qml:69
 msgid "+"
 msgstr ""
 
-#: src/app/webbrowser/TimelineView.qml:84
+#: src/app/webbrowser/TimelineView.qml:87
 msgid "Today"
 msgstr ""
 
-#: src/app/webbrowser/TimelineView.qml:86
+#: src/app/webbrowser/TimelineView.qml:89
 msgid "Yesterday"
 msgstr ""
 
-#: src/app/webbrowser/TimelineView.qml:88
+#: src/app/webbrowser/TimelineView.qml:91
 msgid "Last 7 Days"
 msgstr ""
 
-#: src/app/webbrowser/TimelineView.qml:90
+#: src/app/webbrowser/TimelineView.qml:93
 msgid "This Month"
 msgstr ""
 
-#: src/app/webbrowser/TimelineView.qml:92
+#: src/app/webbrowser/TimelineView.qml:95
 msgid "This Year"
 msgstr ""
 
-#: src/app/webbrowser/TimelineView.qml:94
+#: src/app/webbrowser/TimelineView.qml:97
 msgid "Older"
 msgstr ""
 
-#: src/app/webbrowser/TimelineView.qml:277
+#: src/app/webbrowser/TimelineView.qml:287
 msgid "(local files)"
 msgstr ""
 
-#: src/app/webbrowser/TimelineView.qml:279
+#: src/app/webbrowser/TimelineView.qml:289
 msgid "(other)"
 msgstr ""
 
@@ -296,13 +304,13 @@
 
 #. TRANSLATORS: %1 refers to the current page’s title
 #: src/app/webbrowser/webbrowser-app.qml:35
-#: src/app/webcontainer/webapp-container.qml:47
+#: src/app/webcontainer/webapp-container.qml:54
 #, qt-format
 msgid "%1 - Ubuntu Web Browser"
 msgstr ""
 
 #: src/app/webbrowser/webbrowser-app.qml:37
-#: src/app/webcontainer/webapp-container.qml:49
+#: src/app/webcontainer/webapp-container.qml:56
 msgid "Ubuntu Web Browser"
 msgstr ""
 
@@ -321,7 +329,3 @@
 #: src/app/webcontainer/AccountsView.qml:38
 msgid "Select an account"
 msgstr ""
-
-#: src/app/webcontainer/WebViewImplWebkit.qml:63
-msgid "This page wants to know your device’s location."
-msgstr ""

=== added file 'src/app/GeolocationPermissionRequest.qml'
--- src/app/GeolocationPermissionRequest.qml	1970-01-01 00:00:00 +0000
+++ src/app/GeolocationPermissionRequest.qml	2014-06-18 13:57:31 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+Dialog {
+    id: dialog
+
+    property QtObject request: null
+
+    title: i18n.tr("Permission Request")
+    text: i18n.tr("This page wants to know your device’s location.")
+
+    Button {
+        objectName: "deny"
+        text: i18n.tr("Deny")
+        color: UbuntuColors.warmGrey
+        onClicked: {
+            request.deny()
+            PopupUtils.close(dialog)
+        }
+    }
+
+    Button {
+        objectName: "allow"
+        text: i18n.tr("Allow")
+        color: UbuntuColors.orange
+        onClicked: {
+            request.accept()
+            PopupUtils.close(dialog)
+        }
+    }
+}

=== modified file 'src/app/WebViewImpl.qml'
--- src/app/WebViewImpl.qml	2014-05-29 15:30:11 +0000
+++ src/app/WebViewImpl.qml	2014-06-18 13:57:31 +0000
@@ -17,9 +17,9 @@
  */
 
 import QtQuick 2.0
-//import Ubuntu.Components 0.1
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
 import Ubuntu.Web 0.2
-//import Ubuntu.Components.Popups 0.1
 //import "actions" as Actions
 
 WebView {
@@ -48,18 +48,13 @@
         }
     }*/
 
-    /*experimental.onPermissionRequested: {
-        if (permission.type === PermissionRequest.Geolocation) {
-            if (webview.toolbar) {
-                webview.toolbar.close()
-            }
-            var text = i18n.tr("This page wants to know your device’s location.")
-            PopupUtils.open(Qt.resolvedUrl("PermissionRequest.qml"),
-                            webview.currentWebview,
-                            {"permission": permission, "text": text})
+    onGeolocationPermissionRequested: {
+        if (webview.toolbar) {
+            webview.toolbar.close()
         }
-        // TODO: handle other types of permission requests
+        PopupUtils.open(Qt.resolvedUrl("GeolocationPermissionRequest.qml"),
+                        webview.currentWebview, {"request": request})
         // TODO: we might want to store the answer to avoid requesting
         //       the permission everytime the user visits this site.
-    }*/
+    }
 }

=== modified file 'src/app/webcontainer/WebViewImplWebkit.qml'
--- src/app/webcontainer/WebViewImplWebkit.qml	2014-06-09 19:47:56 +0000
+++ src/app/webcontainer/WebViewImplWebkit.qml	2014-06-18 13:57:31 +0000
@@ -67,7 +67,7 @@
                 webview.toolbar.close()
             }
             var text = i18n.tr("This page wants to know your device’s location.")
-            PopupUtils.open(Qt.resolvedUrl("PermissionRequest.qml"),
+            PopupUtils.open(Qt.resolvedUrl("../PermissionRequest.qml"),
                             webview.currentWebview,
                             {"permission": permission, "text": text})
         }

=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
--- tests/autopilot/webbrowser_app/emulators/browser.py	2014-06-11 11:12:14 +0000
+++ tests/autopilot/webbrowser_app/emulators/browser.py	2014-06-18 13:57:31 +0000
@@ -103,3 +103,6 @@
         tabs = view.select_many("PageDelegate", objectName="openTabDelegate")
         tabs.sort(key=lambda tab: tab.x)
         return tabs
+
+    def get_geolocation_dialog(self):
+        return self.wait_select_single("GeolocationPermissionRequest")

=== modified file 'tests/autopilot/webbrowser_app/tests/http_server.py'
--- tests/autopilot/webbrowser_app/tests/http_server.py	2014-06-11 11:12:14 +0000
+++ tests/autopilot/webbrowser_app/tests/http_server.py	2014-06-18 13:57:31 +0000
@@ -115,6 +115,12 @@
             html += '} else { document.webkitExitFullscreen(); } });'
             html += '</script></html>'
             self.send_html(html)
+        elif self.path == "/geolocation":
+            self.send_response(200)
+            html = '<html><body><script>'
+            html += 'navigator.geolocation.getCurrentPosition('
+            html += 'function r(p) {});</script></body></html>'
+            self.send_html(html)
         else:
             self.send_error(404)
 

=== added file 'tests/autopilot/webbrowser_app/tests/test_geolocation.py'
--- tests/autopilot/webbrowser_app/tests/test_geolocation.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/webbrowser_app/tests/test_geolocation.py	2014-06-18 13:57:31 +0000
@@ -0,0 +1,39 @@
+# -*- 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/>.
+
+from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
+
+
+class TestGeolocation(StartOpenRemotePageTestCaseBase):
+
+    def setUp(self):
+        super(TestGeolocation, self).setUp()
+        url = self.base_url + "/geolocation"
+        self.go_to_url(url)
+        self.assert_page_eventually_loaded(url)
+        self.dialog = self.main_window.get_geolocation_dialog()
+
+    def tearDown(self):
+        self.dialog.wait_until_destroyed()
+        super(TestGeolocation, self).tearDown()
+
+    def test_geolocation_deny(self):
+        button = self.dialog.select_single("Button", objectName="deny")
+        self.pointing_device.click_object(button)
+
+    def test_geolocation_accept(self):
+        button = self.dialog.select_single("Button", objectName="allow")
+        self.pointing_device.click_object(button)