Merge lp:~abreu-alexandre/webbrowser-app/fix-webapp-name-handling into lp:webbrowser-app

[Alexandre Abreu]

Fix webapp name logic

Fix webapp name logic

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1091
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1991/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3412/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/745/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/745/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/745/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3409/console

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

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/webbrowser-app/fix-webapp-name-handling]

1095. By CI Train Bot Account on 2015-07-15

Resync trunk.

1096. By Launchpad Translations on behalf of phablet-team on 2015-07-16

Launchpad automatic translations update.

1097. By Launchpad Translations on behalf of phablet-team on 2015-07-17

Launchpad automatic translations update.

1098. By Launchpad Translations on behalf of phablet-team on 2015-07-21

Launchpad automatic translations update.

1099. By Launchpad Translations on behalf of phablet-team on 2015-07-22

Launchpad automatic translations update.

1100. By Launchpad Translations on behalf of phablet-team on 2015-07-23

Launchpad automatic translations update.

1101. By Launchpad Translations on behalf of phablet-team on 2015-07-24

Launchpad automatic translations update.

1102. By Launchpad Translations on behalf of phablet-team on 2015-07-26

Launchpad automatic translations update.

1103. By Launchpad Translations on behalf of phablet-team on 2015-07-28

Launchpad automatic translations update.

1104. By Olivier Tilloy on 2015-07-28

Fix narrowing conversion that makes the build fail with GCC 5. Fixes: #1475621
Approved by: Alexandre Abreu, PS Jenkins bot

1105. By CI Train Bot Account on 2015-07-28

Releasing 0.23+15.10.20150728-0ubuntu1

1106. By Launchpad Translations on behalf of phablet-team on 2015-07-29

Launchpad automatic translations update.

1107. By Olivier Tilloy on 2015-07-29

When clearing browsing data, confirm action with a dialog, to give the user a chance to cancel it. Fixes: #1471747
Approved by: PS Jenkins bot, Riccardo Padovani

1108. By Olivier Tilloy on 2015-07-29

Ensure a value is always returned by BookmarksModel::addFolder(…).
Approved by: PS Jenkins bot

1109. By Olivier Tilloy on 2015-07-29

Update icon, per UI specification. Fixes: #1412732
Approved by: PS Jenkins bot, Riccardo Padovani

1110. By CI Train Bot Account on 2015-07-29

Releasing 0.23+15.10.20150729-0ubuntu1

1111. By CI Train Bot Account on 2015-07-30

Resync trunk.

1112. By Launchpad Translations on behalf of phablet-team on 2015-07-31

Launchpad automatic translations update.

1113. By Olivier Tilloy on 2015-07-31

Update translation template.

1114. By Launchpad Translations on behalf of phablet-team on 2015-08-01

Launchpad automatic translations update.

1115. By Launchpad Translations on behalf of phablet-team on 2015-08-02

Launchpad automatic translations update.

1116. By Launchpad Translations on behalf of phablet-team on 2015-08-05

Launchpad automatic translations update.

1117. By Launchpad Translations on behalf of phablet-team on 2015-08-06

Launchpad automatic translations update.

1118. By Steve Langasek on 2015-08-07

Add missing changelog entry due to direct upload.

1119. By Launchpad Translations on behalf of phablet-team on 2015-08-09

Launchpad automatic translations update.

1120. By Olivier Tilloy on 2015-08-10

Update all imports of:
 - Ubuntu.Components to 1.3
 - QtQuick to 2.4
 - QtQuick.Window to 2.2

This bumps the required versions of qtdeclarative5-ubuntu-ui-toolkit-plugin, qml-module-qtquick2 and qml-module-qtquick-window2 in debian/control. Fixes: #1483279

1121. By CI Train Bot Account on 2015-08-10

Releasing 0.23+15.10.20150810-0ubuntu1

1122. By Olivier Tilloy on 2015-08-11

Implement the "Find in Page" feature.
This bumps the runtime dependency on liboxideqt-qmlplugin to 1.8. Fixes: #1312260
Approved by: Riccardo Padovani

1123. By Olivier Tilloy on 2015-08-11

Drop old names for QML dependencies.
Original patch by Robert Ancell.

1124. By Olivier Tilloy on 2015-08-11

