webbrowser-app

Merge lp:~osomon/webbrowser-app/rewrite-uppercase-scheme into lp:webbrowser-app

  1. rewrite-uppercase-scheme
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 941
Merged at revision: 950
Proposed branch: lp:~osomon/webbrowser-app/rewrite-uppercase-scheme
Merge into: lp:webbrowser-app
Diff against target: 45 lines (+21/-3)
2 files modified
src/app/webbrowser/AddressBar.qml (+3/-3)
tests/unittests/qml/tst_AddressBar.qml (+18/-0)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/rewrite-uppercase-scheme
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+254093@code.launchpad.net

Commit message

Rewrite URLs with an uppercase scheme.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:941
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1565/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1963
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/323
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/323
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/323/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/323
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1730
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1961
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1961/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19145

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:941
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1566/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1968
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/324
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/324
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/324/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/324
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1735
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1966
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1966/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19151

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:941
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1567/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1971
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/325
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/325
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/325/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/325
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1737
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1969
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1969/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19154

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:941
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1569/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1974
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/327
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/327
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/327/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/327
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1741
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1972
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1972/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19163

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:941
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1570/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1976
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/328
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/328
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/328/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/328
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1743
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1974
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1974/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19171

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/webbrowser/AddressBar.qml'
2--- src/app/webbrowser/AddressBar.qml 2015-01-23 10:30:19 +0000
3+++ src/app/webbrowser/AddressBar.qml 2015-03-25 14:13:18 +0000
4@@ -243,9 +243,9 @@
5 if (address.substr(0, 1) == "/") {
6 return true
7 }
8- if (address.match(/^https?:\/\//) ||
9- address.match(/^file:\/\//) ||
10- address.match(/^[a-z]+:\/\//)) {
11+ if (address.match(/^https?:\/\//i) ||
12+ address.match(/^file:\/\//i) ||
13+ address.match(/^[a-z]+:\/\//i)) {
14 return true
15 }
16 if (address.split('/', 1)[0].match(/\.[a-zA-Z]{2,4}$/)) {
17
18=== modified file 'tests/unittests/qml/tst_AddressBar.qml'
19--- tests/unittests/qml/tst_AddressBar.qml 2015-01-23 10:34:50 +0000
20+++ tests/unittests/qml/tst_AddressBar.qml 2015-03-25 14:13:18 +0000
21@@ -185,6 +185,24 @@
22 compare(addressBar.requestedUrl, data.requestedUrl)
23 }
24
25+ function test_uppercaseSchemeShouldBeRewritten_data() {
26+ return [
27+ {text: "HTTP://WWW.UBUNTU.COM", requestedUrl: "http://www.ubuntu.com"},
28+ {text: "HTTP://www.ubuntu.com", requestedUrl: "http://www.ubuntu.com"},
29+ {text: "HTTPS://www.ubuntu.com", requestedUrl: "https://www.ubuntu.com"},
30+ {text: "FILE:///usr/share/doc/ubuntu-online-tour/index.html", requestedUrl: "file:///usr/share/doc/ubuntu-online-tour/index.html"},
31+ {text: "FTP://ubuntu.com", requestedUrl: "ftp://ubuntu.com"},
32+ ]
33+ }
34+
35+ function test_uppercaseSchemeShouldBeRewritten(data) {
36+ typeString(data.text)
37+ compare(addressBar.text, data.text)
38+ keyClick(Qt.Key_Return)
39+ validatedSpy.wait()
40+ compare(addressBar.requestedUrl, data.requestedUrl)
41+ }
42+
43 function test_urlShouldBeSimplifiedWhenUnfocused_data() {
44 return [
45 {input: "http://www.ubuntu.com",

Subscribers

People subscribed via source and target branches

to status/vote changes: