Merge lp:~abreu-alexandre/webbrowser-app/webapp-url-dispatcher-failure into lp:webbrowser-app

[Alexandre Abreu]

Fix url-dispatcher url updates failures

Fix url-dispatcher url updates failures

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1533
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/621/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1400/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1400
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1259
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1259
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1259
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1256
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1256/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1256
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1256/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1256/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1256
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1256/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1256
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1256/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1256/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1256
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1256/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1256
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1256/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1256/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/621/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

1533. By Alexandre Abreu on 2016-09-01

Fix url-dispatcher url updates

=== modified file 'src/app/webcontainer/WebViewImplOxide.qml'
--- src/app/webcontainer/WebViewImplOxide.qml	2016-07-13 16:23:18 +0000
+++ src/app/webcontainer/WebViewImplOxide.qml	2016-09-01 16:02:36 +0000
@@ -131,9 +131,6 @@
         onMediaAccessPermissionRequested: PopupUtils.open(mediaAccessDialogComponent, null, { request: request })
     }
 
-    StateSaver.properties: "url"
-    StateSaver.enabled: !runningLocalApplication
-
     function handleSAMLRequestPattern(urlPattern) {
         webappUrlPatterns.push(urlPattern)
 

=== modified file 'src/app/webcontainer/WebappContainerWebview.qml'
--- src/app/webcontainer/WebappContainerWebview.qml	2016-07-13 16:23:18 +0000
+++ src/app/webcontainer/WebappContainerWebview.qml	2016-09-01 16:02:36 +0000
@@ -46,6 +46,12 @@
     signal samlRequestUrlPatternReceived(string urlPattern)
     signal themeColorMetaInformationDetected(string theme_color)
 
+    onWebappNameChanged: {
+        if (webappContainerWebViewLoader.item) {
+            webappContainerWebViewLoader.item.webappName = webappName
+        }
+    }
+
     onWideChanged: {
         if (webappContainerWebViewLoader.item
                 && webappContainerWebViewLoader.item.wide !== undefined) {

=== modified file 'src/app/webcontainer/webapp-container.qml'
--- src/app/webcontainer/webapp-container.qml	2016-07-13 16:23:18 +0000
+++ src/app/webcontainer/webapp-container.qml	2016-09-01 16:02:36 +0000
@@ -227,6 +227,9 @@
         onlineAccountsController.visible = true
     }
 
+    StateSaver.properties: "url"
+    StateSaver.enabled: !runningLocalApplication
+
     function startBrowsing() {
         console.log("Start browsing")
         // This will activate the UnityWebApp element used in WebApp.qml
@@ -236,10 +239,7 @@
         // it has not been set previously before setting the URL to the default property 
         // homepage.
         var webView = webappViewLoader.item.currentWebview
-        var current_url = webView.url.toString();
-        if (!current_url || current_url.length === 0) {
-            webView.url = root.url
-        }
+        webView.url = root.url
         showWebView()
     }
 

=== modified file 'tests/autopilot/webapp_container/tests/test_app_launch.py'
--- tests/autopilot/webapp_container/tests/test_app_launch.py	2016-06-17 18:03:09 +0000
+++ tests/autopilot/webapp_container/tests/test_app_launch.py	2016-09-01 16:02:36 +0000
@@ -104,3 +104,27 @@
             result = 'test'
             self.assertThat(self.get_webcontainer_window().title,
                             Eventually(Equals(result)))
+
+            self.assertThat(lambda: self.get_oxide_webview().webappName,
+                            Eventually(Equals(result)))
+
+    def test_webapps_launch_with_external_url(self):
+        args = ["--webapp='dGVzdA=='", "http://www.test.com/test"]
+        rule = 'MAP *.test.com:80 ' + self.get_base_url_hostname()
+        with generate_temp_webapp() as webapp_install_path:
+            env_vars = {
+                'UBUNTU_WEBVIEW_HOST_MAPPING_RULES': rule,
+                'WEBAPP_QML_DEFAULT_WEBAPPS_INSTALL_FOLDER': (
+                    webapp_install_path)
+            }
+            self.launch_webcontainer_app(args, env_vars)
+            webview = self.get_oxide_webview()
+            webapp_url = 'http://www.test.com/test'
+            self.assertThat(webview.url, Eventually(Equals(webapp_url)))
+
+            result = 'test'
+            self.assertThat(self.get_webcontainer_window().title,
+                            Eventually(Equals(result)))
+
+            self.assertThat(lambda: self.get_oxide_webview().webappName,
+                            Eventually(Equals(result)))