1
=== modified file 'debian/control'
2
--- debian/control	2015-08-11 11:18:36 +0000
3
+++ debian/control	2015-08-12 13:42:27 +0000
4
@@ -11,6 +11,7 @@
5
11
               python3-all,
11
               python3-all,
6
12
               python3-flake8,
12
               python3-flake8,
7
13
               qml-module-qt-labs-folderlistmodel,
13
               qml-module-qt-labs-folderlistmodel,
8
14
               qml-module-qt-labs-settings,
9
14
               qml-module-qtquick2 (>= 5.4),
15
               qml-module-qtquick2 (>= 5.4),
10
15
               qml-module-qttest,
16
               qml-module-qttest,
11
16
               qt5-default,
17
               qt5-default,
12
17
18
13
=== modified file 'src/app/webbrowser/Browser.qml'
14
--- src/app/webbrowser/Browser.qml	2015-08-11 10:37:56 +0000
15
+++ src/app/webbrowser/Browser.qml	2015-08-12 13:42:27 +0000
16
@@ -119,12 +119,14 @@
17
119
        property string searchEngine: settingsDefaults.searchEngine
119
        property string searchEngine: settingsDefaults.searchEngine
18
120
        property string allowOpenInBackgroundTab: settingsDefaults.allowOpenInBackgroundTab
120
        property string allowOpenInBackgroundTab: settingsDefaults.allowOpenInBackgroundTab
19
121
        property bool restoreSession: settingsDefaults.restoreSession
121
        property bool restoreSession: settingsDefaults.restoreSession
20
122
        property int newTabDefaultSection: settingsDefaults.newTabDefaultSection
21
122
123
22
123
        function restoreDefaults() {
124
        function restoreDefaults() {
23
124
            homepage  = settingsDefaults.homepage
125
            homepage  = settingsDefaults.homepage
24
125
            searchEngine = settingsDefaults.searchEngine
126
            searchEngine = settingsDefaults.searchEngine
25
126
            allowOpenInBackgroundTab = settingsDefaults.allowOpenInBackgroundTab
127
            allowOpenInBackgroundTab = settingsDefaults.allowOpenInBackgroundTab
26
127
            restoreSession = settingsDefaults.restoreSession
128
            restoreSession = settingsDefaults.restoreSession
27
129
            newTabDefaultSection = settingsDefaults.newTabDefaultSection
28
128
        }
130
        }
29
129
    }
131
    }
30
130
132
31
@@ -135,6 +137,7 @@
32
135
        readonly property string searchEngine: "google"
137
        readonly property string searchEngine: "google"
33
136
        readonly property string allowOpenInBackgroundTab: "default"
138
        readonly property string allowOpenInBackgroundTab: "default"
34
137
        readonly property bool restoreSession: true
139
        readonly property bool restoreSession: true
35
140
        readonly property int newTabDefaultSection: 0
36
138
    }
141
    }
37
139
142
38
140
    FocusScope {
143
    FocusScope {
39
@@ -219,6 +222,7 @@
40
219
                }
222
                }
41
220
            }
223
            }
42
221
            active: false
224
            active: false
43
225
            asynchronous: true
44
222
226
45
223
            Connections {
227
            Connections {
46
224
                target: browser
228
                target: browser
47
@@ -230,35 +234,61 @@
48
230
                }
234
                }
49
231
            }
235
            }
50
232
236
52
233
            sourceComponent: browser.incognito ? newPrivateTabViewComponent : newTabViewComponent
237
            sourceComponent: browser.incognito ? newPrivateTabView :
53
238
                             (browser.wide ? newTabViewWide : newTabView)
54
234
239
55
235
            Component {
240
            Component {
57
236
                id: newTabViewComponent
241
                id: newTabView
58
237
242
59
238
                NewTabView {
243
                NewTabView {
83
239
                    historyModel: browser.historyModel
244
                    anchors.fill: parent
84
240
                    bookmarksModel: browser.bookmarksModel
245
                    historyModel: browser.historyModel
85
241
                    settingsObject: settings
246
                    bookmarksModel: browser.bookmarksModel
86
242
                    onBookmarkClicked: {
247
                    settingsObject: settings
87
243
                        chrome.requestedUrl = url
248
                    focus: true
88
244
                        currentWebview.url = url
249
                    onBookmarkClicked: {
89
245
                        tabContainer.forceActiveFocus()
250
                        chrome.requestedUrl = url
90
246
                    }
251
                        currentWebview.url = url
91
247
                    onBookmarkRemoved: browser.bookmarksModel.remove(url)
252
                        tabContainer.forceActiveFocus()
92
248
                    onHistoryEntryClicked: {
253
                    }
93
249
                        chrome.requestedUrl = url
254
                    onBookmarkRemoved: browser.bookmarksModel.remove(url)
94
250
                        currentWebview.url = url
255
                    onHistoryEntryClicked: {
95
251
                        tabContainer.forceActiveFocus()
256
                        chrome.requestedUrl = url
96
252
                    }
257
                        currentWebview.url = url
97
253
                }
258
                        tabContainer.forceActiveFocus()
98
254
            }
259
                    }
99
255
260
                }
100
256
            Component {
261
            }
101
257
                id: newPrivateTabViewComponent
262
102
258
263
            Component {
103
259
                NewPrivateTabView { }
264
                id: newTabViewWide
104
260
            }
265
105
261
            asynchronous: true
266
                NewTabViewWide {
106
267
                    anchors.fill: parent
107
268
                    historyModel: browser.historyModel
108
269
                    bookmarksModel: browser.bookmarksModel
109
270
                    settingsObject: settings
110
271
                    focus: true
111
272
                    onBookmarkClicked: {
112
273
                        chrome.requestedUrl = url
113
274
                        currentWebview.url = url
114
275
                        tabContainer.forceActiveFocus()
115
276
                    }
116
277
                    onBookmarkRemoved: browser.bookmarksModel.remove(url)
117
278
                    onHistoryEntryClicked: {
118
279
                        chrome.requestedUrl = url
119
280
                        currentWebview.url = url
120
281
                        tabContainer.forceActiveFocus()
121
282
                    }
122
283
                    onReleasingKeyboardFocus: chrome.focus = true
123
284
                }
124
285
            }
125
286
126
287
            Component {
127
288
                id: newPrivateTabView
128
289
129
290
                NewPrivateTabView { anchors.fill: parent }
130
291
            }
131
262
        }
292
        }
