Merge lp:~osomon/webbrowser-app/suggestions-always-rich-text into lp:webbrowser-app

[Olivier Tilloy]

Always format the suggestions as rich text, to ensure ampersands are not incorrectly escaped.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:157
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/124/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/7
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1862/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:157
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/125/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/8
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1864/console

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

review: Needs Fixing (continuous-integration)

[Günter Schwann (schwann)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:157
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/128/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/11
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1868/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:157
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/132/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/15
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1875

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:157
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/133/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1877

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

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Browser/Suggestions.qml'
--- src/Ubuntu/Browser/Suggestions.qml	2013-05-31 16:34:52 +0000
+++ src/Ubuntu/Browser/Suggestions.qml	2013-06-04 17:23:27 +0000
@@ -106,6 +106,7 @@
                                                       '<b><font color="#DD4814">$&</font></b>')
                 }
                 highlighted = highlighted.replace(new RegExp('&', 'g'), '&amp;')
+                highlighted = '<html>' + highlighted + '</html>'
                 return highlighted
             }
         }

=== modified file 'tests/autopilot/webbrowser_app/tests/test_history.py'
--- tests/autopilot/webbrowser_app/tests/test_history.py	2013-05-31 17:34:47 +0000
+++ tests/autopilot/webbrowser_app/tests/test_history.py	2013-06-04 17:23:27 +0000
@@ -13,7 +13,7 @@
 import sqlite3
 import time
 
-from testtools.matchers import Equals
+from testtools.matchers import Contains, Equals
 from autopilot.matchers import Eventually
 
 from webbrowser_app.tests import BrowserTestCaseBase
@@ -125,7 +125,7 @@
         entry = entries[2]
         highlight = '<b><font color="#DD4814">Ubuntu</font></b>'
         url = "http://en.wikipedia.org/wiki/%s_(operating_system)" % highlight
-        self.assertThat(entry.subText, Equals(url))
+        self.assertThat(entry.subText, Contains(url))
         self.pointing_device.move_to_object(entry)
         self.pointing_device.click()
         webview = self.main_window.get_web_view()