Merge lp:~abreu-alexandre/webbrowser-app/fix-url-updates-for-manifest-webapps into lp:webbrowser-app

[Alexandre Abreu]

Fix URL update for webapps that are based on local manifest.json files. The update is done no matter what overriding any other potential url currently being browsed to.

Fix URL update for webapps that are based on local manifest.json files. The update is done no matter what overriding any other potential url currently being browsed to.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1262
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2429/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4978
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1183
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1183/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1183
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3997
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4975
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4975/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24816

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

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

This change breaks 3 existing autopilot tests.

review: Needs Fixing

[lp:~abreu-alexandre/webbrowser-app/fix-url-updates-for-manifest-webapps]

1263. By Alexandre Abreu on 2015-11-09

updated

[Alexandre Abreu (abreu-alexandre)]

updated

[Olivier Tilloy (osomon)]

I’m not familiar with this code, and I’m not sure how to verify that it actually fixes the bug, but at least the autopilot tests all pass on my desktop.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1263
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2456/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1210
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1210/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1210
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4082
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5107
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5107/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25042

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

review: Needs Fixing (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

I updated the TEstPlan to account for those uri-handler tests:

https://wiki.ubuntu.com/Process/Merges/TestPlan/webapp-container

I will update the MR though with tests for that since the matrix of tests is not getting simpler to cover all the cases, it'll be better if automated

Unmerged revisions

1263. By Alexandre Abreu on 2015-11-09

updated

1262. By Alexandre Abreu on 2015-11-02

Fix url updates

=== modified file 'src/app/webcontainer/WebViewImplOxide.qml'
--- src/app/webcontainer/WebViewImplOxide.qml	2015-08-20 10:42:09 +0000
+++ src/app/webcontainer/WebViewImplOxide.qml	2015-11-09 20:42:31 +0000
@@ -240,7 +240,13 @@
                 }
             }
         };
-        return UnityWebAppsUtils.makeProxiesForWebViewBindee(webview, eventHandlers)
+        var proxies = UnityWebAppsUtils.makeProxiesForWebViewBindee(webview, eventHandlers)
+        proxies.navigateTo = function(url) {
+            if (url.length !== 0 && (!webview.url || webview.url.toString().length === 0)) {
+                webview.url = url;
+            }
+        }
+        return proxies
     }
 
     onGeolocationPermissionRequested: {