Merge lp:~daker/webbrowser-app/fix.1166063 into lp:webbrowser-app

[Adnane Belmadiaf]

Added support for IP adresses

[Olivier Tilloy (osomon)]

Thanks for tackling this bug!

A couple of remarks:

 - I think using a regular expression to match an IP address would be more efficient. A simple regexp would be enough (no need to validate that the four components are in the range 0-255, if they are not it’s very likely a typo and the user will realize it and correct it).

 - Can you add a unit test for IP addresses in tests/unittests/qml/tst_AddressBar.qml ?

[Adnane Belmadiaf (daker)]

Sure i'll fix it

[lp:~daker/webbrowser-app/fix.1166063]

304. By Adnane Belmadiaf on 2013-09-15

Fixed regexp for ip addresses
Added unit test for the ip addresses

[Olivier Tilloy (osomon)]

Looks perfect, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/app/AddressBar.qml'
--- src/app/AddressBar.qml	2013-08-08 16:32:40 +0000
+++ src/app/AddressBar.qml	2013-09-15 17:17:42 +0000
@@ -134,6 +134,9 @@
         if (address.split('/', 1)[0].match(/\.[a-z]{2,4}$/)) {
             return true
         }
+        if (address.split('/', 1)[0].match(/^(?:[0-9]{1,3}\.){3}[0-9]{1,3}/)) {
+            return true
+        }
         return false
     }
 

=== modified file 'tests/unittests/qml/tst_AddressBar.qml'
--- tests/unittests/qml/tst_AddressBar.qml	2013-07-18 12:04:50 +0000
+++ tests/unittests/qml/tst_AddressBar.qml	2013-09-15 17:17:42 +0000
@@ -47,6 +47,18 @@
         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()