1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2015-02-04 10:56:38 +0000
3
+++ CMakeLists.txt	2015-05-12 13:40:34 +0000
4
@@ -1,6 +1,8 @@
5
1
cmake_minimum_required(VERSION 2.8.9)
1
cmake_minimum_required(VERSION 2.8.9)
6
2
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
2
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
7
3
3
8
4
project("webbrowser")
9
5
10
4
find_program(INTLTOOL_MERGE intltool-merge)
6
find_program(INTLTOOL_MERGE intltool-merge)
11
5
if(NOT INTLTOOL_MERGE)
7
if(NOT INTLTOOL_MERGE)
12
6
    message(FATAL_ERROR "Could not find intltool-merge, please install the intltool package")
8
    message(FATAL_ERROR "Could not find intltool-merge, please install the intltool package")
13
7
9
14
=== modified file 'src/app/config.h.in'
15
--- src/app/config.h.in	2015-03-23 22:35:12 +0000
16
+++ src/app/config.h.in	2015-05-12 13:40:34 +0000
17
@@ -30,6 +30,11 @@
18
30
#define DEFAULT_SEARCH_DESC "Use google.com to search the Web"
30
#define DEFAULT_SEARCH_DESC "Use google.com to search the Web"
19
31
#define DEFAULT_SEARCH_TEMPLATE "https://google.com/search?client=ubuntu&q={searchTerms}&ie=utf-8&oe=utf-8"
31
#define DEFAULT_SEARCH_TEMPLATE "https://google.com/search?client=ubuntu&q={searchTerms}&ie=utf-8&oe=utf-8"
20
32
32
21
33
// This API is not official, but it is what Google products and everyone else
22
34
// use to implement search suggestions. The "client=firefox" is there to request
23
35
// JSON output.
24
36
#define DEFAULT_SEARCH_SUGGESTIONS_TEMPLATE "http://suggestqueries.google.com/complete/search?client=firefox&q={searchTerms}"
25
37
26
33
inline bool isRunningInstalled()
38
inline bool isRunningInstalled()
27
34
{
39
{
28
35
    static bool installed = (QCoreApplication::applicationDirPath() == QDir("@CMAKE_INSTALL_FULL_BINDIR@").canonicalPath());
40
    static bool installed = (QCoreApplication::applicationDirPath() == QDir("@CMAKE_INSTALL_FULL_BINDIR@").canonicalPath());
29
36
41
30
=== modified file 'src/app/webbrowser/Browser.qml'
31
--- src/app/webbrowser/Browser.qml	2015-05-06 21:51:16 +0000
32
+++ src/app/webbrowser/Browser.qml	2015-05-12 13:40:34 +0000
33
@@ -26,6 +26,8 @@
34
26
import "../actions" as Actions
26
import "../actions" as Actions
35
27
import ".."
27
import ".."
36
28
import "../UrlUtils.js" as UrlUtils
28
import "../UrlUtils.js" as UrlUtils
37
29
import "urlManagement.js" as UrlManagement
38
30
39
29
31
40
30
BrowserView {
32
BrowserView {
41
31
    id: browser
33
    id: browser
42
@@ -272,12 +274,15 @@
43
272
274
44
273
            searchTerms: chrome.text.split(/\s+/g).filter(function(term) { return term.length > 0 })
275
            searchTerms: chrome.text.split(/\s+/g).filter(function(term) { return term.length > 0 })
45
274
276
47
275
            models: [historySuggestions, bookmarksSuggestions]
277
            models: [historySuggestions,
48
278
                     bookmarksSuggestions,
49
279
                     searchSuggestions.limit(4)]
50
276
280
51
277
            LimitProxyModel {
281
            LimitProxyModel {
52
278
                id: historySuggestions
282
                id: historySuggestions
55
279
                limit: 4
283
                limit: 2
56
280
                property string icon: "history"
284
                readonly property string icon: "history"
57
285
                readonly property bool displayUrl: true
58
281
                sourceModel: SuggestionsFilterModel {
286
                sourceModel: SuggestionsFilterModel {
59
282
                    sourceModel: browser.historyModel
287
                    sourceModel: browser.historyModel
60
283
                    terms: suggestionsList.searchTerms
288
                    terms: suggestionsList.searchTerms
61
@@ -287,8 +292,9 @@
62
287
292
63
288
            LimitProxyModel {
293
            LimitProxyModel {
64
289
                id: bookmarksSuggestions
294
                id: bookmarksSuggestions
67
290
                limit: 4
295
                limit: 2
68
291
                property string icon: "non-starred"
296
                readonly property string icon: "non-starred"
69
297
                readonly property bool displayUrl: true
70
292
                sourceModel: SuggestionsFilterModel {
298
                sourceModel: SuggestionsFilterModel {
71
293
                    sourceModel: browser.bookmarksModel
299
                    sourceModel: browser.bookmarksModel
72
294
                    terms: suggestionsList.searchTerms
300
                    terms: suggestionsList.searchTerms
73
@@ -296,6 +302,21 @@
74
296
                }
302
                }
75
297
            }
303
            }
76
298
304
77
305
            SearchSuggestions {
78
306
                id: searchSuggestions
79
307
                terms: suggestionsList.searchTerms
80
308
                searchEngine: currentSearchEngine
81
309
                active: chrome.activeFocus &&
82
310
                         !UrlManagement.looksLikeAUrl(chrome.text.replace(/ /g, "+"))
83
311
84
312
                function limit(number) {
85
313
                    var slice = results.slice(0, number)
86
314
                    slice.icon = 'search'
87
315
                    slice.displayUrl = false
88
316
                    return slice
89
317
                }
90
318
            }
91
319
92
299
            onSelected: {
320
            onSelected: {
93
300
                browser.currentWebview.url = url
321
                browser.currentWebview.url = url
94
301
                browser.currentWebview.forceActiveFocus()
322
                browser.currentWebview.forceActiveFocus()
95
302
323
96
=== added file 'src/app/webbrowser/SearchSuggestions.qml'
97
--- src/app/webbrowser/SearchSuggestions.qml	1970-01-01 00:00:00 +0000
98
+++ src/app/webbrowser/SearchSuggestions.qml	2015-05-12 13:40:34 +0000
99
@@ -0,0 +1,78 @@
100
1
/*
101
2
 * Copyright 2015 Canonical Ltd.
102
3
 *
103
4
 * This file is part of webbrowser-app.
104
5
 *
105
6
 * webbrowser-app is free software; you can redistribute it and/or modify
106
7
 * it under the terms of the GNU General Public License as published by
107
8
 * the Free Software Foundation; version 3.
108
9
 *
109
10
 * webbrowser-app is distributed in the hope that it will be useful,
110
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
111
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
112
13
 * GNU General Public License for more details.
113
14
 *
114
15
 * You should have received a copy of the GNU General Public License
115
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
116
17
 */
117
18
118
19
import QtQuick 2.0
119
20
import webbrowserapp.private 0.1
120
21
121
22
Item {
122
23
    property var terms
123
24
    property SearchEngine searchEngine
124
25
    property var results: []
125
26
    property bool active: false
126
27
127
28
    property var _request: new XMLHttpRequest()
128
29
    onSearchEngineChanged: resetSearch()
129
30
    onTermsChanged: resetSearch()
130
31
    onActiveChanged: resetSearch()
131
32
132
33
    Component.onCompleted: {
133
34
        _request.onreadystatechange = function() {
134
35
            if (_request.readyState === XMLHttpRequest.DONE) {
135
36
                results = parseResponse(_request.responseText)
136
37
            }
137
38
        }
138
39
    }
139
40
140
41
    Timer {
141
42
        id: limiter
142
43
        interval: 250
143
44
        onTriggered:  {
144
45
            if (_request && terms.length > 0 && searchEngine) {
145
46
                var url = searchEngine.suggestionsUrlTemplate
146
47
                url = url.replace("{searchTerms}", encodeURIComponent(terms.join(" ")))
147
48
148
49
                _request.open("GET", url);
149
50
                _request.send();
150
51
            }
151
52
        }
152
53
    }
153
54
154
55
    function parseResponse(response) {
155
56
        try {
156
57
            var data = JSON.parse(response)
157
58
        } catch (error) {
158
59
            return []
159
60
        }
160
61
161
62
        if (data.length > 1) {
162
63
            return data[1].map(function(result) {
163
64
                return {
164
65
                    title: result,
165
66
                    url: searchEngine.urlTemplate.replace("{searchTerms}",
166
67
                                                          encodeURIComponent(result))
167
68
                }
168
69
            })
169
70
        } else return []
170
71
    }
171
72
172
73
    function resetSearch() {
173
74
        results = []
174
75
        if (_request) _request.abort()
175
76
        if (active) limiter.restart()
176
77
    }
177
78
}
178
0
79
179
=== modified file 'src/app/webbrowser/Suggestion.qml'
180
--- src/app/webbrowser/Suggestion.qml	2015-04-16 16:42:04 +0000
181
+++ src/app/webbrowser/Suggestion.qml	2015-05-12 13:40:34 +0000
182
@@ -41,7 +41,7 @@
183
41
            right: parent.right
41
            right: parent.right
184
42
            verticalCenter: parent.verticalCenter
42
            verticalCenter: parent.verticalCenter
185
43
        }
43
        }
187
44
        height: label.height + subLabel.height
44
        height: subLabel.visible ? label.height + subLabel.height : icon.height
188
45
45
189
46
        Icon {
46
        Icon {
190
47
            id: icon
47
            id: icon
191
@@ -56,11 +56,13 @@
192
56
        Label {
56
        Label {
193
57
            id: label
57
            id: label
194
58
            anchors {
58
            anchors {
196
59
                top: parent.top
59
                top: subLabel.visible ? parent.top : undefined
197
60
                verticalCenter: subLabel.visible ? undefined : parent.verticalCenter
198
60
                left: icon.right
61
                left: icon.right
199
61
                leftMargin: units.gu(2)
62
                leftMargin: units.gu(2)
200
62
                right: parent.right
63
                right: parent.right
201
63
            }
64
            }
202
65
203
64
            elide: Text.ElideRight
66
            elide: Text.ElideRight
204
65
        }
67
        }
205
66
68
206
@@ -74,6 +76,7 @@
207
74
            }
76
            }
208
75
            fontSize: "small"
77
            fontSize: "small"
209
76
            elide: Text.ElideRight
78
            elide: Text.ElideRight
210
79
            visible: text !== ""
211
77
        }
80
        }
212
78
    }
81
    }
213
79
82
214
80
83
215
=== modified file 'src/app/webbrowser/Suggestions.qml'
216
--- src/app/webbrowser/Suggestions.qml	2015-04-16 16:41:31 +0000
217
+++ src/app/webbrowser/Suggestions.qml	2015-05-12 13:40:34 +0000
218
@@ -24,8 +24,8 @@
219
24
24
220
25
    property var searchTerms
25
    property var searchTerms
221
26
    property var models
26
    property var models
224
27
    property int count: models.reduce(countItems, 0)
27
    readonly property int count: models.reduce(countItems, 0)
225
28
    property alias contentHeight: suggestionsList.contentHeight
28
    readonly property alias contentHeight: suggestionsList.contentHeight
226
29
29
227
30
    signal selected(url url)
30
    signal selected(url url)
228
31
31
229
@@ -43,25 +43,34 @@
230
43
43
231
44
        model: suggestions.models
44
        model: suggestions.models
232
45
        delegate: Column {
45
        delegate: Column {
233
46
            id: suggestionsSection
234
46
            width: suggestionsList.width
47
            width: suggestionsList.width
235
47
            height: childrenRect.height
48
            height: childrenRect.height
236
48
49
237
50
            property string icon: models[index].icon
238
51
            property bool displayUrl: models[index].displayUrl
239
52
            property int firstItemIndex: models.slice(0, index).reduce(countItems, 0)
240
53
241
49
            Repeater {
54
            Repeater {
242
50
                id: suggestionsSource
55
                id: suggestionsSource
243
51
                model: modelData
56
                model: modelData
244
52
                property int firstItemIndex: models.slice(0, index).reduce(countItems, 0)
245
53
57
246
54
                delegate: Suggestion {
58
                delegate: Suggestion {
247
59
                    id: suggestion
248
55
                    width: suggestionsList.width
60
                    width: suggestionsList.width
250
56
                    showDivider: suggestionsSource.firstItemIndex + index <
61
                    showDivider: suggestionsSection.firstItemIndex + index <
251
57
                                 suggestions.count - 1
62
                                 suggestions.count - 1
252
58
63
259
59
                    title: highlightTerms(model.title)
64
                    // Necessary to support both using objects inheriting from
260
60
                    subtitle: highlightTerms(model.url)
65
                    // QAbstractItemModel and JS arrays as models, since they
261
61
                    url: model.url
66
                    // expose their data differently
262
62
                    icon: suggestionsSource.model.icon
67
                    property var item: (model.modelData) ? model.modelData : model
263
63
68
264
64
                    onSelected: suggestions.selected(url)
69
                    title: highlightTerms(item.title)
265
70
                    subtitle: suggestionsSection.displayUrl ? highlightTerms(item.url) : ""
266
71
                    icon: suggestionsSection.icon
267
72
268
73
                    onSelected: suggestions.selected(item.url)
269
65
                }
74
                }
270
66
            }
75
            }
271
67
        }
76
        }
272
@@ -97,5 +106,7 @@
273
97
        return highlighted
106
        return highlighted
274
98
    }
107
    }
275
99
108
277
100
    function countItems(total, model) { return total + model.count }
109
    function countItems(total, model) {
278
110
        return total + (model.hasOwnProperty("length") ? model.length : model.count);
279
111
    }
280
101
}
112
}
281
102
113
282
=== modified file 'src/app/webbrowser/searchengine.cpp'
283
--- src/app/webbrowser/searchengine.cpp	2015-03-19 11:58:33 +0000
284
+++ src/app/webbrowser/searchengine.cpp	2015-05-12 13:40:34 +0000
285
@@ -30,6 +30,7 @@
286
30
    , m_name(DEFAULT_SEARCH_NAME)