Highlight matching terms in one pass. Fixes: #1481206
Approved by: PS Jenkins bot, Ugo Riboni

1125. By CI Train Bot Account on 2015-08-11

Releasing 0.23+15.10.20150811-0ubuntu1

1126. By Olivier Tilloy on 2015-08-11

Update translation template.

1127. By Launchpad Translations on behalf of phablet-team on 2015-08-12

Launchpad automatic translations update.

1128. By Arthur Mello on 2015-08-12

Wide screen versions of the history view and new tab view, per design specification.
This adds a build dependency on qml-module-qt-labs-settings (for unit tests). Fixes: #1351157, #1481647

1129. By CI Train Bot Account on 2015-08-12

Releasing 0.23+15.10.20150812.1-0ubuntu1

1130. By Olivier Tilloy on 2015-08-13

Update translation template.

1131. By Launchpad Translations on behalf of phablet-team on 2015-08-13

Launchpad automatic translations update.

1132. By Olivier Tilloy on 2015-08-13

Remove strong typing of the contextualActions and selectionActions properties.
This would cause issues if an app imported Ubuntu.Web along with Ubuntu.Components < 1.3 and overrode one of these properties, because the webview expected an ActionList 1.3, and would get an earlier version. Fixes: #1484437

1133. By CI Train Bot Account on 2015-08-13

Releasing 0.23+15.10.20150813.1-0ubuntu1

1134. By CI Train Bot Account on 2015-08-14

Resync trunk.

1135. By Ugo Riboni on 2015-08-14

Delay the exit from fullscreen mode until focus remains lost for a certain amount of time. Fixes: #1477308
Approved by: Olivier Tilloy

1136. By Ugo Riboni on 2015-08-14

Disable find in page when the new tab view is active. Fixes: #1483847
Approved by: Olivier Tilloy

1137. By CI Train Bot Account on 2015-08-14

Releasing 0.23+15.10.20150814-0ubuntu1

1138. By Launchpad Translations on behalf of phablet-team on 2015-08-15

Launchpad automatic translations update.

1139. By Launchpad Translations on behalf of phablet-team on 2015-08-16

Launchpad automatic translations update.

1140. By Launchpad Translations on behalf of phablet-team on 2015-08-17

Launchpad automatic translations update.

1141. By Colin Watson on 2015-08-17

Fix versioned dependencies on qtdeclarative5-ubuntu-ui-toolkit-plugin to allow qtdeclarative5-ubuntu-ui-toolkit-plugin-gles.
Approved by: Olivier Tilloy

1142. By Arthur Mello on 2015-08-17

Wait for OptionSelector's collapsing transition to finish Fixes: #1484175
Approved by: Olivier Tilloy

1143. By Arthur Mello on 2015-08-17

Make sure to set the historyModel to the HistoryView component when browser wide property changes Fixes: #1484555
Approved by: Olivier Tilloy

1144. By CI Train Bot Account on 2015-08-17

Releasing 0.23+15.10.20150817-0ubuntu1

[Olivier Tilloy (osomon)]

flake8 raises 4 errors.

review: Needs Fixing

[Olivier Tilloy (osomon)]

The change otherwise looks good to me.

[Alexandre Abreu (abreu-alexandre)]

Updated

[lp:~abreu-alexandre/webbrowser-app/fix-webapp-name-handling]

1145. By Alexandre Abreu on 2015-08-18

Fix webapp name logic

[Olivier Tilloy (osomon)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1145
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2122/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3785/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/876/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/876/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/876/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3782/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1145
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2123/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3788
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/877
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/877
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/877/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/877
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3785
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3785/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22649

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webcontainer/WebApp.qml'
--- src/app/webcontainer/WebApp.qml	2015-08-10 15:22:00 +0000
+++ src/app/webcontainer/WebApp.qml	2015-08-18 14:29:10 +0000
@@ -37,7 +37,6 @@
 
     property string webappModelSearchPath: ""
 
-    property alias webappName: webview.webappName
     property var webappUrlPatterns
     property alias popupRedirectionUrlPrefixPattern: webview.popupRedirectionUrlPrefixPattern
     property alias webviewOverrideFile: webview.webviewOverrideFile
@@ -46,6 +45,8 @@
     property alias dataPath: webview.dataPath
     property alias runningLocalApplication: webview.runningLocalApplication
 
+    property string webappName: ""
+
     property bool backForwardButtonsVisible: false
     property bool chromeVisible: false
     readonly property bool chromeless: !chromeVisible && !backForwardButtonsVisible && !accountSwitcher
@@ -130,11 +131,19 @@
             }
             height: parent.height - osk.height
             developerExtrasEnabled: webapp.developerExtrasEnabled
