Merge lp:~osomon/webbrowser-app/encodeURIComponent into lp:webbrowser-app

[Olivier Tilloy]

Use encodeURIComponent() to encode search queries entered in the address bar.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:565
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/861/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/676
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/160/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/60/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/602
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/815
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/815/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1376
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1376/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6802/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8194

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/AddressBar.qml'
--- src/app/AddressBar.qml	2014-05-22 12:38:25 +0000
+++ src/app/AddressBar.qml	2014-06-06 17:04:26 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -156,10 +156,7 @@
     }
 
     function escapeHtmlEntities(query) {
-        function getEscapeCode(entity) {
-            return "%%1".arg(entity.charCodeAt(0).toString(16))
-        }
-        return query.replace(/\W/, getEscapeCode)
+        return query.replace(/\W/, encodeURIComponent)
     }
 
     function buildSearchUrl(query) {

=== modified file 'tests/unittests/qml/tst_AddressBar.qml'
--- tests/unittests/qml/tst_AddressBar.qml	2014-02-25 13:10:29 +0000
+++ tests/unittests/qml/tst_AddressBar.qml	2014-06-06 17:04:26 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -23,110 +23,94 @@
 TestCase {
     name: "AddressBar"
 
-    function test_file_no_rewrite() {
-        addressBar.text = "file:///usr/share/doc/ubuntu-online-tour/index.html"
-        addressBar.validate()
-        compare(addressBar.requestedUrl, "file:///usr/share/doc/ubuntu-online-tour/index.html")
-    }
-
-    function test_http_no_rewrite() {
-        addressBar.text = "http://ubuntu.com"
-        addressBar.validate()
-        compare(addressBar.requestedUrl, "http://ubuntu.com")
-    }
-
-    function test_https_no_rewrite() {
-        addressBar.text = "https://google.com"
-        addressBar.validate()
-        compare(addressBar.requestedUrl, "https://google.com")
-    }
-
-    function test_no_scheme_rewrite() {
-        addressBar.text = "ubuntu.com"
-        addressBar.validate()
-        compare(addressBar.requestedUrl, "http://ubuntu.com")
-    }
-
-    function test_no_ipadress_scheme_rewrite() {
-        addressBar.text = "192.168.1.1"
-        addressBar.validate()
-        compare(addressBar.requestedUrl, "http://192.168.1.1")
-        addressBar.text = "192.168.1.1:8000"
-        addressBar.validate()
-        compare(addressBar.requestedUrl, "http://192.168.1.1:8000")
-        addressBar.text = "192.168.1.1:8000/dummy.html"
-        addressBar.validate()
-        compare(addressBar.requestedUrl, "http://192.168.1.1:8000/dummy.html")
-    }
-
-    function test_unhandled_scheme_no_rewrite() {
-        addressBar.text = "ftp://ubuntu.com"
-        addressBar.validate()
-        compare(addressBar.requestedUrl, "ftp://ubuntu.com")
-    }
-
-    function test_trim_whitespaces() {
-        addressBar.text = "   http://ubuntu.com"
-        addressBar.validate()
-        compare(addressBar.requestedUrl, "http://ubuntu.com")
-        addressBar.text = "http://ubuntu.com  "
-        addressBar.validate()
-        compare(addressBar.requestedUrl, "http://ubuntu.com")
-        addressBar.text = "  http://ubuntu.com   "
-        addressBar.validate()
-        compare(addressBar.requestedUrl, "http://ubuntu.com")
-    }
-
-    function test_search_url() {
-        addressBar.text = "lorem ipsum dolor sit amet"
-        addressBar.validate()
-        compare(addressBar.requestedUrl.toString().indexOf("https://google.com"), 0)
-        verify(addressBar.requestedUrl.toString().indexOf("q=lorem+ipsum+dolor+sit+amet") > 0)
-    }
-
-    function test_search_url_single_word() {
-        addressBar.text = "ubuntu"
-        addressBar.validate()
-        compare(addressBar.requestedUrl.toString().indexOf("https://google.com"), 0)
-        verify(addressBar.requestedUrl.toString().indexOf("q=ubuntu") > 0)
-    }
-
-    function test_search_escape_html_entities() {
-        addressBar.text = "tom & jerry"
-        addressBar.validate()
-        verify(addressBar.requestedUrl.toString().indexOf("q=tom+%26+jerry") > 0)
-        addressBar.text = "a+ rating"
-        addressBar.validate()
-        verify(addressBar.requestedUrl.toString().indexOf("q=a%2B+rating") > 0)
-        addressBar.text = "\"kung fu\""
-        addressBar.validate()
-        verify(addressBar.requestedUrl.toString().indexOf("q=%22kung+fu%22") > 0)
-        addressBar.text = "surfin' usa"
-        addressBar.validate()
-        verify(addressBar.requestedUrl.toString().indexOf("q=surfin%27+usa") > 0)
-        addressBar.text = "to be or not to be?"
-        addressBar.validate()
-        verify(addressBar.requestedUrl.toString().indexOf("q=to+be+or+not+to+be%3F") > 0)
-    }
-
-    function test_url_uppercase_rewrite() {
-        addressBar.text = "WWW.UBUNTU.COM"
-        addressBar.validate()
-        compare(addressBar.requestedUrl, "http://www.ubuntu.com")
-
-        addressBar.text = "EN.WIKIPEDIA.ORG/wiki/Ubuntu"
-        addressBar.validate()
-        compare(addressBar.requestedUrl, "http://en.wikipedia.org/wiki/Ubuntu")
-
-        addressBar.text = "EN.WIKIPEDIA.ORG/wiki/UBUNTU"
-        addressBar.validate()
-        compare(addressBar.requestedUrl, "http://en.wikipedia.org/wiki/UBUNTU")
-    }
-
-    function test_local_file_no_scheme() {
-        addressBar.text = "/usr/share/doc/ubuntu-online-tour/index.html"
-        addressBar.validate()
-        compare(addressBar.requestedUrl, "file:///usr/share/doc/ubuntu-online-tour/index.html")
+    function test_no_rewrite_data() {
+        return [
+            {url: "file:///usr/share/doc/ubuntu-online-tour/index.html"},
+            {url: "http://ubuntu.com"},
+            {url: "https://google.com"},
+            {url: "ftp://ubuntu.com"},
+        ]
+    }
+
+    function test_no_rewrite(data) {
+        addressBar.text = data.url
+        addressBar.validate()
+        compare(addressBar.requestedUrl, data.url)
+    }
+
+    function test_add_scheme_data() {
+        return [
+            {text: "ubuntu.com", requestedUrl: "http://ubuntu.com"},
+            {text: "192.168.1.1", requestedUrl: "http://192.168.1.1"},
+            {text: "192.168.1.1:8000", requestedUrl: "http://192.168.1.1:8000"},
+            {text: "192.168.1.1:8000/dummy.html", requestedUrl: "http://192.168.1.1:8000/dummy.html"},
+            {text: "/usr/share/doc/ubuntu-online-tour/index.html", requestedUrl: "file:///usr/share/doc/ubuntu-online-tour/index.html"},
+        ]
+    }
+
+    function test_add_scheme(data) {
+        addressBar.text = data.text
+        addressBar.validate()
+        compare(addressBar.requestedUrl, data.requestedUrl)
+    }
+
+    function test_trim_whitespaces_data() {
+        return [
+            {text: "   http://ubuntu.com", requestedUrl: "http://ubuntu.com"},
+            {text: "http://ubuntu.com  ", requestedUrl: "http://ubuntu.com"},
+            {text: "  http://ubuntu.com   ", requestedUrl: "http://ubuntu.com"},
+        ]
+    }
+
+    function test_trim_whitespaces(data) {
+        addressBar.text = data.text
+        addressBar.validate()
+        compare(addressBar.requestedUrl, data.requestedUrl)
+    }
+
+    function test_search_url_data() {
+        return [
+            {text: "lorem ipsum dolor sit amet", start: "https://google.com", query: "lorem+ipsum+dolor+sit+amet"},
+            {text: "ubuntu", start: "https://google.com", query: "ubuntu"},
+        ]
+    }
+
+    function test_search_url(data) {
+        addressBar.text = data.text
+        addressBar.validate()
+        compare(addressBar.requestedUrl.toString().indexOf(data.start), 0)
+        verify(addressBar.requestedUrl.toString().indexOf("q=" + data.query) > 0)
+    }
+
+    function test_search_escape_html_entities_data() {
+        return [
+            {text: "tom & jerry", escaped: "tom+%26+jerry"},
+            {text: "a+ rating", escaped: "a%2B+rating"},
+            {text: "\"kung fu\"", escaped: "%22kung+fu%22"},
+            {text: "surfin' usa", escaped: "surfin'+usa"},
+            {text: "to be or not to be?", escaped: "to+be+or+not+to+be%3F"},
+            {text: "aléatoire", escaped: "aléatoire"},
+        ]
+    }
+
+    function test_search_escape_html_entities(data) {
+        addressBar.text = data.text
+        addressBar.validate()
+        verify(addressBar.requestedUrl.toString().indexOf("q=" + data.escaped) > 0)
+    }
+
+    function test_url_uppercase_rewrite_data() {
+        return [
+            {text: "WWW.UBUNTU.COM", requestedUrl: "http://www.ubuntu.com"},
+            {text: "EN.WIKIPEDIA.ORG/wiki/Ubuntu", requestedUrl: "http://en.wikipedia.org/wiki/Ubuntu"},
+            {text: "EN.WIKIPEDIA.ORG/wiki/UBUNTU", requestedUrl: "http://en.wikipedia.org/wiki/UBUNTU"},
+        ]
+    }
+
+    function test_url_uppercase_rewrite(data) {
+        addressBar.text = data.text
+        addressBar.validate()
+        compare(addressBar.requestedUrl, data.requestedUrl)
     }
 
     AddressBar {