30
    , m_name(DEFAULT_SEARCH_NAME)
287
31
    , m_description(DEFAULT_SEARCH_DESC)
31
    , m_description(DEFAULT_SEARCH_DESC)
288
32
    , m_template(DEFAULT_SEARCH_TEMPLATE)
32
    , m_template(DEFAULT_SEARCH_TEMPLATE)
289
33
    , m_suggestionsTemplate(DEFAULT_SEARCH_SUGGESTIONS_TEMPLATE)
290
33
{
34
{
291
34
}
35
}
292
35
36
293
@@ -47,6 +48,7 @@
294
47
        m_name = DEFAULT_SEARCH_NAME;
48
        m_name = DEFAULT_SEARCH_NAME;
295
48
        m_description = DEFAULT_SEARCH_DESC;
49
        m_description = DEFAULT_SEARCH_DESC;
296
49
        m_template = DEFAULT_SEARCH_TEMPLATE;
50
        m_template = DEFAULT_SEARCH_TEMPLATE;
297
51
        m_suggestionsTemplate = DEFAULT_SEARCH_SUGGESTIONS_TEMPLATE;
298
50
52
299
51
        if (!filename.isEmpty()) {
53
        if (!filename.isEmpty()) {
300
52
            QString filepath = QStandardPaths::locate(QStandardPaths::DataLocation,
54
            QString filepath = QStandardPaths::locate(QStandardPaths::DataLocation,
301
@@ -66,9 +68,13 @@
302
66
                            } else if (name == "Description") {
68
                            } else if (name == "Description") {
303
67
                                m_description = parser.readElementText();
69
                                m_description = parser.readElementText();
304
68
                            } else if (name == "Url") {
70
                            } else if (name == "Url") {
306
69
                                if (parser.attributes().value("type") == "text/html") {
71
                                QStringRef type = parser.attributes().value("type");
307
72
                                if (type == "text/html") {
308
70
                                    m_template = parser.attributes().value("template").toString();
73
                                    m_template = parser.attributes().value("template").toString();
309
74
                                } else if (type == "application/x-suggestions+json") {
310
75
                                    m_suggestionsTemplate = parser.attributes().value("template").toString();
311
71
                                }
76
                                }
312
77
313
72
                            }
78
                            }
314
73
                        }
79
                        }