+
             onSamlRequestUrlPatternReceived: {
                 addGeneratedUrlPattern(urlPattern)
             }
             webappUrlPatterns: mergeUrlPatternSets(urlPatternSettings.generatedUrlPatterns,
                                    webapp.webappUrlPatterns)
+
+            /**
+             * Use the --webapp parameter value w/ precedence, but also take into account
+             * the fact that a webapp 'name' can come from a webapp-properties.json file w/o
+             * being explictly defined here.
+             */
+            webappName: webapp.webappName === "" ? unityWebapps.name : webapp.webappName
         }
 
         Loader {

=== added file 'tests/autopilot/webapp_container/tests/test_webapp_name_precedence.py'
--- tests/autopilot/webapp_container/tests/test_webapp_name_precedence.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/webapp_container/tests/test_webapp_name_precedence.py	2015-08-18 14:29:10 +0000
@@ -0,0 +1,88 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2015 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 contextlib import contextmanager
+import os
+import tempfile
+import shutil
+
+from testtools.matchers import Equals
+from autopilot.matchers import Eventually
+
+from webapp_container.tests import WebappContainerTestCaseWithLocalContentBase
+
+
+@contextmanager
+def generate_temp_webapp(manifest_filename='manifest.json'):
+    tmpdir = tempfile.mkdtemp()
+    webapp_folder_name = '{}/unity-webapps-test'.format(tmpdir)
+    os.mkdir(webapp_folder_name)
+    manifest_content = """
+    {
+        "includes": ["http://test.com:*/*"],
+        "name": "test",
+        "scripts": ["test.user.js"],
+        "domain":"",
+        "homepage":"http://www.test.com/"
+    }
+    """
+    manifest_file = "{}/{}".format(webapp_folder_name, manifest_filename)
+    with open(manifest_file, "w+") as f:
+        f.write(manifest_content)
+    script_file = "{}/test.user.js".format(webapp_folder_name)
+    with open(script_file, "w+") as f:
+        f.write("")
+    try:
+        yield tmpdir
+    finally:
+        shutil.rmtree(tmpdir)
+
+
+class WebappContainerWebappNamePrecedenceTestCase(
+        WebappContainerTestCaseWithLocalContentBase):
+    def test_webapps_launch_default_search_path(self):
+        args = ["--webapp='dGVzdA=='"]
+        rule = 'MAP *.test.com:80 ' + self.get_base_url_hostname()
+        with generate_temp_webapp() as webapp_install_path:
+            self.launch_webcontainer_app(
+                args,
+                {'UBUNTU_WEBVIEW_HOST_MAPPING_RULES': rule,
+                 'WEBAPP_QML_DEFAULT_WEBAPPS_INSTALL_FOLDER':
+                 webapp_install_path})
+            webview = self.get_oxide_webview()
+            webapp_url = 'http://www.test.com/'
+            self.assertThat(webview.url, Eventually(Equals(webapp_url)))
+
+            result = 'test'
+            self.assertThat(self.get_webcontainer_window().title,
+                            Eventually(Equals(result)))
+
+    def test_webapps_launch_custom_search_path(self):
+        args = []
+        rule = 'MAP *.test.com:80 ' + self.get_base_url_hostname()
+        with generate_temp_webapp('webapp-properties.json') as install_path:
+            args.append('--webappModelSearchPath={}'.format(install_path))
+            self.launch_webcontainer_app(
+                args,
+                {'UBUNTU_WEBVIEW_HOST_MAPPING_RULES': rule,
+                 'WEBAPP_QML_DEFAULT_WEBAPPS_INSTALL_FOLDER':
+                 install_path})
+            webview = self.get_oxide_webview()
+            webapp_url = 'http://www.test.com/'
+            self.assertThat(webview.url, Eventually(Equals(webapp_url)))
+
+            result = 'test'
+            self.assertThat(self.get_webcontainer_window().title,
+                            Eventually(Equals(result)))