1
=== modified file 'src/Ubuntu/Browser/Suggestions.qml'
2
--- src/Ubuntu/Browser/Suggestions.qml	2013-05-31 16:34:52 +0000
3
+++ src/Ubuntu/Browser/Suggestions.qml	2013-06-04 17:23:27 +0000
4
@@ -106,6 +106,7 @@
5
106
                                                      '<b><font color="#DD4814">$&</font></b>')
106
                                                      '<b><font color="#DD4814">$&</font></b>')
6
107
                }
107
                }
7
108
                highlighted = highlighted.replace(new RegExp('&', 'g'), '&amp;')
108
                highlighted = highlighted.replace(new RegExp('&', 'g'), '&amp;')
8
109
                highlighted = '<html>' + highlighted + '</html>'
9
109
                return highlighted
110
                return highlighted
10
110
            }
111
            }
11
111
        }
112
        }
12
112
113
13
=== modified file 'tests/autopilot/webbrowser_app/tests/test_history.py'
14
--- tests/autopilot/webbrowser_app/tests/test_history.py	2013-05-31 17:34:47 +0000
15
+++ tests/autopilot/webbrowser_app/tests/test_history.py	2013-06-04 17:23:27 +0000
16
@@ -13,7 +13,7 @@
17
13
import sqlite3
13
import sqlite3
18
14
import time
14
import time
19
15
15
21
16
from testtools.matchers import Equals
16
from testtools.matchers import Contains, Equals
22
17
from autopilot.matchers import Eventually
17
from autopilot.matchers import Eventually
23
18
18
24
19
from webbrowser_app.tests import BrowserTestCaseBase
19
from webbrowser_app.tests import BrowserTestCaseBase
25
@@ -125,7 +125,7 @@
26
125
        entry = entries[2]
125
        entry = entries[2]
27
126
        highlight = '<b><font color="#DD4814">Ubuntu</font></b>'
126
        highlight = '<b><font color="#DD4814">Ubuntu</font></b>'
28
127
        url = "http://en.wikipedia.org/wiki/%s_(operating_system)" % highlight
127
        url = "http://en.wikipedia.org/wiki/%s_(operating_system)" % highlight
30
128
        self.assertThat(entry.subText, Equals(url))
128
        self.assertThat(entry.subText, Contains(url))
31
129
        self.pointing_device.move_to_object(entry)
129
        self.pointing_device.move_to_object(entry)
32
130
        self.pointing_device.click()
130
        self.pointing_device.click()
33
131
        webview = self.main_window.get_web_view()
131
        webview = self.main_window.get_web_view()
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-06-05
Günter Schwann (community)		2013-06-04	Approve on 2013-06-05
Review via email: mp+167350@code.launchpad.net