315
74
                    }
80
                    }
316
@@ -79,6 +85,7 @@
317
79
        Q_EMIT nameChanged();
85
        Q_EMIT nameChanged();
318
80
        Q_EMIT descriptionChanged();
86
        Q_EMIT descriptionChanged();
319
81
        Q_EMIT urlTemplateChanged();
87
        Q_EMIT urlTemplateChanged();
320
88
        Q_EMIT suggestionsUrlTemplateChanged();
321
82
    }
89
    }
322
83
}
90
}
323
84
91
324
@@ -96,3 +103,8 @@
325
96
{
103
{
326
97
    return m_template;
104
    return m_template;
327
98
}
105
}
328
106
329
107
const QString& SearchEngine::suggestionsUrlTemplate() const
330
108
{
331
109
    return m_suggestionsTemplate;
332
110
}
333
99
111
334
=== modified file 'src/app/webbrowser/searchengine.h'
335
--- src/app/webbrowser/searchengine.h	2015-03-19 11:58:33 +0000
336
+++ src/app/webbrowser/searchengine.h	2015-05-12 13:40:34 +0000
337
@@ -31,6 +31,7 @@
338
31
    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
31
    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
339
32
    Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
32
    Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
340
33
    Q_PROPERTY(QString urlTemplate READ urlTemplate NOTIFY urlTemplateChanged)