132
263
293
133
264
        SearchEngine {
294
        SearchEngine {
134
@@ -391,7 +421,13 @@
135
391
            canSimplifyText: !browser.wide
421
            canSimplifyText: !browser.wide
136
392
            editing: activeFocus || suggestionsList.activeFocus
422
            editing: activeFocus || suggestionsList.activeFocus
137
393
423
139
394
            Keys.onDownPressed: if (suggestionsList.count) suggestionsList.focus = true
424
            Keys.onDownPressed: {
140
425
                if (suggestionsList.count) suggestionsList.focus = true
141
426
                else if (newTabViewLoader.status == Loader.Ready) {
142
427
                    newTabViewLoader.focus = true
143
428
                }
144
429
            }
145
430
146
395
            Keys.onEscapePressed: {
431
            Keys.onEscapePressed: {
147
396
                if (chrome.findInPageMode) {
432
                if (chrome.findInPageMode) {
148
397
                    chrome.findInPageMode = false
433
                    chrome.findInPageMode = false
149
@@ -1134,7 +1170,7 @@
150
1134
            PopupUtils.open(bookmarkOptionsComponent,
1170
            PopupUtils.open(bookmarkOptionsComponent,
151
1135
                            chrome.bookmarkTogglePlaceHolder,
1171
                            chrome.bookmarkTogglePlaceHolder,
152
1136
                            {"bookmarkUrl": url,
1172
                            {"bookmarkUrl": url,
154
1137
                             "bookmarkTitle": title}) 
1173
                             "bookmarkTitle": title})
155
1138
        }
1174
        }
156
1139
    }
1175
    }
157
1140
1176
158
1141
1177
159
=== added file 'src/app/webbrowser/DraggableUrlDelegateWide.qml'
160
--- src/app/webbrowser/DraggableUrlDelegateWide.qml	1970-01-01 00:00:00 +0000
161
+++ src/app/webbrowser/DraggableUrlDelegateWide.qml	2015-08-12 13:42:27 +0000
162
@@ -0,0 +1,98 @@
163
1
/*
164
2
 * Copyright 2015 Canonical Ltd.
165
3
 *
166
4
 * This file is part of webbrowser-app.
167
5
 *
168
6
 * webbrowser-app is free software; you can redistribute it and/or modify
169
7
 * it under the terms of the GNU General Public License as published by
170
8
 * the Free Software Foundation; version 3.
171
9
 *
172
10
 * webbrowser-app is distributed in the hope that it will be useful,
173
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
174
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
175
13
 * GNU General Public License for more details.
176
14
 *
177
15
 * You should have received a copy of the GNU General Public License
178
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
179
17
 */
180
18
181
19
import QtQuick 2.4
182
20
import Ubuntu.Components 1.3
183
21
184
22
UrlDelegateWide {
185
23
    id: item
186
24
187
25
    z: Drag.active ? 1 : 0 // display on top of siblings while dragging
188
26
    Drag.active: gripArea.drag.active
189
27
    Drag.hotSpot.x: grip.x
190
28
    Drag.hotSpot.y: grip.y
191
29
    Drag.onActiveChanged: {
192
30
        if (item.Drag.active) {
193
31
            internal.positionBeforeDrag = Qt.point(x, y)
194
32
            item.dragStarted()
195
33
        }
196
34
    }
197
35
198
36
    property bool draggable: true
199
37
    property int gripMargin: units.gu(1)
200
38
    signal dragStarted()
201
39
    signal dragEnded(var dragAndDrop)
202
40
203
41
    // only monitors hover events without capturing any click or drag
204
42
    MouseArea {
205
43
        id: hoverArea
206
44
        anchors.fill: parent
207
45
        acceptedButtons: Qt.NoButton
208
46
        hoverEnabled: true
209
47
    }
210
48
211
49
    Icon {
212
50
        id: grip
213
51
        objectName: "dragGrip"
214
52
215
53
        anchors.verticalCenter: parent.verticalCenter
216
54
        anchors.right: parent.right
217
55
        anchors.rightMargin: item.gripMargin
218
56
219
57
        width: units.gu(3)
220
58
        height: width
221
59
        name: "view-grid-symbolic"
222
60
223
61
        opacity: item.draggable && hoverArea.containsMouse ? 1.0 : 0.0
224
62
        Behavior on opacity {
225
63
            NumberAnimation {
226
64
                duration: UbuntuAnimation.SnapDuration
227
65
                easing: UbuntuAnimation.StandardEasing
228
66
            }
229
67
        }
230
68
231
69
        MouseArea {
232
70
            id: gripArea
233
71
            anchors.fill: parent
234
72
            drag.target: item.draggable ? item : null
235
73
            onReleased: {
236
74
                var result = { success: false, target: item.Drag.target }
237
75
                item.dragEnded(result)
238
76
                if (result.success) item.Drag.drop()
239
77
                else {
240
78
                    item.x = internal.positionBeforeDrag.x
241
79
                    item.y = internal.positionBeforeDrag.y
242
80
                    item.Drag.cancel()
243
81
                }
244
82
            }
245
83
        }
246
84
    }
247
85
248
86
    Rectangle {
249
87
        anchors.fill: parent
250
88
        color: "transparent"
251
89
        border.color: UbuntuColors.lightGrey
252
90
        border.width: 1
253
91
        visible: item.Drag.active
254
92
    }
255
93
256
94
    QtObject {
257
95
        id: internal
258
96
        property point positionBeforeDrag
259
97
    }
260
98
}
261
0
99
262
=== added file 'src/app/webbrowser/NewTabViewWide.qml'
263
--- src/app/webbrowser/NewTabViewWide.qml	1970-01-01 00:00:00 +0000
264
+++ src/app/webbrowser/NewTabViewWide.qml	2015-08-12 13:42:27 +0000
265
@@ -0,0 +1,317 @@
266
1
/*
267
2
 * Copyright 2015 Canonical Ltd.
268
3
 *
269
4
 * This file is part of webbrowser-app.
270
5
 *
271
6
 * webbrowser-app is free software; you can redistribute it and/or modify
272
7
 * it under the terms of the GNU General Public License as published by
273
8
 * the Free Software Foundation; version 3.
274
9
 *
275
10
 * webbrowser-app is distributed in the hope that it will be useful,
276
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
277
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
278
13
 * GNU General Public License for more details.
279
14
 *
280
15
 * You should have received a copy of the GNU General Public License
281
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
282
17
 */
283
18
284
19
import QtQuick 2.4
285
20
import Qt.labs.settings 1.0
286
21
import Ubuntu.Components 1.3
287
22
import webbrowserapp.private 0.1
288
23
import ".."
289
24
290
25
FocusScope {
291
26
    id: newTabViewWide
292
27
293
28
    property QtObject bookmarksModel
294
29
    property alias historyModel: historyTimeframeModel.sourceModel
295
30
    property QtObject settingsObject
296
31
    property alias selectedIndex: sections.selectedIndex
297
32
    readonly property bool inBookmarksView: newTabViewWide.selectedIndex === 1
298
33
299
34
    signal bookmarkClicked(url url)
300
35
    signal bookmarkRemoved(url url)
301
36
    signal historyEntryClicked(url url)
302
37
    signal releasingKeyboardFocus()
303
38
304
39
    Keys.onTabPressed: selectedIndex = (selectedIndex + 1) % 2
305
40
    Keys.onBacktabPressed: selectedIndex = Math.abs((selectedIndex - 1) % 2)
306
41
    onActiveFocusChanged: {
307
42
        if (activeFocus) {
308
43
            if (inBookmarksView) {
309
44
                if (sections.lastFocusedBookmarksColumn === bookmarksList &&
310
45
                    bookmarksList.model.length === 0) {
311
46
                    sections.lastFocusedBookmarksColumn = folders
312
47
                }
313
48
                sections.lastFocusedBookmarksColumn.focus = true
314
49
            }
315
50
            else topSitesList.focus = true
316
51
        }
317
52
    }
318
53
319
54
    LimitProxyModel {
320
55
        id: topSitesModel
321
56
        limit: 10
322
57
        sourceModel: TopSitesModel {
323
58
            sourceModel: HistoryTimeframeModel {
324
59
                id: historyTimeframeModel
325
60
            }
326
61
        }
327
62
    }
328
63
329
64
    Rectangle {
330
65
        anchors.fill: parent
331
66
        color: "#fbfbfb"
332
67
    }
333
68
334
69
    ListView {
335
70
        id: folders
336
71
        objectName: "foldersList"
337
72
        visible: inBookmarksView
338
73
339
74
        Keys.onRightPressed: if (bookmarksList.model.length > 0) bookmarksList.focus = true
340
75
        Keys.onDownPressed: currentIndex = Math.min(currentIndex + 1, folders.model.count - 1)
341
76
        Keys.onUpPressed: {
342
77
            if (currentIndex > 0) currentIndex = Math.max(currentIndex - 1, 0)
343
78
            else newTabViewWide.releasingKeyboardFocus()
344
79
        }
345
80
        onActiveFocusChanged: {
346
81
            if (activeFocus) {
347
82
                sections.lastFocusedBookmarksColumn = folders
348
83
                if (currentIndex < 0) currentIndex = 0
349
84
            }
350
85
        }
351
86
352
87
        anchors {
353
88
            top: sectionsGroup.bottom
354
89
            bottom: parent.bottom
355
90
            left: parent.left
356
91
            topMargin: units.gu(2)
357
92
        }
358
93
        width: units.gu(25)
359
94
360
95
        currentIndex: 0
361
96
        model: BookmarksFolderListModel {
362
97
            sourceModel: newTabViewWide.bookmarksModel
363
98
        }
364
99
365
100
        delegate: ListItem {
366
101
            id: folderItem
367
102
            objectName: "folderItem"
368
103
            property var model: entries
369
104
            property bool isActiveFolder: ListView.isCurrentItem
370
105
            property bool isCurrentItem: ListView.isCurrentItem
371
106
            property bool isAllBookmarksFolder: folder.length === 0
372
107
            property alias name: dropArea.folderName
373
108
            divider.visible: false
374
109
375
110
            property bool isCurrentDropTarget: dropArea.containsDrag && dropArea.drag.source.folder !== folder
376
111
            color: isCurrentDropTarget ? "green" :
377
112
                   ((folders.activeFocus && isActiveFolder) ? Qt.rgba(0, 0, 0, 0.05) : "transparent")
378
113
379
114
            Label {
380
115
                anchors.verticalCenter: parent.verticalCenter
381
116
                anchors.left: parent.left
382
117
                anchors.right: parent.right
383
118
                anchors.leftMargin: units.gu(2)
384
119
                anchors.rightMargin: units.gu(2)
385
120
386
121
                fontSize: isAllBookmarksFolder ? "medium" : "small"
387
122
                text: isAllBookmarksFolder ? i18n.tr("All Bookmarks") : folderItem.name
388
123
                color: isActiveFolder ? UbuntuColors.orange : UbuntuColors.darkGrey
389
124
            }
390
125
391
126
            onClicked: folders.currentIndex = index
392
127
393
128
            DropArea {
394
129
                id: dropArea
395
130
                anchors.fill: parent
396
131
                property string folderName: folder
397
132
            }
398
133
        }
399
134
    }
400
135
401
136
    Scrollbar {
402
137
        flickableItem: folders
403
138
    }
404
139
405
140
    ListView {
406
141
        id: bookmarksList
407
142
        objectName: "bookmarksList"
408
143
        anchors {
409
144
            top: sectionsGroup.bottom
410
145
            bottom: parent.bottom
411
146
            left: folders.right
412
147
            right: parent.right
413
148
            topMargin: units.gu(2)
414
149
        }
415
150
        visible: inBookmarksView
416
151
        onActiveFocusChanged: if (activeFocus) sections.lastFocusedBookmarksColumn = bookmarksList
417
152
418
153
        // Build a temporary model for the bookmarks list that includes, when
419
154
        // necessary, the homepage bookmark as a fixed first item in the list
420
155
        model: {
421
156
            if (!folders.currentItem) return null
422
157
423
158
            var items = []
424
159
            if (folders.currentItem.isAllBookmarksFolder) items.push({
425
160
                title: i18n.tr("Homepage"),
426
161
                url: newTabViewWide.settingsObject.homepage,
427
162
                folder: ""
428
163
            })
429
164
430
165
            if (!folders.currentItem.model) return null
431
166
            for (var i = 0; i < folders.currentItem.model.count; i++) {
432
167
                items.push(folders.currentItem.model.get(i))
433
168
            }
434
169
            return items
435
170
        }
436
171
437
172
        currentIndex: 0
438
173
439
174
        delegate: DraggableUrlDelegateWide {
440
175
            objectName: "bookmarkItem"
441
176
            clip: true
442
177
443
178
            title: modelData.title
444
179
            icon: modelData.icon ? modelData.icon : ""
445
180
            url: modelData.url
446
181
447
182
            property string folder: modelData.folder
448
183
            property bool isHomeBookmark: folder === "" && index === 0
449
184
450
185
            removable: !isHomeBookmark
451
186
            draggable: !isHomeBookmark && contentItem.x === 0
452
187
            highlighted: bookmarksList.activeFocus && ListView.isCurrentItem
453
188
454
189
            onClicked: newTabViewWide.bookmarkClicked(url)
455
190
            onRemoved: newTabViewWide.bookmarkRemoved(url)
456
191
457
192
            // Larger margin to prevent interference from Scrollbar hovering area
458
193
            gripMargin: units.gu(4)
459
194
            onDragStarted: {
460
195
                // Remove interactivity to prevent the list from scrolling
461
196
                // while dragging near its margins. This ensures we can correctly
462
197
                // return the item to its original position on a failed drop.
463
198
                bookmarksList.interactive = false
464
199
465
200
                // Relinquish focus as the presses and releases that compose the
466
201
                // drag will move the keyboard focus in a location unexpected
467
202
                // for the user. This way it will go back to the address bar and
468
203
                // the user can predictably resume keyboard interaction from there.
469
204
                newTabViewWide.releasingKeyboardFocus()
470
205
            }
471
206
            onDragEnded: {
472
207
                bookmarksList.interactive = true
473
208
474
209
                if (dragAndDrop.target && dragAndDrop.target.folderName !== folder) {
475
210
                    bookmarksModel.update(modelData.url, modelData.title,
476
211
                                          dragAndDrop.target.folderName)
477
212
                    dragAndDrop.success = true
478
213
                }
479
214
            }
480
215
        }
481
216
482
217
        Keys.onReturnPressed: newTabViewWide.bookmarkClicked(currentItem.url)
483
218
        Keys.onDeletePressed: {
484
219
            if (currentItem.removable) {
485
220
                newTabViewWide.bookmarkRemoved(currentItem.url)
486
221
                if (bookmarksList.model.length === 0) folders.focus = true
487
222
            }
488
223
        }
489
224
        Keys.onLeftPressed: folders.focus = true
490
225
        Keys.onDownPressed: currentIndex = Math.min(currentIndex + 1, model.length - 1)
491
226
        Keys.onUpPressed: {
492
227
            if (currentIndex > 0) currentIndex = Math.max(currentIndex - 1, 0)
493
228
            else newTabViewWide.releasingKeyboardFocus()
494
229
        }
495
230
    }
496
231
497
232
    Scrollbar {
498
233
        flickableItem: bookmarksList
499
234
    }
500
235
501
236
    ListView {
502
237
        id: topSitesList
503
238
        objectName: "topSitesList"
504
239
        anchors {
505
240
            top: sectionsGroup.bottom
506
241
            bottom: parent.bottom
507
242
            left: parent.left
508
243
            right: parent.right
509
244
            topMargin: units.gu(2)
510
245
        }
511
246
512
247
        visible: !inBookmarksView
513
248
        currentIndex: 0
514
249
515
250
        model: topSitesModel
516
251
        delegate: UrlDelegateWide {
517
252
            objectName: "topSiteItem"
518
253
            clip: true
519
254
520
255
            title: model.title
521
256
            icon: model.icon
522
257
            url: model.url
523
258
            highlighted: topSitesList.activeFocus && ListView.isCurrentItem
524
259
525
260
            onClicked: newTabViewWide.historyEntryClicked(url)
526
261
            onRemoved: newTabViewWide.historyModel.hide(url)
527
262
        }
528
263
529
264
        Keys.onReturnPressed: newTabViewWide.historyEntryClicked(currentItem.url)
530
265
        Keys.onDeletePressed: {
531
266
            newTabViewWide.historyModel.hide(currentItem.url)
532
267
            if (topSitesList.model.count === 0) newTabViewWide.releasingKeyboardFocus()
533
268
        }
534
269
        Keys.onDownPressed: currentIndex = Math.min(currentIndex + 1, model.count - 1)
535
270
        Keys.onUpPressed: {
536
271
            if (currentIndex > 0) currentIndex = Math.max(currentIndex - 1, 0)
537
272
            else newTabViewWide.releasingKeyboardFocus()
538
273
        }
539
274
    }
540
275
541
276
    Scrollbar {
542
277
        flickableItem: topSitesList
543
278
    }
544
279
545
280
    Rectangle {
546
281
        id: sectionsGroup
547
282
        anchors {
548
283
            top: parent.top
549
284
            left: parent.left
550
285
            right: parent.right
551
286
        }
552
287
        color: "#dedede"
553
288
        height: sections.height
554
289
555
290
        Sections {
556
291
            id: sections
557
292
            objectName: "sections"
558
293
            anchors {
559
294
                left: parent.left
560
295
                top: parent.top
561
296
                leftMargin: units.gu(1)
562
297
            }
563
298
564
299
            selectedIndex: settingsObject.newTabDefaultSection
565
300
            onSelectedIndexChanged: {
566
301
                settingsObject.newTabDefaultSection = selectedIndex
567
302
                if (selectedIndex === 0) topSitesList.focus = true
568
303
                else {
569
304
                    if (lastFocusedBookmarksColumn) lastFocusedBookmarksColumn.focus = true
570
305
                    else folders.focus = true
571
306
                }
572
307
573
308
            }
574
309
            property var lastFocusedBookmarksColumn: folders
575
310
576
311
            actions: [
577
312
                Action { text: i18n.tr("Top sites") },
578
313
                Action { text: i18n.tr("Bookmarks") }
579
314
            ]
580
315
        }
581
316
    }
582
317
}
583
0
318
584
=== added file 'src/app/webbrowser/UrlDelegateWide.qml'
585
--- src/app/webbrowser/UrlDelegateWide.qml	1970-01-01 00:00:00 +0000
586
+++ src/app/webbrowser/UrlDelegateWide.qml	2015-08-12 13:42:27 +0000
587
@@ -0,0 +1,86 @@
588
1
/*
589
2
 * Copyright 2015 Canonical Ltd.
590
3
 *
591
4
 * This file is part of webbrowser-app.
592
5
 *
593
6
 * webbrowser-app is free software; you can redistribute it and/or modify
594
7
 * it under the terms of the GNU General Public License as published by
595
8
 * the Free Software Foundation; version 3.
596
9
 *
597
10
 * webbrowser-app is distributed in the hope that it will be useful,
598
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
599
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
600
13
 * GNU General Public License for more details.
601
14
 *
602
15
 * You should have received a copy of the GNU General Public License
603
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
604
17
 */
605
18
606
19
import QtQuick 2.4
607
20
import Ubuntu.Components 1.3
608
21
import ".."
609
22
610
23
ListItem {
611
24
    id: urlDelegate
612
25
613
26
    property alias icon: icon.source
614
27
    property alias title: title.text
615
28
    property alias url: url.text
616
29
    property bool highlighted: false
617
30
    property bool removable: true
618
31
619
32
    color: highlighted ? Qt.rgba(0, 0, 0, 0.05) : "transparent"
620
33
621
34
    divider.visible: false
622
35
    height: units.gu(7)
623
36
624
37
    signal removed()
625
38
626
39
    Favicon {
627
40
        id: icon
628
41
        anchors {
629
42
            verticalCenter: parent.verticalCenter
630
43
            left: parent.left
631
44
            leftMargin: units.gu(1.5)
632
45
        }
633
46
    }
634
47
635
48
    Column {
636
49
        width: parent.width - icon.width - parent.spacing
637
50
        anchors {
638
51
            left: icon.right
639
52
            leftMargin: units.gu(1)
640
53
            verticalCenter: parent.verticalCenter
641
54
        }
642
55
643
56
        Label {
644
57
            id: title
645
58
646
59
            fontSize: "small"
647
60
            color: highlighted ? UbuntuColors.orange : UbuntuColors.darkGrey
648
61
            wrapMode: Text.Wrap
649
62
            elide: Text.ElideRight
650
63
            maximumLineCount: 1
651
64
        }
652
65
653
66
        Label {
654
67
            id: url
655
68
656
69
            fontSize: "small"
657
70
            color: highlighted ? UbuntuColors.orange : UbuntuColors.darkGrey
658
71
            wrapMode: Text.Wrap
659
72
            elide: Text.ElideRight
660
73
            maximumLineCount: 1
661
74
        }
662
75
    }
663
76
664
77
    property var _deleteAction: Action {
665
78
        objectName: "leadingAction.delete"
666
79
        iconName: "delete"
667
80
        onTriggered: urlDelegate.removed()
668
81
    }
669
82
670
83
    leadingActions: ListItemActions {
671
84
        actions: removable ? [_deleteAction] : []
672
85
    }
673
86
}
674
0
87
675
=== modified file 'src/app/webbrowser/bookmarks-folder-model.cpp'
676
--- src/app/webbrowser/bookmarks-folder-model.cpp	2015-06-17 02:17:45 +0000
677
+++ src/app/webbrowser/bookmarks-folder-model.cpp	2015-08-12 13:42:27 +0000
678
@@ -34,7 +34,7 @@
679
34
    with the same name that the filter folder name (case-sensitive
34
    with the same name that the filter folder name (case-sensitive
680
35
    comparison).
35
    comparison).
681
36
36
683
37
    When no folder name is set (null or empty string), all entries that 
37
    When no folder name is set (null or empty string), all entries that
684
38
    are not stored in any folder match.
38
    are not stored in any folder match.
685
39
*/
39
*/
686
40
BookmarksFolderModel::BookmarksFolderModel(QObject* parent)
40
BookmarksFolderModel::BookmarksFolderModel(QObject* parent)
687
@@ -76,6 +76,26 @@
688
76
    return rowCount();
76
    return rowCount();
689
77
}
77
}
690
78
78
691
79
QVariantMap BookmarksFolderModel::get(int row) const
692
80
{
693
81
    if (row < 0 || row >= rowCount()) {
694
82
        return QVariantMap();
695
83
    }
696
84
697
85
    QVariantMap res;
698
86
    QHash<int,QByteArray> names = roleNames();
699
87
    QHashIterator<int, QByteArray> i(names);
700
88
701
89
    while (i.hasNext()) {
702
90
        i.next();
703
91
        QModelIndex idx = index(row, 0);
704
92
        QVariant data = idx.data(i.key());
705
93
        res[i.value()] = data;
706
94
    }
707
95
708
96
    return res;
709
97
}
710
98
711
79
bool BookmarksFolderModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
99
bool BookmarksFolderModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
712
80
{
100
{
713
81
    QModelIndex index = sourceModel()->index(source_row, 0, source_parent);
101
    QModelIndex index = sourceModel()->index(source_row, 0, source_parent);
714
82
102
715
=== modified file 'src/app/webbrowser/bookmarks-folder-model.h'
716
--- src/app/webbrowser/bookmarks-folder-model.h	2015-06-17 02:17:45 +0000
717
+++ src/app/webbrowser/bookmarks-folder-model.h	2015-08-12 13:42:27 +0000
718
@@ -43,6 +43,7 @@
719
43
    void setFolder(const QString& domain);
43
    void setFolder(const QString& domain);
720
44
44
721
45
    int count() const;
45
    int count() const;
722
46
    Q_INVOKABLE QVariantMap get(int row) const;
723
46
47
724
47
Q_SIGNALS:
48
Q_SIGNALS:
725
48
    void sourceModelChanged() const;
49
    void sourceModelChanged() const;
726
49
50
727
=== modified file 'src/app/webbrowser/bookmarks-folderlist-model.cpp'
728
--- src/app/webbrowser/bookmarks-folderlist-model.cpp	2015-07-01 01:23:07 +0000
729
+++ src/app/webbrowser/bookmarks-folderlist-model.cpp	2015-08-12 13:42:27 +0000
730
@@ -99,6 +99,7 @@
731
99
        }
99
        }