33
    Q_PROPERTY(QString urlTemplate READ urlTemplate NOTIFY urlTemplateChanged)
341
34
    Q_PROPERTY(QString suggestionsUrlTemplate READ suggestionsUrlTemplate NOTIFY suggestionsUrlTemplateChanged)
342
34
35
343
35
public:
36
public:
344
36
    SearchEngine(QObject* parent=0);
37
    SearchEngine(QObject* parent=0);
345
@@ -41,18 +42,21 @@
346
41
    const QString& name() const;
42
    const QString& name() const;
347
42
    const QString& description() const;
43
    const QString& description() const;
348
43
    const QString& urlTemplate() const;
44
    const QString& urlTemplate() const;
349
45
    const QString& suggestionsUrlTemplate() const;
350
44
46
351
45
Q_SIGNALS:
47
Q_SIGNALS:
352
46
    void filenameChanged() const;
48
    void filenameChanged() const;
353
47
    void nameChanged() const;
49
    void nameChanged() const;
354
48
    void descriptionChanged() const;
50
    void descriptionChanged() const;
355
49
    void urlTemplateChanged() const;
51
    void urlTemplateChanged() const;
356
52
    void suggestionsUrlTemplateChanged() const;
357
50
53
358
51
private:
54
private:
359
52
    QString m_filename;
55
    QString m_filename;
360
53
    QString m_name;
56
    QString m_name;
361
54
    QString m_description;
57
    QString m_description;
362
55
    QString m_template;
58
    QString m_template;
363
59
    QString m_suggestionsTemplate;
364
56
};
60
};
365
57
61
366
58
#endif // __SEARCH_ENGINE_H__
62
#endif // __SEARCH_ENGINE_H__
367
59
63
368
=== modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
369
--- tests/autopilot/webbrowser_app/tests/__init__.py	2015-05-12 13:40:34 +0000
370
+++ tests/autopilot/webbrowser_app/tests/__init__.py	2015-05-12 13:40:34 +0000
371
@@ -166,8 +166,8 @@
372
166
        self.assertThat(lambda: len(self.main_window.get_webviews()),
166
        self.assertThat(lambda: len(self.main_window.get_webviews()),
373
167
                        Eventually(Equals(count)))
167
                        Eventually(Equals(count)))
374
168
168
377
169
    def ping_server(self):
169
    def ping_server(self, server):
378
170
        url = "http://localhost:{}/ping".format(self.server.port)
170
        url = "http://localhost:{}/ping".format(server.port)
379
171
        ping = urllib.request.urlopen(url)
171
        ping = urllib.request.urlopen(url)
380
172
        self.assertThat(ping.read(), Equals(b"pong"))
172
        self.assertThat(ping.read(), Equals(b"pong"))
381
173
173
382
@@ -185,12 +185,12 @@
383
185
    """
185
    """
384
186
186
385
187
    def setUp(self):
187
    def setUp(self):
389
188
        self.server = http_server.HTTPServerInAThread()
188
        self.http_server = http_server.HTTPServerInAThread()
390
189
        self.ping_server()
189
        self.ping_server(self.http_server)
391
190
        self.addCleanup(self.server.cleanup)
190
        self.addCleanup(self.http_server.cleanup)
392
191
        self.useFixture(fixtures.EnvironmentVariable(
191
        self.useFixture(fixtures.EnvironmentVariable(
393
192
            'UBUNTU_WEBVIEW_HOST_MAPPING_RULES',
192
            'UBUNTU_WEBVIEW_HOST_MAPPING_RULES',
395
193
            "MAP test:80 localhost:{}".format(self.server.port)))
193
            "MAP test:80 localhost:{}".format(self.http_server.port)))
396
194
        self.base_url = "http://test"
194
        self.base_url = "http://test"
397
195
        self.url = self.base_url + "/test1"
195
        self.url = self.base_url + "/test1"
398
196
        self.ARGS = self.ARGS + [self.url]
196
        self.ARGS = self.ARGS + [self.url]
399
197
197
400
=== modified file 'tests/autopilot/webbrowser_app/tests/http_server.py'
401
--- tests/autopilot/webbrowser_app/tests/http_server.py	2015-03-20 15:08:55 +0000
402
+++ tests/autopilot/webbrowser_app/tests/http_server.py	2015-05-12 13:40:34 +0000
403
@@ -7,6 +7,7 @@
404
7
# by the Free Software Foundation.
7
# by the Free Software Foundation.
405
8
8
406
9
import http.server as http
9
import http.server as http
407
10
import json
408
10
import logging
11
import logging
409
11
import threading
12
import threading
410
12
import time
13
import time
411
@@ -19,6 +20,7 @@
412
19
    """
20
    """
413
20
    A custom HTTP request handler that serves GET resources.
21
    A custom HTTP request handler that serves GET resources.
414
21
    """
22
    """
415
23
    suggestions_data = {}
416
22
24
417
23
    def make_html(self, title, body):
25
    def make_html(self, title, body):
418
24
        html = "<html><title>{}</title><body>{}</body></html>"
26
        html = "<html><title>{}</title><body>{}</body></html>"
419
@@ -130,6 +132,14 @@
420
130
            html += '<div style="height: 100%"></div>'
132
            html += '<div style="height: 100%"></div>'
421
131
            html += '</a></body></html>'
133
            html += '</a></body></html>'
422
132
            self.send_html(html)
134
            self.send_html(html)
423
135
        elif self.path.startswith("/suggest"):
424
136
            self.send_response(200)
425
137
            self.send_header("Content-Type", "text/x-suggestions+json")
426
138
            self.end_headers()
427
139
            query = self.path[len("/suggest?q="):]
428
140
            if query in self.suggestions_data:
429
141
                suggestions = self.suggestions_data[query]
430
142
                self.wfile.write(json.dumps(suggestions).encode())
431
133
        else:
143
        else:
432
134
            self.send_error(404)
144
            self.send_error(404)
433
135
145
434
@@ -145,10 +155,13 @@
435
145
    """
155
    """
436
146
    A simple custom HTTP server run in a separate thread.
156
    A simple custom HTTP server run in a separate thread.
437
147
    """
157
    """
438
158
    def set_suggestions_data(self, data):
439
159
        self.handler.suggestions_data = data
440
148
160
441
149
    def __init__(self):
161
    def __init__(self):
442
150
        # port == 0 will assign a random free port
162
        # port == 0 will assign a random free port
444
151
        self.server = http.HTTPServer(("", 0), HTTPRequestHandler)
163
        self.handler = HTTPRequestHandler
445
164
        self.server = http.HTTPServer(("", 0), self.handler)
446
152
        self.server.allow_reuse_address = True
165
        self.server.allow_reuse_address = True
447
153
        self.server_thread = threading.Thread(target=self.server.serve_forever)
166
        self.server_thread = threading.Thread(target=self.server.serve_forever)
448
154
        self.server_thread.start()
167
        self.server_thread.start()