732
100
        endResetModel();
100
        endResetModel();
733
101
        Q_EMIT sourceModelChanged();
101
        Q_EMIT sourceModelChanged();
734
102
        Q_EMIT countChanged();
735
102
    }
103
    }
736
103
}
104
}
737
104
105
738
@@ -174,6 +175,8 @@
739
174
        beginInsertRows(QModelIndex(), insertAt, insertAt);
175
        beginInsertRows(QModelIndex(), insertAt, insertAt);
740
175
        addFolder(folder);
176
        addFolder(folder);
741
176
        endInsertRows();
177
        endInsertRows();
742
178
743
179
        Q_EMIT countChanged();
744
177
    }
180
    }
745
178
}
181
}
746
179
182
747
@@ -183,6 +186,8 @@
748
183
    clearFolders();
186
    clearFolders();
749
184
    populateModel();
187
    populateModel();
750
185
    endResetModel();
188
    endResetModel();
751
189
752
190
    Q_EMIT countChanged();
753
186
}
191
}
754
187
192
755
188
void BookmarksFolderListModel::addFolder(const QString& folder)
193
void BookmarksFolderListModel::addFolder(const QString& folder)
756
189
194
757
=== modified file 'src/app/webbrowser/bookmarks-folderlist-model.h'
758
--- src/app/webbrowser/bookmarks-folderlist-model.h	2015-06-30 21:09:20 +0000
759
+++ src/app/webbrowser/bookmarks-folderlist-model.h	2015-08-12 13:42:27 +0000
760
@@ -32,6 +32,7 @@
761
32
    Q_OBJECT
32
    Q_OBJECT
762
33
33
763
34
    Q_PROPERTY(BookmarksModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged)
34
    Q_PROPERTY(BookmarksModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged)
764
35
    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
765
35
36
766
36
    Q_ENUMS(Roles)
37
    Q_ENUMS(Roles)
767
37
38
768
@@ -58,6 +59,7 @@
769
58
59
770
59
Q_SIGNALS:
60
Q_SIGNALS:
771
60
    void sourceModelChanged() const;
61
    void sourceModelChanged() const;
772
62
    void countChanged() const;
773
61
63
774
62
private Q_SLOTS:
64
private Q_SLOTS:
775
63
    void onFolderAdded(const QString& folder);
65
    void onFolderAdded(const QString& folder);
776
64
66
777
=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
778
--- tests/autopilot/webbrowser_app/emulators/browser.py	2015-08-11 10:37:56 +0000
779
+++ tests/autopilot/webbrowser_app/emulators/browser.py	2015-08-12 13:42:27 +0000
780
@@ -130,7 +130,10 @@
781
130
                                       state="shown")
130
                                       state="shown")
782
131
131
783
132
    def get_new_tab_view(self):
132
    def get_new_tab_view(self):
785
133
        return self.wait_select_single("NewTabView", visible=True)
133
        if self.wide:
786
134
            return self.wait_select_single("NewTabViewWide", visible=True)
787
135
        else:
788
136
            return self.wait_select_single("NewTabView", visible=True)
789
134
137
790
135
    # Since the NewPrivateTabView does not define any new QML property in its
138
    # Since the NewPrivateTabView does not define any new QML property in its
791
136
    # extended file, it does not report itself to autopilot with the same name
139
    # extended file, it does not report itself to autopilot with the same name
792
@@ -166,9 +169,6 @@
793
166
        except exceptions.StateNotFoundError:
169
        except exceptions.StateNotFoundError:
794
167
            return None
170
            return None
795
168
171
796
169
    def get_bookmarks_folder_list_view(self):
797
170
        return self.select_single(BookmarksFolderListView)
798
171
799
172
    def press_key(self, key):
172
    def press_key(self, key):
800
173
        self.keyboard.press_and_release(key)
173
        self.keyboard.press_and_release(key)
801
174
174
802
@@ -442,6 +442,68 @@
803
442
    def get_notopsites_label(self):
442
    def get_notopsites_label(self):
804
443
        return self.select_single("Label", objectName="notopsites")
443
        return self.select_single("Label", objectName="notopsites")
805
444
444
806
445
    def get_top_site_items(self):
807
446
        return self.get_top_sites_list().get_delegates()
808
447
809
448
    def get_bookmarks_folder_list_view(self):
810
449
        return self.select_single(BookmarksFolderListView)
811
450
812
451
    def get_bookmarks(self, folder_name):
813
452
        # assumes that the "more" button has been clicked
814
453
        folders = self.get_bookmarks_folder_list_view()
815
454
        folder_delegate = folders.get_folder_delegate(folder_name)
816
455
        return folders.get_urls_from_folder(folder_delegate)
817
456
818
457
    def get_folder_names(self):
819
458
        folders = self.get_bookmarks_folder_list_view().get_delegates()
820
459
        return [folder.folderName for folder in folders]
821
460
822
461
823
462
class NewTabViewWide(uitk.UbuntuUIToolkitCustomProxyObjectBase):
824
463
825
464
    def go_to_section(self, section_index):
826
465
        sections = self.select_single(uitk.Sections)
827
466
        if not sections.selectedIndex == section_index:
828
467
            sections.click_section_button(section_index)
829
468
830
469
    def get_bookmarks_list(self):
831
470
        self.go_to_section(1)
832
471
        list = self.select_single(uitk.QQuickListView,
833
472
                                  objectName="bookmarksList")
834
473
        return sorted(list.select_many("DraggableUrlDelegateWide",
835
474
                      objectName="bookmarkItem"),
836
475
                      key=lambda delegate: delegate.globalRect.y)
837
476
838
477
    def get_top_sites_list(self):
839
478
        self.go_to_section(0)
840
479
        list = self.select_single(uitk.QQuickListView,
841
480
                                  objectName="topSitesList")
842
481
        return sorted(list.select_many("UrlDelegateWide",
843
482
                      objectName="topSiteItem"),
844
483
                      key=lambda delegate: delegate.globalRect.y)
845
484
846
485
    def get_folders_list(self):
847
486
        self.go_to_section(1)
848
487
        list = self.select_single(uitk.QQuickListView,
849
488
                                  objectName="foldersList")
850
489
        return sorted(list.select_many(objectName="folderItem"),
851
490
                      key=lambda delegate: delegate.globalRect.y)
852
491
853
492
    def get_top_site_items(self):
854
493
        self.go_to_section(0)
855
494
        return self.get_top_sites_list()
856
495
857
496
    def get_bookmarks(self, folder_name):
858
497
        folders = self.get_folders_list()
859
498
        matches = [folder for folder in folders if folder.name == folder_name]
860
499
        if not len(matches) == 1:
861
500
            return []
862
501
        self.pointing_device.click_object(matches[0])
863
502
        return self.get_bookmarks_list()
864
503
865
504
    def get_folder_names(self):
866
505
        return [folder.name for folder in self.get_folders_list()]
867
506
868
445
507
869
446
class UrlsList(uitk.UbuntuUIToolkitCustomProxyObjectBase):
508
class UrlsList(uitk.UbuntuUIToolkitCustomProxyObjectBase):
870
447
509
871
@@ -458,6 +520,17 @@
872
458
    pass
520
    pass
873
459
521
874
460
522
875
523
class UrlDelegateWide(uitk.UCListItem):
876
524
877
525
    pass
878
526
879
527
880
528
class DraggableUrlDelegateWide(UrlDelegateWide):
881
529
882
530
    def get_grip(self):
883
531
        return self.select_single("Icon", objectName="dragGrip")
884
532
885
533
886
461
class BookmarkOptions(uitk.UbuntuUIToolkitCustomProxyObjectBase):
534
class BookmarkOptions(uitk.UbuntuUIToolkitCustomProxyObjectBase):
887
462
535
888
463
    def get_title_text_field(self):
536
    def get_title_text_field(self):
889
464
537
890
=== modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
891
--- tests/autopilot/webbrowser_app/tests/__init__.py	2015-07-09 20:26:53 +0000
892
+++ tests/autopilot/webbrowser_app/tests/__init__.py	2015-08-12 13:42:27 +0000
893
@@ -143,7 +143,7 @@
894
143
        time.sleep(1)
143
        time.sleep(1)
895
144
        return tabs_view
144
        return tabs_view
896
145
145
898
146
    def open_new_tab(self):
146
    def open_new_tab(self, open_tabs_view=False, expand_view=False):
899
147
        if (self.main_window.incognito):
147
        if (self.main_window.incognito):
900
148
            count = len(self.main_window.get_incognito_webviews())
148
            count = len(self.main_window.get_incognito_webviews())
901
149
        else:
149
        else:
902
@@ -152,7 +152,8 @@
903
152
        if self.main_window.wide:
152
        if self.main_window.wide:
904
153
            self.main_window.chrome.get_tabs_bar().click_new_tab_button()
153
            self.main_window.chrome.get_tabs_bar().click_new_tab_button()
905
154
        else:
154
        else:
907
155
            # assumes the tabs view is already open
155
            if open_tabs_view:
908
156
                self.open_tabs_view()
909
156
            tabs_view = self.main_window.get_tabs_view()
157
            tabs_view = self.main_window.get_tabs_view()
910
157
            toolbar = self.main_window.get_recent_view_toolbar()
158
            toolbar = self.main_window.get_recent_view_toolbar()
911
158
            toolbar.click_action("newTabButton")
159
            toolbar.click_action("newTabButton")
912
@@ -175,6 +176,11 @@
913
175
                self.main_window.address_bar.activeFocus,
176
                self.main_window.address_bar.activeFocus,
914
176
                Eventually(Equals(True)))
177
                Eventually(Equals(True)))
915
177
178
916
179
        if not self.main_window.wide and expand_view:
917
180
            more_button = new_tab_view.get_bookmarks_more_button()
918
181
            self.assertThat(more_button.visible, Equals(True))
919
182
            self.pointing_device.click_object(more_button)
920
183
921
178
        return new_tab_view
184
        return new_tab_view
922
179
185
923
180
    def open_settings(self):
186
    def open_settings(self):
924
181
187
925
=== modified file 'tests/autopilot/webbrowser_app/tests/test_addressbar_bookmark.py'
926
--- tests/autopilot/webbrowser_app/tests/test_addressbar_bookmark.py	2015-07-03 15:06:08 +0000
927
+++ tests/autopilot/webbrowser_app/tests/test_addressbar_bookmark.py	2015-08-12 13:42:27 +0000
928
@@ -32,9 +32,7 @@
929
32
        bookmark_options.wait_until_destroyed()
32
        bookmark_options.wait_until_destroyed()
930
33
        self.assertThat(chrome.bookmarked, Eventually(Equals(True)))
33
        self.assertThat(chrome.bookmarked, Eventually(Equals(True)))
931
34
34
935
35
        if not self.main_window.wide:
35
        self.open_new_tab(open_tabs_view=True)
933
36
            self.open_tabs_view()
934
37
        self.open_new_tab()
936
38
        url = self.base_url + "/test2"
36
        url = self.base_url + "/test2"
937
39
        self.main_window.go_to_url(url)
37
        self.main_window.go_to_url(url)
938
40
        self.main_window.wait_until_page_loaded(url)
38
        self.main_window.wait_until_page_loaded(url)
939
@@ -57,9 +55,7 @@
940
57
        self.assertThat(chrome.bookmarked, Eventually(Equals(False)))
55
        self.assertThat(chrome.bookmarked, Eventually(Equals(False)))
941
58
56
942
59
    def test_cannot_bookmark_empty_page(self):
57
    def test_cannot_bookmark_empty_page(self):
946
60
        if not self.main_window.wide:
58
        self.open_new_tab(open_tabs_view=True)
944
61
            self.open_tabs_view()
945
62
        self.open_new_tab()
947
63
59
948
64
        if self.main_window.wide:
60
        if self.main_window.wide:
949
65
            self.main_window.chrome.get_tabs_bar().select_tab(0)
61
            self.main_window.chrome.get_tabs_bar().select_tab(0)
950
66
62
951
=== modified file 'tests/autopilot/webbrowser_app/tests/test_bookmark_options.py'
952
--- tests/autopilot/webbrowser_app/tests/test_bookmark_options.py	2015-07-09 14:01:15 +0000
953
+++ tests/autopilot/webbrowser_app/tests/test_bookmark_options.py	2015-08-12 13:42:27 +0000
954
@@ -86,27 +86,24 @@
955
86
        connection.commit()
86
        connection.commit()
956
87
        connection.close()
87
        connection.close()
957
88
88
958
89
    def _get_bookmarks_folders_list_view(self):
959
90
        if not self.main_window.wide:
960
91
            self.open_tabs_view()
961
92
        new_tab_view = self.open_new_tab()
962
93
        more_button = new_tab_view.get_bookmarks_more_button()
963
94
        self.assertThat(more_button.visible, Equals(True))
964
95
        self.pointing_device.click_object(more_button)
965
96
        return self.main_window.get_bookmarks_folder_list_view()
966
97
967
98
    def _get_bookmark_options(self):
89
    def _get_bookmark_options(self):
968
99
        address_bar = self.main_window.address_bar
90
        address_bar = self.main_window.address_bar
969
100
        bookmark_toggle = address_bar.get_bookmark_toggle()
91
        bookmark_toggle = address_bar.get_bookmark_toggle()
970
101
        self.pointing_device.click_object(bookmark_toggle)
92
        self.pointing_device.click_object(bookmark_toggle)
971
102
        return self.main_window.get_bookmark_options()
93
        return self.main_window.get_bookmark_options()
972
103
94
973
95
    def _assert_bookmark_count_in_folder(self, tab, folder_name, count):
974
96
        # in wide mode the list of urls in the default folder has the homepage
975
97
        # bookmark in it, but it does not in narrow mode
976
98
        if self.main_window.wide and folder_name == "":
977
99
            count += 1
978
100
979
101
        urls = tab.get_bookmarks(folder_name)
980
102
        self.assertThat(lambda: len(urls), Eventually(Equals(count)))
981
103
982
104
    def test_save_bookmarked_url_in_default_folder(self):
104
    def test_save_bookmarked_url_in_default_folder(self):
988
105
        folders = self._get_bookmarks_folders_list_view()
105
        new_tab = self.open_new_tab(open_tabs_view=True, expand_view=True)
989
106
        folder_delegate = folders.get_folder_delegate("")
106
        self._assert_bookmark_count_in_folder(new_tab, "", 4)
985
107
        self.assertThat(lambda: len(folders.get_urls_from_folder(
986
108
                                    folder_delegate)),
987
109
                        Eventually(Equals(4)))
990
110
107
991
111
        url = self.base_url + "/test2"
108
        url = self.base_url + "/test2"
992
112
        self.main_window.go_to_url(url)
109
        self.main_window.go_to_url(url)
993
@@ -121,20 +118,14 @@
994
121
118
995
122
        self.assertThat(chrome.bookmarked, Eventually(Equals(True)))
119
        self.assertThat(chrome.bookmarked, Eventually(Equals(True)))
996
123
120
1002
124
        folders = self._get_bookmarks_folders_list_view()
121
        new_tab = self.open_new_tab(open_tabs_view=True, expand_view=True)
1003
125
        folder_delegate = folders.get_folder_delegate("")
122
        self._assert_bookmark_count_in_folder(new_tab, "", 5)
999
126
        self.assertThat(lambda: len(folders.get_urls_from_folder(
1000
127
                                    folder_delegate)),
1001
128
                        Eventually(Equals(5)))
1004
129
123
1005
130
    def test_save_bookmarked_url_in_existing_folder(self):
124
    def test_save_bookmarked_url_in_existing_folder(self):
1008
131
        folders = self._get_bookmarks_folders_list_view()
125
        new_tab = self.open_new_tab(open_tabs_view=True, expand_view=True)
1009
132
        self.assertThat(lambda: len(folders.get_delegates()),
126
        self.assertThat(lambda: len(new_tab.get_folder_names()),
1010
133
                        Eventually(Equals(3)))
127
                        Eventually(Equals(3)))
1015
134
        folder_delegate = folders.get_folder_delegate("Actinide")
128
        self._assert_bookmark_count_in_folder(new_tab, "Actinide", 1)
1012
135
        self.assertThat(lambda: len(folders.get_urls_from_folder(
1013
136
                                    folder_delegate)),
1014
137
                        Eventually(Equals(1)))
1016
138
129
1017
139
        url = self.base_url + "/test2"
130
        url = self.base_url + "/test2"
1018
140
        self.main_window.go_to_url(url)
131
        self.main_window.go_to_url(url)
1019
@@ -158,17 +149,14 @@
1020
158
149
1021
159
        self.assertThat(chrome.bookmarked, Eventually(Equals(True)))
150
        self.assertThat(chrome.bookmarked, Eventually(Equals(True)))
1022
160
151
1025
161
        folders = self._get_bookmarks_folders_list_view()
152
        new_tab = self.open_new_tab(open_tabs_view=True, expand_view=True)
1026
162
        self.assertThat(lambda: len(folders.get_delegates()),
153
        self.assertThat(lambda: len(new_tab.get_folder_names()),
1027
163
                        Eventually(Equals(3)))
154
                        Eventually(Equals(3)))
1032
164
        folder_delegate = folders.get_folder_delegate("Actinide")
155
        self._assert_bookmark_count_in_folder(new_tab, "Actinide", 2)
1029
165
        self.assertThat(lambda: len(folders.get_urls_from_folder(
1030
166
                                    folder_delegate)),
1031
167
                        Eventually(Equals(2)))
1033
168
156
1034
169
    def test_save_bookmarked_url_in_new_folder(self):
157
    def test_save_bookmarked_url_in_new_folder(self):
1037
170
        folders = self._get_bookmarks_folders_list_view()
158
        new_tab = self.open_new_tab(open_tabs_view=True, expand_view=True)
1038
171
        self.assertThat(lambda: len(folders.get_delegates()),
159
        self.assertThat(lambda: len(new_tab.get_folder_names()),
1039
172
                        Eventually(Equals(3)))
160
                        Eventually(Equals(3)))
1040
173
161
1041
174
        url = self.base_url + "/test2"
162
        url = self.base_url + "/test2"
1042
@@ -205,13 +193,10 @@
1043
205
193
1044
206
        self.assertThat(chrome.bookmarked, Eventually(Equals(True)))
194
        self.assertThat(chrome.bookmarked, Eventually(Equals(True)))
1045
207
195
1048
208
        folders = self._get_bookmarks_folders_list_view()
196
        new_tab = self.open_new_tab(open_tabs_view=True, expand_view=True)
1049
209
        self.assertThat(lambda: len(folders.get_delegates()),
197
        self.assertThat(lambda: len(new_tab.get_folder_names()),
1050
210
                        Eventually(Equals(4)))
198
                        Eventually(Equals(4)))
1055
211
        folder_delegate = folders.get_folder_delegate("NewFolder")
199
        self._assert_bookmark_count_in_folder(new_tab, "NewFolder", 1)
1052
212
        self.assertThat(lambda: len(folders.get_urls_from_folder(
1053
213
                                    folder_delegate)),
1054
214
                        Eventually(Equals(1)))
1056
215
200
1057
216
    @testtools.skip("Temporarily skipped until popover going out of view with"
201
    @testtools.skip("Temporarily skipped until popover going out of view with"
1058
217
                    " OSK is fixed http://pad.lv/1466222")
202
                    " OSK is fixed http://pad.lv/1466222")
1059
@@ -235,10 +220,11 @@
1060
235
220
1061
236
        self.assertThat(chrome.bookmarked, Eventually(Equals(True)))
221
        self.assertThat(chrome.bookmarked, Eventually(Equals(True)))
1062
237
222
1070
238
        folders = self._get_bookmarks_folders_list_view()
223
        new_tab = self.open_new_tab(open_tabs_view=True, expand_view=True)
1071
239
        folder_delegate = folders.get_folder_delegate("")
224
        self._assert_bookmark_count_in_folder(new_tab, "", 5)
1072
240
        self.assertThat(lambda: len(folders.get_urls_from_folder(
225
1073
241
                                    folder_delegate)),
226
        index = 0
1074
242
                        Eventually(Equals(5)))
227
        if self.main_view.wide:
1075
243
        delegate = folders.get_urls_from_folder(folder_delegate)[0]
228
            index += 1
1076
244
        self.assertThat(delegate.title, Equals("NewTitle"))
229
        bookmark = new_tab.get_bookmarks("")[index]
1077
230
        self.assertThat(bookmark.title, Equals("NewTitle"))
1078
245
231
1079
=== modified file 'tests/autopilot/webbrowser_app/tests/test_findinpage.py'
1080
--- tests/autopilot/webbrowser_app/tests/test_findinpage.py	2015-08-11 11:16:52 +0000
1081
+++ tests/autopilot/webbrowser_app/tests/test_findinpage.py	2015-08-12 13:42:27 +0000
1082
@@ -140,8 +140,7 @@
1083
140
            # (that would otherwise prevent a bottom edge swipe gesture)
140
            # (that would otherwise prevent a bottom edge swipe gesture)
1084
141
            webview = self.main_window.get_current_webview()
141
            webview = self.main_window.get_current_webview()
1085
142
            self.pointing_device.click_object(webview)
142
            self.pointing_device.click_object(webview)
1088
143
            self.open_tabs_view()
143
        self.open_new_tab(open_tabs_view=True)
1087
144
        self.open_new_tab()
1089
145
        self.assertThat(bar.findInPageMode, Eventually(Equals(False)))
144
        self.assertThat(bar.findInPageMode, Eventually(Equals(False)))
1090
146
145
1091
147
    def test_navigation_in_new_tab_exits_findinpage_mode(self):
146
    def test_navigation_in_new_tab_exits_findinpage_mode(self):