449
155
168
450
=== modified file 'tests/autopilot/webbrowser_app/tests/test_suggestions.py'
451
--- tests/autopilot/webbrowser_app/tests/test_suggestions.py	2015-04-27 03:23:00 +0000
452
+++ tests/autopilot/webbrowser_app/tests/test_suggestions.py	2015-05-12 13:40:34 +0000
453
@@ -23,6 +23,7 @@
454
23
from autopilot.matchers import Eventually
23
from autopilot.matchers import Eventually
455
24
24
456
25
from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
25
from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
457
26
from . import http_server
458
26
27
459
27
28
460
28
class PrepopulatedDatabaseTestCaseBase(StartOpenRemotePageTestCaseBase):
29
class PrepopulatedDatabaseTestCaseBase(StartOpenRemotePageTestCaseBase):
461
@@ -31,6 +32,7 @@
462
31
32
463
32
    def setUp(self):
33
    def setUp(self):
464
33
        self.create_temporary_profile()
34
        self.create_temporary_profile()
465
35
466
34
        self.populate_history()
36
        self.populate_history()
467
35
        self.populate_bookmarks()
37
        self.populate_bookmarks()
468
36
        super(PrepopulatedDatabaseTestCaseBase, self).setUp()
38
        super(PrepopulatedDatabaseTestCaseBase, self).setUp()
469
@@ -56,7 +58,6 @@
470
56
             "Ubuntu (philosophy) - Wikipedia, the free encyclopedia"),
58
             "Ubuntu (philosophy) - Wikipedia, the free encyclopedia"),
471
57
            (search_uri.format("example"), "google.com",
59
            (search_uri.format("example"), "google.com",
472
58
             "example - Google Search"),
60
             "example - Google Search"),
473
59
            ("http://example.iana.org/", "iana.org", "Example Domain"),
474
60
            ("http://www.iana.org/domains/special", "iana.org",
61
            ("http://www.iana.org/domains/special", "iana.org",
475
61
             "IANA — Special Use Domains"),
62
             "IANA — Special Use Domains"),
476
62
            ("http://doc.qt.io/qt-5/qtqml-index.html", "qt.io",
63
            ("http://doc.qt.io/qt-5/qtqml-index.html", "qt.io",
477
@@ -91,8 +92,6 @@
478
91
             "Samarium - Element Information"),
92
             "Samarium - Element Information"),
479
92
            ("http://en.wikipedia.org/wiki/Linux",
93
            ("http://en.wikipedia.org/wiki/Linux",
480
93
             "Linux - Wikipedia, the free encyclopedia"),
94
             "Linux - Wikipedia, the free encyclopedia"),
481
94
            ("https://www.linux.com/",
482
95
             "Linux.com | The source for Linux information"),
483
96
            ("http://doc.qt.io/qt-5/qtqml-index.html",
95
            ("http://doc.qt.io/qt-5/qtqml-index.html",
484
97
             "Qt QML 5.4 - Qt Documentation")
96
             "Qt QML 5.4 - Qt Documentation")
485
98
        ]
97
        ]
486
@@ -112,10 +111,54 @@
487
112
111
488
113
    """Test the address bar suggestions (based on history and bookmarks)."""
112
    """Test the address bar suggestions (based on history and bookmarks)."""
489
114
113
490
114
    def setup_suggestions_source(self, server):
491
115
        search_engines_path = os.path.join(self.data_location, "searchengines")
492
116
        os.makedirs(search_engines_path, exist_ok=True)
493
117
        with open(os.path.join(search_engines_path, "test.xml"), "w") as f:
494
118
            f.write("""
495
119
            <OpenSearchDescription>
496
120
             <Url type="application/x-suggestions+json"
497
121
                  template="http://localhost:{}/suggest?q={searchTerms}"/>
498
122
              <Url type="text/html"
499
123
                   template="http://aserver.somewhere/search?q={searchTerms}"/>
500
124
            </OpenSearchDescription>
501
125
            """.replace("{}", str(server.port)))
502
126
503
127
        with open(os.path.join(self.config_location, "webbrowser-app.conf"),
504
128
                  "w") as f:
505
129
            f.write("""
506
130
            [General]
507
131
            searchEngine=test
508
132
            """)
509
133
        server.set_suggestions_data({
510
134
            "high": ["high", ["highlight"]],
511
135
            "foo": ["foo", ["food", "foot", "fool", "foobar", "foo five"]],
512
136
            "QML": ["QML", ["qt qml", "qml documentation", "qml rocks"]]
513
137
        })
514
138
515
115
    def setUp(self):
139
    def setUp(self):
516
140
        self.suggest_http_server = http_server.HTTPServerInAThread()
517
141
        self.ping_server(self.suggest_http_server)
518
142
        self.addCleanup(self.suggest_http_server.cleanup)
519
143
520
144
        self.create_temporary_profile()
521
145
        self.setup_suggestions_source(self.suggest_http_server)
522
146
523
116
        super(TestSuggestions, self).setUp()
147
        super(TestSuggestions, self).setUp()
524
148
525
117
        self.address_bar = self.main_window.address_bar
149
        self.address_bar = self.main_window.address_bar
526
118
150
527
151
    def highlight_term(self, text, term):
528
152
        parts = text.split(term)
529
153
        if len(parts) < 2:
530
154
            return text
531
155
        else:
532
156
            pattern = '<html>{}{}{}</html>'
533
157
            return pattern.format(parts[0], self.highlight(term), parts[1])
534
158
535
159
    def highlight(self, text):
536
160
        return '<b><font color="#dd4814">{}</font></b>'.format(text)
537
161
538
119
    def assert_suggestions_eventually_shown(self):
162
    def assert_suggestions_eventually_shown(self):
539
120
        suggestions = self.main_window.get_suggestions()
163
        suggestions = self.main_window.get_suggestions()
540
121
        self.assertThat(suggestions.opacity, Eventually(Equals(1)))
164
        self.assertThat(suggestions.opacity, Eventually(Equals(1)))
541
@@ -136,38 +179,47 @@
542
136
179
543
137
    def test_list_of_suggestions_case_insensitive(self):
180
    def test_list_of_suggestions_case_insensitive(self):
544
138
        suggestions = self.main_window.get_suggestions()
181
        suggestions = self.main_window.get_suggestions()
547
139
        self.address_bar.write('xaMPL')
182
        self.address_bar.write('SpEciAl')
548
140
        self.assertThat(suggestions.count, Eventually(Equals(2)))
183
        self.assertThat(suggestions.count, Eventually(Equals(1)))
549
141
184
550
142
    def test_list_of_suggestions_history_limits(self):
185
    def test_list_of_suggestions_history_limits(self):
551
143
        suggestions = self.main_window.get_suggestions()
186
        suggestions = self.main_window.get_suggestions()
552
144
        self.address_bar.write('ubuntu')
187
        self.address_bar.write('ubuntu')
553
145
        self.assert_suggestions_eventually_shown()
188
        self.assert_suggestions_eventually_shown()
555
146
        self.assertThat(suggestions.count, Eventually(Equals(4)))
189
        self.assertThat(suggestions.count, Eventually(Equals(2)))
556
147
        self.address_bar.write('bleh', clear=False)
190
        self.address_bar.write('bleh', clear=False)
557
148
        self.assertThat(suggestions.count, Eventually(Equals(0)))
191
        self.assertThat(suggestions.count, Eventually(Equals(0)))
558
149
        self.address_bar.write('iana')
192
        self.address_bar.write('iana')
560
150
        self.assertThat(suggestions.count, Eventually(Equals(2)))
193
        self.assertThat(suggestions.count, Eventually(Equals(1)))
561
151
194
562
152
    def test_list_of_suggestions_bookmark_limits(self):
195
    def test_list_of_suggestions_bookmark_limits(self):
563
153
        suggestions = self.main_window.get_suggestions()
196
        suggestions = self.main_window.get_suggestions()
564
154
        self.address_bar.write('element')
197
        self.address_bar.write('element')
565
155
        self.assert_suggestions_eventually_shown()
198
        self.assert_suggestions_eventually_shown()
566
199
        self.assertThat(suggestions.count, Eventually(Equals(2)))
567
200
        self.address_bar.write('bleh', clear=False)
568
201
        self.assertThat(suggestions.count, Eventually(Equals(0)))
569
202
        self.address_bar.write('linux')
570
203
        self.assertThat(suggestions.count, Eventually(Equals(1)))
571
204
572
205
    def test_list_of_suggestions_search_limits(self):
573
206
        suggestions = self.main_window.get_suggestions()
574
207
        self.address_bar.write('foo')
575
208
        self.assert_suggestions_eventually_shown()
576
156
        self.assertThat(suggestions.count, Eventually(Equals(4)))
209
        self.assertThat(suggestions.count, Eventually(Equals(4)))
577
157
        self.address_bar.write('bleh', clear=False)
210
        self.address_bar.write('bleh', clear=False)
578
158
        self.assertThat(suggestions.count, Eventually(Equals(0)))
211
        self.assertThat(suggestions.count, Eventually(Equals(0)))
579
159
        self.address_bar.write('linux')
580
160
        self.assertThat(suggestions.count, Eventually(Equals(2)))
581
161
212
582
162
    def test_list_of_suggestions_order(self):
213
    def test_list_of_suggestions_order(self):
583
163
        suggestions = self.main_window.get_suggestions()
214
        suggestions = self.main_window.get_suggestions()
584
164
        self.address_bar.write('QML')
215
        self.address_bar.write('QML')
585
165
        self.assert_suggestions_eventually_shown()
216
        self.assert_suggestions_eventually_shown()
587
166
        self.assertThat(suggestions.count, Eventually(Equals(2)))
217
        self.assertThat(suggestions.count, Eventually(Equals(5)))
588
167
        entries = suggestions.get_ordered_entries()
218
        entries = suggestions.get_ordered_entries()
590
168
        self.assertThat(len(entries), Equals(2))
219
        self.assertThat(len(entries), Equals(5))