1092
148
147
1093
=== modified file 'tests/autopilot/webbrowser_app/tests/test_new_tab_view.py'
1094
--- tests/autopilot/webbrowser_app/tests/test_new_tab_view.py	2015-07-03 15:06:08 +0000
1095
+++ tests/autopilot/webbrowser_app/tests/test_new_tab_view.py	2015-08-12 13:42:27 +0000
1096
@@ -26,20 +26,18 @@
1097
26
26
1098
27
from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
27
from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
1099
28
28
1100
29
from ubuntuuitoolkit import ToolkitException
1101
30
1102
29
31
1103
30
class TestNewTabViewLifetime(StartOpenRemotePageTestCaseBase):
32
class TestNewTabViewLifetime(StartOpenRemotePageTestCaseBase):
1104
31
33
1105
32
    def test_new_tab_view_destroyed_when_browsing(self):
34
    def test_new_tab_view_destroyed_when_browsing(self):
1109
33
        if not self.main_window.wide:
35
        new_tab_view = self.open_new_tab(open_tabs_view=True)
1107
34
            self.open_tabs_view()
1108
35
        new_tab_view = self.open_new_tab()
1110
36
        self.main_window.go_to_url(self.base_url + "/test2")
36
        self.main_window.go_to_url(self.base_url + "/test2")
1111
37
        new_tab_view.wait_until_destroyed()
37
        new_tab_view.wait_until_destroyed()
1112
38
38
1113
39
    def test_new_tab_view_destroyed_when_closing_tab(self):
39
    def test_new_tab_view_destroyed_when_closing_tab(self):
1117
40
        if not self.main_window.wide:
40
        new_tab_view = self.open_new_tab(open_tabs_view=True)
1115
41
            self.open_tabs_view()
1116
42
        new_tab_view = self.open_new_tab()
1118
43
        if self.main_window.wide:
41
        if self.main_window.wide:
1119
44
            self.main_window.chrome.get_tabs_bar().close_tab(1)
42
            self.main_window.chrome.get_tabs_bar().close_tab(1)
1120
45
        else:
43
        else:
1121
@@ -51,13 +49,9 @@
1122
51
49
1123
52
    def test_new_tab_view_is_shared_between_tabs(self):
50
    def test_new_tab_view_is_shared_between_tabs(self):
1124
53
        # Open one new tab
51
        # Open one new tab
1128
54
        if not self.main_window.wide:
52
        new_tab_view = self.open_new_tab(open_tabs_view=True)
1126
55
            self.open_tabs_view()
1127
56
        new_tab_view = self.open_new_tab()
1129
57
        # Open a second new tab
53
        # Open a second new tab
1133
58
        if not self.main_window.wide:
54
        new_tab_view_2 = self.open_new_tab(open_tabs_view=True)
1131
59
            self.open_tabs_view()
1132
60
        new_tab_view_2 = self.open_new_tab()
1134
61
        # Verify that they share the same NewTabView instance
55
        # Verify that they share the same NewTabView instance
1135
62
        self.assertThat(new_tab_view_2.id, Equals(new_tab_view.id))
56
        self.assertThat(new_tab_view_2.id, Equals(new_tab_view.id))
1136
63
        # Close the second new tab, and verify that the NewTabView instance
57
        # Close the second new tab, and verify that the NewTabView instance
1137
@@ -123,13 +117,9 @@
1138
123
        self.main_window.go_to_url(self.base_url + "/test2")
117
        self.main_window.go_to_url(self.base_url + "/test2")
1139
124
        new_private_tab_view.wait_until_destroyed()
118
        new_private_tab_view.wait_until_destroyed()
1140
125
        # Open one new private tab
119
        # Open one new private tab
1144
126
        if not self.main_window.wide:
120
        new_private_tab_view = self.open_new_tab(open_tabs_view=True)
1142
127
            self.open_tabs_view()
1143
128
        new_private_tab_view = self.open_new_tab()
1145
129
        # Open a second new private tab
121
        # Open a second new private tab
1149
130
        if not self.main_window.wide:
122
        new_private_tab_view_2 = self.open_new_tab(open_tabs_view=True)
1147
131
            self.open_tabs_view()
1148
132
        new_private_tab_view_2 = self.open_new_tab()
1150
133
        # Verify that they share the same NewPrivateTabView instance
123
        # Verify that they share the same NewPrivateTabView instance
1151
134
        self.assertThat(new_private_tab_view_2.id,
124
        self.assertThat(new_private_tab_view_2.id,
1152
135
                        Equals(new_private_tab_view.id))
125
                        Equals(new_private_tab_view.id))
1153
@@ -156,16 +146,14 @@
1154
156
        new_private_tab_view.wait_until_destroyed()
146
        new_private_tab_view.wait_until_destroyed()
1155
157
147
1156
158
148
1158
159
class TestNewTabViewContents(StartOpenRemotePageTestCaseBase):
149
class TestNewTabViewContentsBase(StartOpenRemotePageTestCaseBase):
1159
160
150
1160
161
    def setUp(self):
151
    def setUp(self):
1161
162
        self.create_temporary_profile()
152
        self.create_temporary_profile()
1162
163
        self.populate_config()
153
        self.populate_config()
1163
164
        self.populate_bookmarks()
154
        self.populate_bookmarks()
1168
165
        super(TestNewTabViewContents, self).setUp()
155
        super(TestNewTabViewContentsBase, self).setUp()
1169
166
        if not self.main_window.wide:
156
        self.new_tab_view = self.open_new_tab(open_tabs_view=True)
1166
167
            self.open_tabs_view()
1167
168
        self.new_tab_view = self.open_new_tab()
1170
169
157
1171
170
    def populate_config(self):
158
    def populate_config(self):
1172
171
        self.homepage = "http://test/test2"
159
        self.homepage = "http://test/test2"
1173
@@ -226,6 +214,14 @@
1174
226
        connection.commit()
214
        connection.commit()
1175
227
        connection.close()
215
        connection.close()
1176
228
216
1177
217
1178
218
class TestNewTabViewContentsNarrow(TestNewTabViewContentsBase):
1179
219
1180
220
    def setUp(self):
1181
221
        super(TestNewTabViewContentsNarrow, self).setUp()
1182
222
        if self.main_window.wide:
1183
223
            self.skipTest("Only on narrow form factors")
1184
224
1185
229
    def test_default_home_bookmark(self):
225
    def test_default_home_bookmark(self):
1186
230
        homepage_bookmark = self.new_tab_view.get_homepage_bookmark()
226
        homepage_bookmark = self.new_tab_view.get_homepage_bookmark()
1187
231
        self.assertThat(homepage_bookmark.url, Equals(self.homepage))
227
        self.assertThat(homepage_bookmark.url, Equals(self.homepage))
1188
@@ -233,10 +229,18 @@
1189
233
        self.new_tab_view.wait_until_destroyed()
229
        self.new_tab_view.wait_until_destroyed()
1190
234
        self.main_window.wait_until_page_loaded(self.homepage)
230
        self.main_window.wait_until_page_loaded(self.homepage)
1191
235
231
1193
236
    def test_open_bookmark_when_collapsed(self):
232
    def test_open_top_site(self):
1194
233
        top_sites = self.new_tab_view.get_top_sites_list()
1195
234
        self.assertThat(lambda: len(top_sites.get_delegates()),
1196
235
                        Eventually(Equals(1)))
1197
236
        top_site = top_sites.get_delegates()[0]
1198
237
        url = top_site.url
1199
238
        self.pointing_device.click_object(top_site)
1200
239
        self.new_tab_view.wait_until_destroyed()
1201
240
        self.main_window.wait_until_page_loaded(url)
1202
241
1203
242
    def test_open_bookmark(self):
1204
237
        bookmarks = self.new_tab_view.get_bookmarks_list()
243
        bookmarks = self.new_tab_view.get_bookmarks_list()
1205
238
        self.assertThat(lambda: len(bookmarks.get_delegates()),
1206
239
                        Eventually(Equals(4)))
1207
240
        bookmark = bookmarks.get_delegates()[1]
244
        bookmark = bookmarks.get_delegates()[1]
1208
241
        url = bookmark.url
245
        url = bookmark.url
1209
242
        self.pointing_device.click_object(bookmark)
246
        self.pointing_device.click_object(bookmark)
1210
@@ -247,7 +251,7 @@
1211
247
        more_button = self.new_tab_view.get_bookmarks_more_button()
251
        more_button = self.new_tab_view.get_bookmarks_more_button()
1212
248
        self.assertThat(more_button.visible, Equals(True))
252
        self.assertThat(more_button.visible, Equals(True))
1213
249
        self.pointing_device.click_object(more_button)
253
        self.pointing_device.click_object(more_button)
1215
250
        folders = self.main_window.get_bookmarks_folder_list_view()
254
        folders = self.new_tab_view.get_bookmarks_folder_list_view()
1216
251
        folder_delegate = folders.get_folder_delegate("")
255
        folder_delegate = folders.get_folder_delegate("")
1217
252
        self.assertThat(lambda: len(folders.get_urls_from_folder(
256
        self.assertThat(lambda: len(folders.get_urls_from_folder(
1218
253
                                    folder_delegate)),
257
                                    folder_delegate)),
1219
@@ -269,7 +273,7 @@
1220
269
        more_button = self.new_tab_view.get_bookmarks_more_button()
273
        more_button = self.new_tab_view.get_bookmarks_more_button()
1221
270
        self.assertThat(more_button.visible, Equals(True))
274
        self.assertThat(more_button.visible, Equals(True))
1222
271
        self.pointing_device.click_object(more_button)
275
        self.pointing_device.click_object(more_button)
1224
272
        folders = self.main_window.get_bookmarks_folder_list_view()
276
        folders = self.new_tab_view.get_bookmarks_folder_list_view()
1225
273
        folder_delegate = folders.get_folder_delegate("")
277
        folder_delegate = folders.get_folder_delegate("")
1226
274
        self.assertThat(lambda: len(folders.get_urls_from_folder(
278
        self.assertThat(lambda: len(folders.get_urls_from_folder(
1227
275
                                    folder_delegate)),
279
                                    folder_delegate)),
1228
@@ -292,7 +296,7 @@
1229
292
                        Eventually(NotEquals(url)))
296
                        Eventually(NotEquals(url)))
1230
293
297
1231
294
    def _remove_first_bookmark_from_folder(self, folder):
298
    def _remove_first_bookmark_from_folder(self, folder):
1233
295
        folders = self.main_window.get_bookmarks_folder_list_view()
299
        folders = self.new_tab_view.get_bookmarks_folder_list_view()
1234
296
        folder_delegate = folders.get_folder_delegate(folder)
300
        folder_delegate = folders.get_folder_delegate(folder)
1235
297
        delegate = folders.get_urls_from_folder(folder_delegate)[0]
301
        delegate = folders.get_urls_from_folder(folder_delegate)[0]
1236
298
        url = delegate.url
302
        url = delegate.url
1237
@@ -319,7 +323,7 @@
1238
319
        more_button = self.new_tab_view.get_bookmarks_more_button()
323
        more_button = self.new_tab_view.get_bookmarks_more_button()
1239
320
        self.assertThat(more_button.visible, Equals(True))
324
        self.assertThat(more_button.visible, Equals(True))
1240
321
        self.pointing_device.click_object(more_button)
325
        self.pointing_device.click_object(more_button)
1242
322
        folders = self.main_window.get_bookmarks_folder_list_view()
326
        folders = self.new_tab_view.get_bookmarks_folder_list_view()
1243
323
        folder_delegate = folders.get_folder_delegate("")
327
        folder_delegate = folders.get_folder_delegate("")
1244
324
        self.assertThat(lambda: len(folders.get_urls_from_folder(
328
        self.assertThat(lambda: len(folders.get_urls_from_folder(
1245
325
                                    folder_delegate)),
329
                                    folder_delegate)),
1246
@@ -335,7 +339,7 @@
1247
335
        more_button = self.new_tab_view.get_bookmarks_more_button()
339
        more_button = self.new_tab_view.get_bookmarks_more_button()
1248
336
        self.assertThat(more_button.visible, Equals(True))
340
        self.assertThat(more_button.visible, Equals(True))
1249
337
        self.pointing_device.click_object(more_button)
341
        self.pointing_device.click_object(more_button)
1251
338
        folders = self.main_window.get_bookmarks_folder_list_view()
342
        folders = self.new_tab_view.get_bookmarks_folder_list_view()
1252
339
        self.assertThat(lambda: len(folders.get_delegates()),
343
        self.assertThat(lambda: len(folders.get_delegates()),
1253
340
                        Eventually(Equals(3)))
344
                        Eventually(Equals(3)))
1254
341
        folder_delegate = folders.get_folder_delegate("")
345
        folder_delegate = folders.get_folder_delegate("")
1255
@@ -355,7 +359,7 @@
1256
355
        more_button = self.new_tab_view.get_bookmarks_more_button()
359
        more_button = self.new_tab_view.get_bookmarks_more_button()
1257
356
        self.assertThat(more_button.visible, Equals(True))
360
        self.assertThat(more_button.visible, Equals(True))
1258
357
        self.pointing_device.click_object(more_button)
361
        self.pointing_device.click_object(more_button)
1260
358
        folders = self.main_window.get_bookmarks_folder_list_view()
362
        folders = self.new_tab_view.get_bookmarks_folder_list_view()
1261
359
        self.assertThat(lambda: len(folders.get_delegates()),
363
        self.assertThat(lambda: len(folders.get_delegates()),
1262
360
                        Eventually(Equals(3)))
364
                        Eventually(Equals(3)))
1263
361
        folder_delegate = folders.get_folder_delegate("Actinide")
365
        folder_delegate = folders.get_folder_delegate("Actinide")
1264
@@ -378,7 +382,7 @@
1265
378
        more_button = self.new_tab_view.get_bookmarks_more_button()
382
        more_button = self.new_tab_view.get_bookmarks_more_button()
1266
379
        self.assertThat(more_button.visible, Equals(True))
383
        self.assertThat(more_button.visible, Equals(True))
1267
380
        self.pointing_device.click_object(more_button)
384
        self.pointing_device.click_object(more_button)
1269
381
        folders = self.main_window.get_bookmarks_folder_list_view()
385
        folders = self.new_tab_view.get_bookmarks_folder_list_view()
1270
382
        self.assertThat(lambda: len(folders.get_delegates()),
386
        self.assertThat(lambda: len(folders.get_delegates()),
1271
383
                        Eventually(Equals(3)))
387
                        Eventually(Equals(3)))
1272
384
        folder_delegate = folders.get_folder_delegate("")
388
        folder_delegate = folders.get_folder_delegate("")
1273
@@ -396,16 +400,6 @@
1274
396
                                    folder_delegate)),
400
                                    folder_delegate)),