591
169
        self.assertThat(entries[0].icon, Equals("history"))
220
        self.assertThat(entries[0].icon, Equals("history"))
592
170
        self.assertThat(entries[1].icon, Equals("non-starred"))
221
        self.assertThat(entries[1].icon, Equals("non-starred"))
593
222
        self.assertThat(entries[2].icon, Equals("search"))
594
171
223
595
172
    def test_clear_address_bar_dismisses_suggestions(self):
224
    def test_clear_address_bar_dismisses_suggestions(self):
596
173
        self.address_bar.focus()
225
        self.address_bar.focus()
597
@@ -208,21 +260,29 @@
598
208
        self.address_bar.focus()
260
        self.address_bar.focus()
599
209
        self.assert_suggestions_eventually_shown()
261
        self.assert_suggestions_eventually_shown()
600
210
        self.address_bar.clear()
262
        self.address_bar.clear()
614
211
        self.address_bar.write('ubuntu')
263
        self.address_bar.write('linux')
615
212
        self.assert_suggestions_eventually_shown()
264
        self.assert_suggestions_eventually_shown()
616
213
        self.assertThat(suggestions.count, Eventually(Equals(4)))
265
        self.assertThat(suggestions.count, Eventually(Equals(1)))
617
214
        entries = suggestions.get_ordered_entries()
266
        entries = suggestions.get_ordered_entries()
618
215
        highlight = '<b><font color="#dd4814">Ubuntu</font></b>'
267
        url = "http://en.wikipedia.org/wiki/Linux"
619
216
        url = "http://en.wikipedia.org/wiki/{}_(operating_system)"
268
        self.pointing_device.click_object(entries[0])
620
217
        url = url.format(highlight)
269
        webview = self.main_window.get_current_webview()
621
218
        entries = [entry for entry in entries if url in entry.subtitle]
270
        self.assertThat(webview.url, Eventually(Equals(url)))
622
219
        entry = entries[0] if len(entries) == 1 else None
271
        self.assert_suggestions_eventually_hidden()
623
220
        self.assertIsNotNone(entry)
272
624
221
        self.pointing_device.click_object(entry)
273
    def test_select_search_suggestion(self):
625
222
        webview = self.main_window.get_current_webview()
274
        suggestions = self.main_window.get_suggestions()
626
223
        url = "wikipedia.org/wiki/Ubuntu_(operating_system)"
275
        self.address_bar.focus()
627
276
        self.assert_suggestions_eventually_shown()
628
277
        self.address_bar.clear()
629
278
        self.address_bar.write('high')
630
279
        self.assert_suggestions_eventually_shown()
631
280
        self.assertThat(suggestions.count, Eventually(Equals(1)))
632
281
        entries = suggestions.get_ordered_entries()
633
282
        self.pointing_device.click_object(entries[0])
634
283
        webview = self.main_window.get_current_webview()
635
284
        url = "aserver.somewhere/search?q=highlight"
636
224
        self.assertThat(webview.url, Eventually(Contains(url)))
285
        self.assertThat(webview.url, Eventually(Contains(url)))
637
225
        self.assert_suggestions_eventually_hidden()
638
226
286
639
227
    def test_special_characters(self):
287
    def test_special_characters(self):
640
228
        self.address_bar.clear()
288
        self.address_bar.clear()
641
@@ -231,6 +291,15 @@
642
231
        suggestions = self.main_window.get_suggestions()
291
        suggestions = self.main_window.get_suggestions()
643
232
        self.assertThat(suggestions.count, Eventually(Equals(1)))
292
        self.assertThat(suggestions.count, Eventually(Equals(1)))
644
233
        entry = suggestions.get_ordered_entries()[0]
293
        entry = suggestions.get_ordered_entries()[0]
648
234
        highlight = '<b><font color="#dd4814">(phil</font></b>'
294
        url = "http://en.wikipedia.org/wiki/Ubuntu_(philosophy)"
649
235
        url = "http://en.wikipedia.org/wiki/Ubuntu_{}osophy)".format(highlight)
295
        highlighted = self.highlight_term(url, "(phil")
650
236
        self.assertThat(entry.subtitle, Contains(url))
296
        self.assertThat(entry.subtitle, Equals(highlighted))
651
297
652
298
    def test_search_suggestions(self):
653
299
        self.address_bar.write('high')
654
300
        suggestions = self.main_window.get_suggestions()
655
301
        self.assertThat(suggestions.count, Eventually(Equals(1)))
656
302
        entries = suggestions.get_ordered_entries()
657
303
        highlighted = self.highlight_term("highlight", "high")
658
304
        self.assertThat(entries[0].title, Equals(highlighted))
659
305
        self.assertThat(entries[0].subtitle, Equals(''))
Reviewer	Review Type	Date Requested	Status
Olivier Tilloy		2015-05-12	Approve on 2015-05-12
PS Jenkins bot	continuous-integration	2015-05-12	Needs Fixing on 2015-05-12
Review via email: mp+258856@code.launchpad.net