1275
397
                        Eventually(Equals(4)))
401
                        Eventually(Equals(4)))
1276
398
402
1277
399
    def test_open_top_site(self):
1278
400
        top_sites = self.new_tab_view.get_top_sites_list()
1279
401
        self.assertThat(lambda: len(top_sites.get_delegates()),
1280
402
                        Eventually(Equals(1)))
1281
403
        top_site = top_sites.get_delegates()[0]
1282
404
        url = top_site.url
1283
405
        self.pointing_device.click_object(top_site)
1284
406
        self.new_tab_view.wait_until_destroyed()
1285
407
        self.main_window.wait_until_page_loaded(url)
1286
408
1287
409
    def test_remove_top_sites(self):
403
    def test_remove_top_sites(self):
1288
410
        top_sites = self.new_tab_view.get_top_sites_list()
404
        top_sites = self.new_tab_view.get_top_sites_list()
1289
411
        self.assertThat(lambda: len(top_sites.get_delegates()),
405
        self.assertThat(lambda: len(top_sites.get_delegates()),
1290
@@ -418,3 +412,87 @@
1291
418
        self.assertThat(lambda: len(top_sites.get_delegates()),
412
        self.assertThat(lambda: len(top_sites.get_delegates()),
1292
419
                        Eventually(Equals(0)))
413
                        Eventually(Equals(0)))
1293
420
        self.assertThat(notopsites_label.visible, Eventually(Equals(True)))
414
        self.assertThat(notopsites_label.visible, Eventually(Equals(True)))
1294
415
1295
416
1296
417
class TestNewTabViewContentsWide(TestNewTabViewContentsBase):
1297
418
1298
419
    def setUp(self):
1299
420
        super(TestNewTabViewContentsWide, self).setUp()
1300
421
        if not self.main_window.wide:
1301
422
            self.skipTest("Only on wide form factors")
1302
423
1303
424
    def test_remove_bookmarks(self):
1304
425
        view = self.new_tab_view
1305
426
        bookmarks = view.get_bookmarks_list()
1306
427
        previous_count = len(bookmarks)
1307
428
        bookmarks[1].trigger_leading_action("leadingAction.delete",
1308
429
                                            bookmarks[1].wait_until_destroyed)
1309
430
        bookmarks = view.get_bookmarks_list()
1310
431
        self.assertThat(len(bookmarks), Equals(previous_count - 1))
1311
432
        previous_count = len(bookmarks)
1312
433
1313
434
        # verify that trying to delete the homepage bookmark is not going to
1314
435
        # do anything because there is no delete action on the delegate
1315
436
        no_delete_action = False
1316
437
        try:
1317
438
            bookmarks[0].trigger_leading_action("leadingAction.delete")
1318
439
        except ToolkitException:
1319
440
            no_delete_action = True
1320
441
        self.assertThat(no_delete_action, Equals(True))
1321
442
        self.assertThat(len(view.get_bookmarks_list()), Equals(previous_count))
1322
443
1323
444
    def test_remove_top_sites(self):
1324
445
        view = self.new_tab_view
1325
446
        topsites = view.get_top_sites_list()
1326
447
        previous_count = len(topsites)
1327
448
        topsites[0].trigger_leading_action("leadingAction.delete",
1328
449
                                           topsites[0].wait_until_destroyed)
1329
450
        self.assertThat(len(view.get_top_sites_list()),
1330
451
                        Equals(previous_count - 1))
1331
452
1332
453
    def test_drag_bookmarks(self):
1333
454
        view = self.new_tab_view
1334
455
        folders = view.get_folders_list()
1335
456
        bookmarks = view.get_bookmarks_list()
1336
457
        previous_count = len(bookmarks)
1337
458
        bookmark = bookmarks[1]
1338
459
        title = bookmark.title
1339
460
        grip = bookmark.get_grip()
1340
461
        original_x = grip.globalRect.x
1341
462
        original_y = grip.globalRect.y
1342
463
1343
464
        # Test that when hovering normal bookmarks item the grip appears
1344
465
        self.assertThat(grip.opacity, Equals(0))
1345
466
        self.pointing_device.move_to_object(bookmark)
1346
467
        self.assertThat(grip.opacity, Eventually(Equals(1.0)))
1347
468
1348
469
        # Test that an item bounces back when dragged within the list itself
1349
470
        self.pointing_device.drag(original_x, original_y,
1350
471
                                  original_x, original_y + 200)
1351
472
1352
473
        # Test that an item bounces back when dragged to the same folder
1353
474
        folder = folders[0]
1354
475
        folder_cx = folder.globalRect.x + folder.width / 2
1355
476
        folder_cy = folder.globalRect.y + folder.height / 2
1356
477
        self.pointing_device.drag(original_x, original_y,
1357
478
                                  folder_cx, folder_cy)
1358
479
1359
480
        self.assertThat(lambda: (grip.globalRect.x, grip.globalRect.y),
1360
481
                        Eventually(Equals((original_x, original_y))))
1361
482
1362
483
        # Test that dragging an item to another folder removes it from this one
1363
484
        # and adds it to the target folder
1364
485
        folder = folders[2]
1365
486
        folder_cx = folder.globalRect.x + folder.width / 2
1366
487
        folder_cy = folder.globalRect.y + folder.height / 2
1367
488
        self.pointing_device.drag(original_x, original_y,
1368
489
                                  folder_cx, folder_cy)
1369
490
1370
491
        self.assertThat(lambda: len(view.get_bookmarks_list()),
1371
492
                        Eventually(NotEquals(previous_count)))
1372
493
1373
494
        # Verify that the item has been added to the top of the target folder
1374
495
        self.pointing_device.click_object(folder)
1375
496
        self.assertThat(lambda: len(view.get_bookmarks_list()),
1376
497
                        Eventually(Equals(2)))
1377
498
        self.assertThat(view.get_bookmarks_list()[0].title, Equals(title))
1378
421
499
1379
=== modified file 'tests/autopilot/webbrowser_app/tests/test_private.py'
1380
--- tests/autopilot/webbrowser_app/tests/test_private.py	2015-07-02 13:51:07 +0000
1381
+++ tests/autopilot/webbrowser_app/tests/test_private.py	2015-08-12 13:42:27 +0000
1382
@@ -22,12 +22,6 @@
1383
22
22
1384
23
class TestPrivateView(StartOpenRemotePageTestCaseBase):
23
class TestPrivateView(StartOpenRemotePageTestCaseBase):
1385
24
24
1386
25
    def get_url_list_from_top_sites(self):
1387
26
        if not self.main_window.wide:
1388
27
            self.open_tabs_view()
1389
28
        new_tab_view = self.open_new_tab()
1390
29
        return new_tab_view.get_top_sites_list().get_urls()
1391
30
1392
31
    def test_going_in_and_out_private_mode(self):
25
    def test_going_in_and_out_private_mode(self):
1393
32
        address_bar = self.main_window.address_bar
26
        address_bar = self.main_window.address_bar
1394
33
        address_bar.focus()
27
        address_bar.focus()
1395
@@ -72,8 +66,9 @@
1396
72
        self.assertTrue(self.main_window.is_new_private_tab_view_visible())
66
        self.assertTrue(self.main_window.is_new_private_tab_view_visible())
1397
73
67
1398
74
    def test_url_showing_in_top_sites_in_and_out_private_mode(self):
68
    def test_url_showing_in_top_sites_in_and_out_private_mode(self):
1401
75
        top_sites = self.get_url_list_from_top_sites()
69
        new_tab = self.open_new_tab(open_tabs_view=True)
1402
76
        self.assertIn(self.url, top_sites)
70
        urls = [site.url for site in new_tab.get_top_site_items()]
1403
71
        self.assertIn(self.url, urls)
1404
77
72
1405
78
        self.main_window.enter_private_mode()
73
        self.main_window.enter_private_mode()
1406
79
        self.assertThat(self.main_window.is_in_private_mode,
74
        self.assertThat(self.main_window.is_in_private_mode,
1407
@@ -84,13 +79,13 @@
1408
84
        self.main_window.leave_private_mode()
79
        self.main_window.leave_private_mode()
1409
85
        self.assertThat(self.main_window.is_in_private_mode,
80
        self.assertThat(self.main_window.is_in_private_mode,
1410
86
                        Eventually(Equals(False)))
81
                        Eventually(Equals(False)))
1413
87
        top_sites = self.get_url_list_from_top_sites()
82
1414
88
        self.assertNotIn(url, top_sites)
83
        new_tab = self.open_new_tab(open_tabs_view=True)
1415
84
        urls = [site.url for site in new_tab.get_top_site_items()]
1416
85
        self.assertNotIn(url, urls)
1417
89
86
1418
90
    def test_public_tabs_should_not_be_visible_in_private_mode(self):
87
    def test_public_tabs_should_not_be_visible_in_private_mode(self):
1422
91
        if not self.main_window.wide:
88
        self.open_new_tab(open_tabs_view=True)
1420
92
            self.open_tabs_view()
1421
93
        self.open_new_tab()
1423
94
        new_tab_view = self.main_window.get_new_tab_view()
89
        new_tab_view = self.main_window.get_new_tab_view()
1424
95
        url = self.base_url + "/test2"
90
        url = self.base_url + "/test2"
1425
96
        self.main_window.go_to_url(url)
91
        self.main_window.go_to_url(url)
1426
97
92
1427
=== modified file 'tests/autopilot/webbrowser_app/tests/test_tabs.py'
1428
--- tests/autopilot/webbrowser_app/tests/test_tabs.py	2015-07-02 13:51:07 +0000
1429
+++ tests/autopilot/webbrowser_app/tests/test_tabs.py	2015-08-12 13:42:27 +0000
1430
@@ -161,9 +161,7 @@
1431
161
        webview.activeFocus.wait_for(True)
161
        webview.activeFocus.wait_for(True)
1432
162
162
1433
163
    def test_webview_requests_close(self):
163
    def test_webview_requests_close(self):
1437
164
        if not self.main_window.wide:
164
        self.open_new_tab(open_tabs_view=True)
1435
165
            self.open_tabs_view()
1436
166
        self.open_new_tab()
1438
167
        url = self.base_url + "/closeself"
165
        url = self.base_url + "/closeself"
1439
168
        self.main_window.go_to_url(url)
166
        self.main_window.go_to_url(url)
1440
169
        self.main_window.wait_until_page_loaded(url)
167
        self.main_window.wait_until_page_loaded(url)
1441
@@ -174,9 +172,7 @@
1442
174
        self.assert_number_webviews_eventually(1)
172
        self.assert_number_webviews_eventually(1)
1443
175
173
1444
176
    def test_last_webview_requests_close(self):
174
    def test_last_webview_requests_close(self):
1448
177
        if not self.main_window.wide:
175
        self.open_new_tab(open_tabs_view=True)
1446
178
            self.open_tabs_view()
1447
179
        self.open_new_tab()
1449
180
        url = self.base_url + "/closeself"
176
        url = self.base_url + "/closeself"
1450
181
        self.main_window.go_to_url(url)
177
        self.main_window.go_to_url(url)
1451
182
        self.main_window.wait_until_page_loaded(url)
178
        self.main_window.wait_until_page_loaded(url)
1452
183
179
1453
=== modified file 'tests/unittests/bookmarks-folder-model/tst_BookmarksFolderModelTests.cpp'
1454
--- tests/unittests/bookmarks-folder-model/tst_BookmarksFolderModelTests.cpp	2015-07-02 13:16:56 +0000
1455
+++ tests/unittests/bookmarks-folder-model/tst_BookmarksFolderModelTests.cpp	2015-08-12 13:42:27 +0000
1456
@@ -88,18 +88,21 @@
1457
88
88
1458
89
    void shouldFilterOutNonMatchingFolders()
89
    void shouldFilterOutNonMatchingFolders()
1459
90
    {
90
    {
1463
91
        bookmarks->add(QUrl("http://example.org/"), "Example Domain", QUrl(), "");
91
        bookmarks->add(QUrl("http://example.org/"), "Example Domain Org", QUrl(), "");
1464
92
        bookmarks->add(QUrl("http://example.com/"), "Example Domain", QUrl(), "SampleFolder01");
92
        bookmarks->add(QUrl("http://example.com/"), "Example Domain Com", QUrl(), "SampleFolder01");
1465
93
        bookmarks->add(QUrl("http://example.net/"), "Example Domain", QUrl(), "SampleFolder02");
93
        bookmarks->add(QUrl("http://example.net/"), "Example Domain Net", QUrl("http://example.net/icon.png"), "SampleFolder02");
1466
94
        model->setFolder("");
94
        model->setFolder("");
1467
95
        QCOMPARE(model->rowCount(), 1);
95
        QCOMPARE(model->rowCount(), 1);
1468
96
        QCOMPARE(model->data(model->index(0, 0), BookmarksModel::Url).toUrl(), QUrl("http://example.org/"));
96
        QCOMPARE(model->data(model->index(0, 0), BookmarksModel::Url).toUrl(), QUrl("http://example.org/"));
1469
97
        QCOMPARE(model->get(0).value("url").toUrl(), QUrl("http://example.org/"));
1470
97
        model->setFolder("SampleFolder01");
98
        model->setFolder("SampleFolder01");
1471
98
        QCOMPARE(model->rowCount(), 1);
99
        QCOMPARE(model->rowCount(), 1);
1472
99
        QCOMPARE(model->data(model->index(0, 0), BookmarksModel::Url).toUrl(), QUrl("http://example.com/"));
100
        QCOMPARE(model->data(model->index(0, 0), BookmarksModel::Url).toUrl(), QUrl("http://example.com/"));
1473
101
        QCOMPARE(model->get(0).value("title").toString(), QString("Example Domain Com"));
1474
100
        model->setFolder("SampleFolder02");
102
        model->setFolder("SampleFolder02");
1475
101
        QCOMPARE(model->rowCount(), 1);
103
        QCOMPARE(model->rowCount(), 1);
1476
102
        QCOMPARE(model->data(model->index(0, 0), BookmarksModel::Url).toUrl(), QUrl("http://example.net/"));
104
        QCOMPARE(model->data(model->index(0, 0), BookmarksModel::Url).toUrl(), QUrl("http://example.net/"));
1477
105
        QCOMPARE(model->get(0).value("icon").toUrl(), QUrl("http://example.net/icon.png"));
1478
103
        model->setFolder("AnotherFolder");
106
        model->setFolder("AnotherFolder");
1479
104
        QCOMPARE(model->rowCount(), 0);
107
        QCOMPARE(model->rowCount(), 0);
1480
105
    }
108
    }
1481
106
109
1482
=== modified file 'tests/unittests/qml/CMakeLists.txt'
1483
--- tests/unittests/qml/CMakeLists.txt	2015-07-09 20:27:00 +0000
1484
+++ tests/unittests/qml/CMakeLists.txt	2015-08-12 13:42:27 +0000
1485
@@ -4,6 +4,7 @@
1486
4
find_package(Qt5Qml REQUIRED)
4
find_package(Qt5Qml REQUIRED)
1487
5
find_package(Qt5Quick REQUIRED)
5
find_package(Qt5Quick REQUIRED)
1488
6
find_package(Qt5QuickTest REQUIRED)
6
find_package(Qt5QuickTest REQUIRED)
1489
7
find_package(Qt5Sql REQUIRED)
1490
7
8
1491
8
set(XVFB_COMMAND)
9
set(XVFB_COMMAND)
1492
9
find_program(XVFBRUN xvfb-run)
10
find_program(XVFBRUN xvfb-run)
1493
@@ -16,9 +17,16 @@
1494
16
set(TEST tst_QmlTests)
17
set(TEST tst_QmlTests)
1495
17
set(SOURCES
18
set(SOURCES
1496
18
    ${webbrowser-common_SOURCE_DIR}/favicon-fetcher.cpp
19
    ${webbrowser-common_SOURCE_DIR}/favicon-fetcher.cpp
1497
20
    ${webbrowser-app_SOURCE_DIR}/bookmarks-model.cpp
1498
21
    ${webbrowser-app_SOURCE_DIR}/bookmarks-folder-model.cpp
1499
22
    ${webbrowser-app_SOURCE_DIR}/bookmarks-folderlist-model.cpp
1500
19
    ${webbrowser-app_SOURCE_DIR}/file-operations.cpp
23
    ${webbrowser-app_SOURCE_DIR}/file-operations.cpp
1501
24
    ${webbrowser-app_SOURCE_DIR}/history-model.cpp
1502
25
    ${webbrowser-app_SOURCE_DIR}/history-timeframe-model.cpp
1503
26
    ${webbrowser-app_SOURCE_DIR}/limit-proxy-model.cpp
1504
20
    ${webbrowser-app_SOURCE_DIR}/searchengine.cpp
27
    ${webbrowser-app_SOURCE_DIR}/searchengine.cpp
1505
21
    ${webbrowser-app_SOURCE_DIR}/tabs-model.cpp
28
    ${webbrowser-app_SOURCE_DIR}/tabs-model.cpp
1506
29
    ${webbrowser-app_SOURCE_DIR}/top-sites-model.cpp
1507
22
    tst_QmlTests.cpp
30
    tst_QmlTests.cpp
1508
23
)
31
)
1509
24
add_executable(${TEST} ${SOURCES})
32
add_executable(${TEST} ${SOURCES})
1510
@@ -33,6 +41,7 @@
1511
33
    Qt5::Qml
41
    Qt5::Qml
1512
34
    Qt5::Quick
42
    Qt5::Quick
1513
35
    Qt5::QuickTest
43
    Qt5::QuickTest
1514
44
    Qt5::Sql
1515
36
)
45
)
1516
37
add_test(${TEST} ${XVFB_COMMAND} ${CMAKE_CURRENT_BINARY_DIR}/${TEST}
46
add_test(${TEST} ${XVFB_COMMAND} ${CMAKE_CURRENT_BINARY_DIR}/${TEST}
1517
38
         -input ${CMAKE_CURRENT_SOURCE_DIR}
47
         -input ${CMAKE_CURRENT_SOURCE_DIR}
1518
39
48
1519
=== added file 'tests/unittests/qml/tst_NewTabViewWide.qml'
1520
--- tests/unittests/qml/tst_NewTabViewWide.qml	1970-01-01 00:00:00 +0000
1521
+++ tests/unittests/qml/tst_NewTabViewWide.qml	2015-08-12 13:42:27 +0000
1522
@@ -0,0 +1,372 @@
1523
1
/*
1524
2
 * Copyright 2015 Canonical Ltd.
1525
3
 *
1526
4
 * This file is part of webbrowser-app.
1527
5
 *
1528
6
 * webbrowser-app is free software; you can redistribute it and/or modify
1529
7
 * it under the terms of the GNU General Public License as published by
1530
8
 * the Free Software Foundation; version 3.
1531
9
 *
1532
10
 * webbrowser-app is distributed in the hope that it will be useful,
1533
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1534
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1535
13
 * GNU General Public License for more details.
1536
14
 *
1537
15
 * You should have received a copy of the GNU General Public License
1538
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1539
17
 */
1540
18
1541
19
import QtQuick 2.4
1542
20
import QtTest 1.0
1543
21
import Ubuntu.Test 1.0
1544
22
import "../../../src/app/webbrowser"
1545
23
import webbrowserapp.private 0.1
1546
24
1547
25
Item {
1548
26
    id: root
1549
27
1550
28
    width: 800
1551
29
    height: 600
1552
30
1553
31
    Component {
1554
32
        id: historyModel
1555
33
        HistoryModel {
1556
34
            databasePath: ":memory:"
1557
35
        }
1558
36
    }
1559
37
1560
38
    Component {
1561
39
        id: bookmarksModel
1562
40
        BookmarksModel {
1563
41
            databasePath: ":memory:"
1564
42
        }
1565
43
    }
1566
44
1567
45
    property NewTabViewWide view
1568
46
    property var bookmarks
1569
47
    property var history
1570
48
    property string homepage: "http://example.com/homepage"
1571
49
1572
50
    Component {
1573
51
        id: viewComponent
1574
52
        NewTabViewWide {
1575
53
            anchors.fill: parent
1576
54
            settingsObject: QtObject {
1577
55
                property url homepage: root.homepage
1578
56
                property int newTabDefaultSection: 0
1579
57
            }
1580
58
            bookmarksModel: bookmarks
1581
59
            historyModel: history
1582
60
        }
1583
61
    }
1584
62
1585
63
    SignalSpy {
1586
64
        id: releasingKeyboardFocusSpy
1587
65
        signalName: "releasingKeyboardFocus"
1588
66
    }
1589
67
1590
68
    SignalSpy {
1591
69
        id: historyEntryClickedSpy
1592
70
        signalName: "historyEntryClicked"
1593
71
    }
1594
72
1595
73
    SignalSpy {
1596
74
        id: bookmarkClickedSpy
1597
75
        signalName: "bookmarkClicked"
1598
76
    }
1599
77
1600
78
    SignalSpy {
1601
79
        id: bookmarkRemovedSpy
1602
80
        signalName: "bookmarkRemoved"
1603
81
    }
1604
82
1605
83
    UbuntuTestCase {
1606
84
        name: "NewTabViewWide"
1607
85
        when: windowShown
1608
86
1609
87
        function init() {
1610
88
            bookmarks = bookmarksModel.createObject()
1611
89
            history = historyModel.createObject()
1612
90
            view = viewComponent.createObject(root)
1613
91
            populate()
1614
92
1615
93
            view.focus = true
1616
94
1617
95
            releasingKeyboardFocusSpy.target = view
1618
96
            releasingKeyboardFocusSpy.clear()
1619
97
            historyEntryClickedSpy.target = view
1620
98
            historyEntryClickedSpy.clear()
1621
99
            bookmarkClickedSpy.target = view
1622
100
            bookmarkClickedSpy.clear()
1623
101
            bookmarkRemovedSpy.target = view
1624
102
            bookmarkRemovedSpy.clear()
1625
103
        }
1626
104
1627
105
        function populate() {
1628
106
            history.add("http://example.com", "Example Com", "")
1629
107
            history.add("http://example.org", "Example Org", "")
1630
108
            history.add("http://example.net", "Example Net", "")
1631
109
            bookmarks.add("http://example.com", "Example Com", "", "")
1632
110
            bookmarks.add("http://example.org/bar", "Example Org Bar", "", "Folder B")
1633
111
            bookmarks.add("http://example.org/foo", "Example Org Foo", "", "Folder B")
1634
112
            bookmarks.add("http://example.net/a", "Example Net A", "", "Folder A")
1635
113
            bookmarks.add("http://example.net/b", "Example Net B", "", "Folder A")
1636
114
        }
1637
115
1638
116
        function cleanup() {
1639
117
            history.destroy()
1640
118
            history = null
1641
119
            bookmarks.destroy()
1642
120
            bookmarks = null
1643
121
1644
122
            view.destroy()
1645
123
            view = null
1646
124
        }
1647
125
1648
126
        function clickItem(item) {
1649
127
            var center = centerOf(item)
1650
128
            mouseClick(item, center.x, center.y)
1651
129
        }
1652
130
1653
131
        function getListItems(name, itemName) {
1654
132
            var list = findChild(view, name)
1655
133
            var items = []
1656
134
            if (list) {
1657
135
                // ensure all the delegates are created
1658
136
                list.cacheBuffer = list.count * 1000
1659
137
1660
138
                // In some cases the ListView might add other children to the
1661
139
                // contentItem, so we filter the list of children to include
1662
140
                // only actual delegates
1663
141
                var children = list.contentItem.children
1664
142
                for (var i = 0; i < children.length; i++) {
1665
143
                    if (children[i].objectName === itemName) {
1666
144
                        items.push(children[i])
1667
145
                    }
1668
146
                }
1669
147
            }
1670
148
            return items
1671
149
        }
1672
150
1673
151
        function goToBookmarks() {
1674
152
            findChild(view, "sections").selectedIndex = 1
1675
153
        }
1676
154
1677
155
        function test_topsites_list() {
1678
156
            // add 8 more top sites so that we are beyond the limit of 10
1679
157
            for (var i = 0; i < 8; i++) {
1680
158
                history.add("http://example.com/" + i, "Example Com " + i, "")
1681
159
            }
1682
160
1683
161
            var items = getListItems("topSitesList", "topSiteItem")
1684
162
            compare(items.length, 10)
1685
163
            compare(items[0].title, "Example Com")
1686
164
            compare(items[1].title, "Example Org")
1687
165
            compare(items[2].title, "Example Net")
1688
166
            for (var i = 0; i < 7; i++) {
1689
167
                compare(items[i + 3].title, "Example Com " + i)
1690
168
            }
1691
169
        }
1692
170
1693
171
        function test_folder_list() {
1694
172
            var items = getListItems("foldersList", "folderItem")
1695
173
            compare(items.length, 3)
1696
174
            verify(items[0].isAllBookmarksFolder)
1697
175
            compare(items[0].model.folder, "")
1698
176
            // named folder items should appear alphabetically sorted
1699
177
            compare(items[1].model.folder, "Folder A")
1700
178
            compare(items[2].model.folder, "Folder B")
1701
179
        }
1702
180
1703
181
        function test_all_bookmarks_list() {
1704
182
            var items = getListItems("bookmarksList", "bookmarkItem")
1705
183
            compare(items.length, 2)
1706
184
            compare(items[0].url, homepage)
1707
185
            compare(items[1].title, "Example Com")
1708
186
        }
1709
187
1710
188
        function test_switch_sections_by_keyboard() {
1711
189
            skip("Would fail due to UITK bug: http://pad.lv/1481233")
1712
190
            var sections = findChild(view, "sections")
1713
191
            var folders = findChild(view, "foldersList")
1714
192
            var bookmarks = findChild(view, "bookmarksList")
1715
193
            var topSites = findChild(view, "topSitesList")
1716
194
            compare(sections.selectedIndex, 0)
1717
195
            verify(topSites.visible)
1718
196
            verify(!folders.visible)
1719
197
            verify(!bookmarks.visible)
1720
198
1721
199
            keyClick(Qt.Key_Tab)
1722
200
            compare(sections.selectedIndex, 1)
1723
201
            verify(!topSites.visible)
1724
202
            verify(folders.visible)
1725
203
            verify(bookmarks.visible)
1726
204
1727
205
            keyClick(Qt.Key_Backtab)
1728
206
            compare(sections.selectedIndex, 0)
1729
207
        }
1730
208
1731
209
        function test_navigate_topsites_by_keyboard() {
1732
210
            var items = getListItems("topSitesList", "topSiteItem")
1733
211
            findChild(view, "topSitesList").currentIndex = 0
1734
212
            verify(items[0].highlighted)
1735
213
            keyClick(Qt.Key_Down)
1736
214
            verify(!items[0].highlighted)
1737
215
            verify(items[1].highlighted)
1738
216
            keyClick(Qt.Key_Down)
1739
217
            verify(items[2].highlighted)
1740
218
            keyClick(Qt.Key_Down) // ensure no scrolling past bottom boundary
1741
219
            verify(items[2].highlighted)
1742
220
            keyClick(Qt.Key_Up)
1743
221
            verify(items[1].highlighted)
1744
222
            keyClick(Qt.Key_Up)
1745
223
            verify(items[0].highlighted)
1746
224
            keyClick(Qt.Key_Up)
1747
225
            verify(items[0].highlighted)
1748
226
            compare(releasingKeyboardFocusSpy.count, 1)
1749
227
        }
1750
228
1751
229
        function test_activate_topsites_by_keyboard() {
1752
230
            var items = getListItems("topSitesList", "topSiteItem")
1753
231
            keyClick(Qt.Key_Return)
1754
232
            compare(historyEntryClickedSpy.count, 1)
1755
233
            compare(historyEntryClickedSpy.signalArguments[0][0], "http://example.com")
1756
234
            keyClick(Qt.Key_Down)
1757
235
            keyClick(Qt.Key_Return)
1758
236
            compare(historyEntryClickedSpy.count, 2)
1759
237
            compare(historyEntryClickedSpy.signalArguments[1][0], "http://example.org")
1760
238
        }
1761
239
1762
240
        function test_navigate_folders_by_keyboard() {
1763
241
            goToBookmarks()
1764
242
1765
243
            var foldersList = getListItems(view, "foldersList")
1766
244
            var folders = getListItems("foldersList", "folderItem")
1767
245
            verify(folders[0].isActiveFolder)
1768
246
1769
247
            keyClick(Qt.Key_Down)
1770
248
            verify(!folders[0].isActiveFolder)
1771
249
            verify(folders[1].isActiveFolder)
1772
250
1773
251
            // bookmarks within a folder are sorted with the first bookmarked appearing last
1774
252
            var items = getListItems("bookmarksList", "bookmarkItem")
1775
253
            compare(items[0].title, "Example Net B")
1776
254
            compare(items[1].title, "Example Net A")
1777
255
            compare(items.length, 2)
1778
256
1779
257
            keyClick(Qt.Key_Down)
1780
258
            verify(folders[2].isActiveFolder)
1781
259
            items = getListItems("bookmarksList", "bookmarkItem")
1782
260
            compare(items[0].title, "Example Org Foo")
1783
261
            compare(items[1].title, "Example Org Bar")
1784
262
            compare(items.length, 2)
1785
263
1786
264
            // verify scrolling beyond bottom of list is not allowed
1787
265
            keyClick(Qt.Key_Down)
1788
266
            verify(folders[2].isActiveFolder)
1789
267
1790
268
            keyClick(Qt.Key_Up)
1791
269
            verify(folders[1].isActiveFolder)
1792
270
            keyClick(Qt.Key_Up)
1793
271
            verify(folders[0].isActiveFolder)
1794
272
1795
273
            keyClick(Qt.Key_Up)
1796
274
            compare(releasingKeyboardFocusSpy.count, 1)
1797
275
        }
1798
276
1799
277
        function test_switch_between_folder_and_bookmarks_by_keyboard() {
1800
278
            goToBookmarks()
1801
279
1802
280
            var folders = findChild(view, "foldersList")
1803
281
            var bookmarks = findChild(view, "bookmarksList")
1804
282
1805
283
            keyClick(Qt.Key_Right)
1806
284
            verify(bookmarks.activeFocus)
1807
285
            keyClick(Qt.Key_Right)
1808
286
            verify(bookmarks.activeFocus) // verify no circular scrolling
1809
287
1810
288
            keyClick(Qt.Key_Left)
1811
289
            verify(folders.activeFocus)
1812
290
            keyClick(Qt.Key_Left)
1813
291
            verify(folders.activeFocus) // verify no circular scrolling
1814
292
        }
1815
293
1816
294
        function test_activate_bookmarks_by_keyboard() {
1817
295
            goToBookmarks()
1818
296
            keyClick(Qt.Key_Right)
1819
297
1820
298
            var items = getListItems("bookmarksList", "bookmarkItem")
1821
299
            keyClick(Qt.Key_Return)
1822
300
            compare(bookmarkClickedSpy.count, 1)
1823
301
            compare(bookmarkClickedSpy.signalArguments[0][0], homepage)
1824
302
1825
303
            keyClick(Qt.Key_Down)
1826
304
            keyClick(Qt.Key_Return)
1827
305
            compare(bookmarkClickedSpy.count, 2)
1828
306
            compare(bookmarkClickedSpy.signalArguments[1][0], "http://example.com")
1829
307
        }
1830
308
1831
309
        function test_activate_topsites_by_mouse() {
1832
310
            var items = getListItems("topSitesList", "topSiteItem")
1833
311
            clickItem(items[0])
1834
312
            compare(historyEntryClickedSpy.count, 1)
1835
313
            compare(historyEntryClickedSpy.signalArguments[0][0], "http://example.com")
1836
314
1837
315
            clickItem(items[1])
1838
316
            compare(historyEntryClickedSpy.count, 2)
1839
317
            compare(historyEntryClickedSpy.signalArguments[1][0], "http://example.org")
1840
318
1841
319
        }
1842
320
1843
321
        function test_activate_bookmarks_by_mouse() {
1844
322
            goToBookmarks()
1845
323
            var items = getListItems("bookmarksList", "bookmarkItem")
1846
324
            clickItem(items[0])
1847
325
            compare(bookmarkClickedSpy.count, 1)
1848
326
            compare(bookmarkClickedSpy.signalArguments[0][0], homepage)
1849
327
1850
328
            clickItem(items[1])
1851
329
            compare(bookmarkClickedSpy.count, 2)
1852
330
            compare(bookmarkClickedSpy.signalArguments[1][0], "http://example.com")
1853
331
        }
1854
332
1855
333
        function test_switch_folders_by_mouse() {
1856
334
            goToBookmarks()
1857
335
            var folders = getListItems("foldersList", "folderItem")
1858
336
1859
337
            clickItem(folders[1])
1860
338
            var items = getListItems("bookmarksList", "bookmarkItem")
1861
339
            compare(items[0].title, "Example Net B")
1862
340
            compare(items[1].title, "Example Net A")
1863
341
            compare(items.length, 2)
1864
342
1865
343
            clickItem(folders[0])
1866
344
            items = getListItems("bookmarksList", "bookmarkItem")
1867
345
            compare(items[0].url, homepage)
1868
346
            compare(items[1].title, "Example Com")
1869
347
            compare(items.length, 2)
1870
348
        }
1871
349
1872
350
        function test_remove_bookmarks_by_keyboard() {
1873
351
            goToBookmarks()
1874
352
            keyClick(Qt.Key_Right)
1875
353
            var items = getListItems("bookmarksList", "bookmarkItem")
1876
354
1877
355
            // verify that trying to delete the homepage bookmark does not work
1878
356
            keyClick(Qt.Key_Delete)
1879
357
            compare(bookmarkRemovedSpy.count, 0)
1880
358
1881
359
            keyClick(Qt.Key_Down)
1882
360
            keyClick(Qt.Key_Delete)
1883
361
            compare(bookmarkRemovedSpy.count, 1)
1884
362
            compare(bookmarkRemovedSpy.signalArguments[0][0], items[1].url)
1885
363
        }
1886
364
1887
365
        function test_remove_top_sites_by_keyboard() {
1888
366
            var previous = getListItems("topSitesList", "topSiteItem")
1889
367
            keyClick(Qt.Key_Delete)
1890
368
            var items = getListItems("topSitesList", "topSiteItem")
1891
369
            compare(previous.length - 1, items.length)
1892
370
        }
1893
371
    }
1894
372
}
1895
0
373
1896
=== modified file 'tests/unittests/qml/tst_QmlTests.cpp'
1897
--- tests/unittests/qml/tst_QmlTests.cpp	2015-06-25 17:54:01 +0000
1898
+++ tests/unittests/qml/tst_QmlTests.cpp	2015-08-12 13:42:27 +0000
1899
@@ -25,10 +25,16 @@
1900
25
#include <QtQuickTest/QtQuickTest>
25
#include <QtQuickTest/QtQuickTest>
1901
26
26
1902
27
// local
27
// local
1903
28
#include "bookmarks-model.h"
1904
29
#include "bookmarks-folderlist-model.h"
1905
28
#include "favicon-fetcher.h"
30
#include "favicon-fetcher.h"
1906
29
#include "file-operations.h"
31
#include "file-operations.h"
1907
32
#include "history-model.h"
1908
33
#include "history-timeframe-model.h"
1909
34
#include "limit-proxy-model.h"
1910
30
#include "searchengine.h"
35
#include "searchengine.h"
1911
31
#include "tabs-model.h"
36
#include "tabs-model.h"
1912
37
#include "top-sites-model.h"
1913
32
38
1914
33
static QObject* FileOperations_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
39
static QObject* FileOperations_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
1915
34
{
40
{
1916
@@ -116,6 +122,12 @@
1917
116
    const char* browserUri = "webbrowserapp.private";
122
    const char* browserUri = "webbrowserapp.private";
1918
117
    qmlRegisterType<SearchEngine>(browserUri, 0, 1, "SearchEngine");
123
    qmlRegisterType<SearchEngine>(browserUri, 0, 1, "SearchEngine");
1919
118
    qmlRegisterType<TabsModel>(browserUri, 0, 1, "TabsModel");
124
    qmlRegisterType<TabsModel>(browserUri, 0, 1, "TabsModel");
1920
125
    qmlRegisterType<BookmarksModel>(browserUri, 0, 1, "BookmarksModel");
1921
126
    qmlRegisterType<BookmarksFolderListModel>(browserUri, 0, 1, "BookmarksFolderListModel");
1922
127
    qmlRegisterType<HistoryModel>(browserUri, 0, 1, "HistoryModel");
1923
128
    qmlRegisterType<HistoryTimeframeModel>(browserUri, 0, 1, "HistoryTimeframeModel");
1924
129
    qmlRegisterType<LimitProxyModel>(browserUri, 0, 1, "LimitProxyModel");
1925
130
    qmlRegisterType<TopSitesModel>(browserUri, 0, 1, "TopSitesModel");
1926
119
    qmlRegisterSingletonType<FileOperations>(browserUri, 0, 1, "FileOperations", FileOperations_singleton_factory);
131
    qmlRegisterSingletonType<FileOperations>(browserUri, 0, 1, "FileOperations", FileOperations_singleton_factory);
1927
120
132
1928
121
    qmlRegisterSingletonType<TestContext>("webbrowsertest.private", 0, 1, "TestContext", TestContext_singleton_factory);
133
    qmlRegisterSingletonType<TestContext>("webbrowsertest.private", 0, 1, "TestContext", TestContext_singleton_factory);
Reviewer	Review Type	Date Requested	Status
Olivier Tilloy		2015-07-30	Approve on 2015-08-12
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-08-12
Review via email: mp+266382@code.launchpad.net