1
=== modified file 'debian/webbrowser-app-apparmor.manifest'
2
--- debian/webbrowser-app-apparmor.manifest	2015-09-29 20:14:26 +0000
3
+++ debian/webbrowser-app-apparmor.manifest	2015-10-19 12:13:40 +0000
4
@@ -9,10 +9,12 @@
5
9
      "policy_groups": [
9
      "policy_groups": [
6
10
        "accounts",
10
        "accounts",
7
11
        "audio",
11
        "audio",
8
12
        "camera",
9
12
        "content_exchange",
13
        "content_exchange",
10
13
        "content_exchange_source",
14
        "content_exchange_source",
11
14
        "keep-display-on",
15
        "keep-display-on",
12
15
        "location",
16
        "location",
13
17
        "microphone",
14
16
        "networking",
18
        "networking",
15
17
        "push-notification-client",
19
        "push-notification-client",
16
18
        "video",
20
        "video",
17
19
21
18
=== modified file 'src/app/webbrowser/Browser.qml'
19
--- src/app/webbrowser/Browser.qml	2015-10-13 12:57:33 +0000
20
+++ src/app/webbrowser/Browser.qml	2015-10-19 12:13:40 +0000
21
@@ -75,6 +75,30 @@
22
75
        }
75
        }
23
76
    }
76
    }
24
77
77
25
78
    Connections {
26
79
        target: currentWebview
27
80
28
81
        /* Note that we are connecting the mediaAccessPermissionRequested signal
29
82
           on the current webview only because we want all the tabs that are not
30
83
           visible to automatically deny the request but emit the signal again
31
84
           if the same origin requests permissions (which is the default
32
85
           behavior in oxide if we don't connect a signal handler), so that we
33
86
           can pop-up a dialog asking the user for permission.
34
87
35
88
           Design is working on a new component that allows per-tab non-modal
36
89
           dialogs that will allow asking permission to the user without blocking
37
90
           interaction with the rest of the page or the window. When ready all
38
91
           tabs will have their mediaAccessPermissionRequested signal handled by
39
92
           creating one of these new dialogs.
40
93
        */
41
94
        onMediaAccessPermissionRequested: PopupUtils.open(mediaAccessDialogComponent, null, { request: request })
42
95
    }
43
96
44
97
    Component {
45
98
        id: mediaAccessDialogComponent
46
99
        MediaAccessDialog { }
47
100
    }
48
101
49
78
    actions: [
102
    actions: [
50
79
        Actions.GoTo {
103
        Actions.GoTo {
51
80
            onTriggered: currentWebview.url = value
104
            onTriggered: currentWebview.url = value
52
@@ -118,6 +142,8 @@
53
118
        property string allowOpenInBackgroundTab: settingsDefaults.allowOpenInBackgroundTab
142
        property string allowOpenInBackgroundTab: settingsDefaults.allowOpenInBackgroundTab
54
119
        property bool restoreSession: settingsDefaults.restoreSession
143
        property bool restoreSession: settingsDefaults.restoreSession
55
120
        property int newTabDefaultSection: settingsDefaults.newTabDefaultSection
144
        property int newTabDefaultSection: settingsDefaults.newTabDefaultSection
56
145
        property string defaultAudioDevice
57
146
        property string defaultVideoDevice
58
121
147
59
122
        function restoreDefaults() {
148
        function restoreDefaults() {
60
123
            homepage  = settingsDefaults.homepage
149
            homepage  = settingsDefaults.homepage
61
@@ -125,6 +151,8 @@
62
125
            allowOpenInBackgroundTab = settingsDefaults.allowOpenInBackgroundTab
151
            allowOpenInBackgroundTab = settingsDefaults.allowOpenInBackgroundTab
63
126
            restoreSession = settingsDefaults.restoreSession
152
            restoreSession = settingsDefaults.restoreSession
64
127
            newTabDefaultSection = settingsDefaults.newTabDefaultSection
153
            newTabDefaultSection = settingsDefaults.newTabDefaultSection
65
154
            defaultAudioDevice = settingsDefaults.defaultAudioDevice
66
155
            defaultVideoDevice = settingsDefaults.defaultVideoDevice
67
128
        }
156
        }
68
129
    }
157
    }
69
130
158
70
@@ -136,6 +164,8 @@
71
136
        readonly property string allowOpenInBackgroundTab: "default"
164
        readonly property string allowOpenInBackgroundTab: "default"
72
137
        readonly property bool restoreSession: true
165
        readonly property bool restoreSession: true
73
138
        readonly property int newTabDefaultSection: 0
166
        readonly property int newTabDefaultSection: 0
74
167
        readonly property string defaultAudioDevice: ""
75
168
        readonly property string defaultVideoDevice: ""
76
139
    }
169
    }
77
140
170
78
141
    FocusScope {
171
    FocusScope {
79
142
172
80
=== added file 'src/app/webbrowser/MediaAccessDialog.qml'
81
--- src/app/webbrowser/MediaAccessDialog.qml	1970-01-01 00:00:00 +0000
82
+++ src/app/webbrowser/MediaAccessDialog.qml	2015-10-19 12:13:40 +0000
83
@@ -0,0 +1,69 @@
84
1
/*
85
2
 * Copyright 2015 Canonical Ltd.
86
3
 *
87
4
 * This file is part of webbrowser-app.
88
5
 *
89
6
 * webbrowser-app is free software; you can redistribute it and/or modify
90
7
 * it under the terms of the GNU General Public License as published by
91
8
 * the Free Software Foundation; version 3.
92
9
 *
93
10
 * webbrowser-app is distributed in the hope that it will be useful,
94
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
95
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
96
13
 * GNU General Public License for more details.
97
14
 *
98
15
 * You should have received a copy of the GNU General Public License
99
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
100
17
 */
101
18
102
19
import QtQuick 2.4
103
20
import Ubuntu.Components 1.3
104
21
import Ubuntu.Components.Popups 1.3
105
22
106
23
Dialog {
107
24
    property var request
108
25
    modal: true
109
26
110
27
    title: request.isForAudio && request.isForVideo ?
111
28
           i18n.tr("Allow this domain to access your camera and microphone?") :
112
29
           (request.isForVideo ? i18n.tr("Allow this domain to access your camera?")
113
30
                               : i18n.tr("Allow this domain to access your microphone?"))
114
31
115
32
    text: request.embedder.toString() !== request.origin.toString() ?
116
33
          internal.textWhenEmbedded : request.origin
117
34
118
35
    Row {
119
36
        id: internal
120
37
121
38
        // TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it
122
39
        readonly property string textWhenEmbedded: i18n.tr("%1 (embedded in %2)")
123
40
                                                   .arg(request.origin).arg(request.embedder)
124
41
        height: units.gu(4)
125
42
        spacing: units.gu(2)
126
43
        anchors.horizontalCenter: parent.horizontalCenter
127
44
128
45
        Button {
129
46
            id: allowButton
130
47
            objectName: "mediaAccessDialog.allowButton"
131
48
            text: i18n.tr("Yes")
132
49
            color: UbuntuColors.green
133
50
            width: units.gu(14)
134
51
            onClicked: {
135
52
                request.allow()
136
53
                hide()
137
54
            }
138
55
        }
139
56
140
57
        Button {
141
58
            id: denyButton
142
59
            objectName: "mediaAccessDialog.denyButton"
143
60
            text: i18n.tr("No")
144
61
            color: UbuntuColors.red
145
62
            width: units.gu(14)
146
63
            onClicked: {
147
64
                request.deny()
148
65
                hide()
149
66
            }
150
67
        }
151
68
    }
152
69
}
153
0
70
154
=== added file 'src/app/webbrowser/SettingsDeviceSelector.qml'
155
--- src/app/webbrowser/SettingsDeviceSelector.qml	1970-01-01 00:00:00 +0000
156
+++ src/app/webbrowser/SettingsDeviceSelector.qml	2015-10-19 12:13:40 +0000
157
@@ -0,0 +1,71 @@
158
1
/*
159
2
 * Copyright 2015 Canonical Ltd.
160
3
 *
161
4
 * This file is part of webbrowser-app.
162
5
 *
163
6
 * webbrowser-app is free software; you can redistribute it and/or modify
164
7
 * it under the terms of the GNU General Public License as published by
165
8
 * the Free Software Foundation; version 3.
166
9
 *
167
10
 * webbrowser-app is distributed in the hope that it will be useful,
168
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
169
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
170
13
 * GNU General Public License for more details.
171
14
 *
172
15
 * You should have received a copy of the GNU General Public License
173
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
174
17
 */
175
18
176
19
import QtQuick 2.4
177
20
import Ubuntu.Components 1.3
178
21
import com.canonical.Oxide 1.9
179
22
180
23
Item {
181
24
    property bool isAudio
182
25
    readonly property int devicesCount: internal.devices.length
183
26
    property alias enabled: selector.enabled
184
27
    property string defaultDevice
185
28
    signal deviceSelected(string id)
186
29
187
30
    implicitHeight: selector.height + units.gu(1)
188
31
189
32
    OptionSelector {
190
33
        id: selector
191
34
192
35
        anchors.top: parent.top
193
36
        anchors.left: parent.left
194
37
        anchors.right: parent.right
195
38
        anchors.margins: units.gu(1)
196
39
        containerHeight: itemHeight * model.length
197
40
198
41
        model: internal.devices
199
42
        delegate: OptionSelectorDelegate { text: modelData.id }
200
43
        onDelegateClicked: deviceSelected(model[index].id)
201
44
    }
202
45
203
46
    QtObject {
204
47
        id: internal
205
48
206
49
        property var devices: isAudio ? Oxide.availableAudioCaptureDevices :
207
50
                                        Oxide.availableVideoCaptureDevices
208
51
209
52
        function updateDefaultDevice() {
210
53
            for (var i = 0; i < devices.length; i++) {
211
54
                if (defaultDevice === devices[i].id) {
212
55
                    selector.selectedIndex = i
213
56
                    return
214
57
                }
215
58
            }
216
59
        }
217
60
    }
218
61
219
62
    onDefaultDeviceChanged: internal.updateDefaultDevice()
220
63
    Connections {
221
64
        target: Oxide
222
65
        onAvailableAudioCaptureDevicesChanged: if (isAudio) internal.updateDefaultDevice()
223
66
        onAvailableVideoCaptureDevicesChanged: if (!isAudio) internal.updateDefaultDevice()
224
67
    }
225
68
226
69
    onIsAudioChanged: internal.updateDefaultDevice()
227
70
}
228
71
229
0
72
230
=== modified file 'src/app/webbrowser/SettingsPage.qml'
231
--- src/app/webbrowser/SettingsPage.qml	2015-09-01 15:35:40 +0000
232
+++ src/app/webbrowser/SettingsPage.qml	2015-10-19 12:13:40 +0000
233
@@ -20,7 +20,7 @@
234
20
import Qt.labs.settings 1.0
20
import Qt.labs.settings 1.0
235
21
import Ubuntu.Components 1.3
21
import Ubuntu.Components 1.3
236
22
import Ubuntu.Components.Popups 1.3
22
import Ubuntu.Components.Popups 1.3
238
23
import Ubuntu.Components.ListItems 1.3 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItems
239
24
import Ubuntu.Web 0.2
24
import Ubuntu.Web 0.2
240
25
import webbrowserapp.private 0.1
25
import webbrowserapp.private 0.1
241
26
26
242
@@ -29,7 +29,7 @@
243
29
Item {
29
Item {
244
30
    id: settingsItem
30
    id: settingsItem
245
31
31
247
32
    property Settings settingsObject
32
    property QtObject settingsObject
248
33
33
249
34
    signal done()
34
    signal done()
250
35
35
251
@@ -68,7 +68,7 @@
252
68
68
253
69
            width: parent.width
69
            width: parent.width
254
70
70
256
71
            ListItem.Subtitled {
71
            ListItems.Subtitled {
257
72
                objectName: "searchengine"
72
                objectName: "searchengine"
258
73
73
259
74
                SearchEngine {
74
                SearchEngine {
260
@@ -85,7 +85,7 @@
261
85
                onClicked: searchEngineComponent.createObject(subpageContainer)
85
                onClicked: searchEngineComponent.createObject(subpageContainer)
262
86
            }
86
            }
263
87
87
265
88
            ListItem.Subtitled {
88
            ListItems.Subtitled {
266
89
                objectName: "homepage"
89
                objectName: "homepage"
267
90
90
268
91
                text: i18n.tr("Homepage")
91
                text: i18n.tr("Homepage")
269
@@ -94,7 +94,7 @@
270
94
                onClicked: PopupUtils.open(homepageDialog)
94
                onClicked: PopupUtils.open(homepageDialog)
271
95
            }
95
            }
272
96
96
274
97
            ListItem.Standard {
97
            ListItems.Standard {
275
98
                objectName: "restoreSession"
98
                objectName: "restoreSession"
276
99
99
277
100
                text: i18n.tr("Restore previous session at startup")
100
                text: i18n.tr("Restore previous session at startup")
278
@@ -112,7 +112,7 @@
279
112
                }
112
                }
280
113
            }
113
            }
281
114
114
283
115
            ListItem.Standard {
115
            ListItems.Standard {
284
116
                objectName: "backgroundTabs"
116
                objectName: "backgroundTabs"
285
117
117
286
118
                text: i18n.tr("Allow opening new tabs in background")
118
                text: i18n.tr("Allow opening new tabs in background")
287
@@ -131,15 +131,15 @@
288
131
                }
131
                }
289
132
            }
132
            }
290
133
133
292
134
            ListItem.Standard {
134
            ListItems.Standard {
293
135
                objectName: "privacy"
135
                objectName: "privacy"
294
136
136
296
137
                text: i18n.tr("Privacy")
137
                text: i18n.tr("Privacy & permissions")
297
138
138
298
139
                onClicked: privacyComponent.createObject(subpageContainer)
139
                onClicked: privacyComponent.createObject(subpageContainer)
299
140
            }
140
            }
300
141
141
302
142
            ListItem.Standard {
142
            ListItems.Standard {
303
143
                objectName: "reset"
143
                objectName: "reset"
304
144
144
305
145
                text: i18n.tr("Reset browser settings")
145
                text: i18n.tr("Reset browser settings")
306
@@ -186,7 +186,7 @@
307
186
186
308
187
                    model: searchEngines.engines
187
                    model: searchEngines.engines
309
188
188
311
189
                    delegate: ListItem.Standard {
189
                    delegate: ListItems.Standard {
312
190
                        objectName: "searchEngineDelegate_" + index
190
                        objectName: "searchEngineDelegate_" + index
313
191
                        SearchEngine {
191
                        SearchEngine {
314
192
                            id: searchEngineDelegate
192
                            id: searchEngineDelegate
315
@@ -224,7 +224,7 @@
316
224
                SettingsPageHeader {
224
                SettingsPageHeader {
317
225
                    id: privacyTitle
225
                    id: privacyTitle
318
226
                    onBack: privacyItem.destroy()
226
                    onBack: privacyItem.destroy()
320
227
                    text: i18n.tr("Privacy")
227
                    text: i18n.tr("Privacy & permissions")
321
228
                }
228
                }
322
229
229
323
230
                Flickable {
230
                Flickable {
324
@@ -243,7 +243,13 @@
325
243
                        id: privacyCol
243
                        id: privacyCol
326
244
                        width: parent.width
244
                        width: parent.width
327
245
245
329
246
                        ListItem.Standard {
246
                        ListItems.Standard {
330
247
                            objectName: "privacy.mediaAccess"
331
248
                            text: i18n.tr("Camera & microphone")
332
249
                            onClicked: mediaAccessComponent.createObject(subpageContainer)
333
250
                        }
334
251
335
252
                        ListItems.Standard {
336
247
                            objectName: "privacy.clearHistory"
253
                            objectName: "privacy.clearHistory"
337
248
                            text: i18n.tr("Clear Browsing History")
254
                            text: i18n.tr("Clear Browsing History")
338
249
                            enabled: HistoryModel.count > 0
255
                            enabled: HistoryModel.count > 0
339
@@ -253,7 +259,7 @@
340
253
                            }
259
                            }
341
254
                        }
260
                        }
342
255
261
344
256
                        ListItem.Standard {
262
                        ListItems.Standard {
345
257
                            objectName: "privacy.clearCache"
263
                            objectName: "privacy.clearCache"
346
258
                            text: i18n.tr("Clear Cache")
264
                            text: i18n.tr("Clear Cache")
347
259
                            onClicked: {
265
                            onClicked: {
348
@@ -359,5 +365,83 @@
349
359
            }
365
            }
350
360
        }
366
        }
351
361
    }
367
    }
352
368
353
369
    Component {
354
370
        id: mediaAccessComponent
355
371
356
372
        Item {
357
373
            id: mediaAccessItem
358
374
            objectName: "mediaAccessSettings"
359
375
            anchors.fill: parent
360
376
361
377
            Rectangle {
362
378
                anchors.fill: parent
363
379
                color: "#f6f6f6"
364
380
            }
365
381
366
382
            SettingsPageHeader {
367
383
                id: mediaAccessTitle
368
384
369
385
                onBack: mediaAccessItem.destroy()
370
386
                text: i18n.tr("Camera & microphone")
371
387
            }
372
388
373
389
            Flickable {
374
390
                anchors {
375
391
                    top: mediaAccessTitle.bottom
376
392
                    left: parent.left
377
393
                    right: parent.right
378
394
                    bottom: parent.bottom
379
395
                }
380
396
381
397
                clip: true
382
398
383
399
                contentHeight: mediaAccessCol.height
384
400
385
401
                Column {
386
402
                    id: mediaAccessCol
387
403
                    width: parent.width
388
404
389
405
                    ListItems.Standard {
390
406
                        text: i18n.tr("Microphone")
391
407
                    }
392
408
393
409
                    SettingsDeviceSelector {
394
410
                        anchors.left: parent.left
395
411
                        anchors.right: parent.right
396
412
397
413
                        isAudio: true
398
414
                        visible: devicesCount > 0
399
415
                        enabled: devicesCount > 1
400
416
401
417
                        defaultDevice: settings.defaultAudioDevice
402
418
                        onDeviceSelected: {
403
419
                            SharedWebContext.sharedContext.defaultAudioCaptureDeviceId = id
404
420
                            settings.defaultAudioDevice = id
405
421
                        }
406
422
                    }
407
423
408
424
                    ListItems.Standard {
409
425
                        text: i18n.tr("Camera")
410
426
                    }
411
427
412
428
                    SettingsDeviceSelector {
413
429
                        anchors.left: parent.left
414
430
                        anchors.right: parent.right
415
431
416
432
                        isAudio: false
417
433
                        visible: devicesCount > 0
418
434
                        enabled: devicesCount > 1
419
435
420
436
                        defaultDevice: settings.defaultVideoDevice
421
437
                        onDeviceSelected: {
422
438
                          SharedWebContext.sharedContext.defaultVideoCaptureDeviceId = id
423
439
                          settings.defaultVideoDevice = id
424
440
                        }
425
441
                    }
426
442
                }
427
443
            }
428
444
        }
429
445
    }
430
362
}
446
}
431
363
447
432
364
448
433
=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
434
--- tests/autopilot/webbrowser_app/emulators/browser.py	2015-10-08 15:26:18 +0000
435
+++ tests/autopilot/webbrowser_app/emulators/browser.py	2015-10-19 12:13:40 +0000
436
@@ -123,6 +123,9 @@
437
123
    def get_http_auth_dialog(self):
123
    def get_http_auth_dialog(self):
438
124
        return self.wait_select_single(HttpAuthenticationDialog)
124
        return self.wait_select_single(HttpAuthenticationDialog)
439
125
125
440
126
    def get_media_access_dialog(self):
441
127
        return self.wait_select_single(MediaAccessDialog)
442
128
443
126
    def get_tabs_view(self):
129
    def get_tabs_view(self):
444
127
        return self.wait_select_single(TabsList, visible=True)
130
        return self.wait_select_single(TabsList, visible=True)
445
128
131
446
@@ -402,6 +405,21 @@
447
402
        return self.select_single("TextField", objectName="password")
405
        return self.select_single("TextField", objectName="password")
448
403
406
449
404
407
450
408
class MediaAccessDialog(uitk.UbuntuUIToolkitCustomProxyObjectBase):
451
409
452
410
    @autopilot.logging.log_action(logger.info)
453
411
    def click_deny_button(self):
454
412
        button = self.select_single("Button",
455
413
                                    objectName="mediaAccessDialog.denyButton")
456
414
        self.pointing_device.click_object(button)
457
415
458
416
    @autopilot.logging.log_action(logger.info)
459
417
    def click_allow_button(self):
460
418
        button = self.select_single("Button",
461
419
                                    objectName="mediaAccessDialog.allowButton")
462
420
        self.pointing_device.click_object(button)
463
421
464
422
465
405
class TabPreview(uitk.UbuntuUIToolkitCustomProxyObjectBase):
423
class TabPreview(uitk.UbuntuUIToolkitCustomProxyObjectBase):
466
406
424
467
407
    @autopilot.logging.log_action(logger.info)
425
    @autopilot.logging.log_action(logger.info)
468
408
426
469
=== modified file 'tests/autopilot/webbrowser_app/tests/http_server.py'
470
--- tests/autopilot/webbrowser_app/tests/http_server.py	2015-09-15 15:21:15 +0000
471
+++ tests/autopilot/webbrowser_app/tests/http_server.py	2015-10-19 12:13:40 +0000
472
@@ -193,6 +193,16 @@
473
193
                    self.send_auth_request()
193
                    self.send_auth_request()
474
194
            else:
194
            else:
475
195
                self.send_auth_request()
195
                self.send_auth_request()
476
196
        elif self.path.startswith("/media/"):
477
197
            self.send_response(200)
478
198
            permissions = self.path[len("/media/"):]
479
199
            self.send_html(
480
200
                "<script>navigator.webkitGetUserMedia("
481
201
                "{video: " + ("true" if "v" in permissions else "false") +
482
202
                ", audio: " + ("true" if "a" in permissions else "false") +
483
203
                "}, function() { location.href = '/test1' } " +
484
204
                ", function() { location.href = '/test2' })</script>"
485
205
            )
486
196
        else:
206
        else:
487
197
            self.send_error(404)
207
            self.send_error(404)
488
198
208
489
199
209
490
=== added file 'tests/autopilot/webbrowser_app/tests/test_media_access_permission.py'
491
--- tests/autopilot/webbrowser_app/tests/test_media_access_permission.py	1970-01-01 00:00:00 +0000
492
+++ tests/autopilot/webbrowser_app/tests/test_media_access_permission.py	2015-10-19 12:13:40 +0000
493
@@ -0,0 +1,98 @@
494
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
495
2
#
496
3
# Copyright 2015 Canonical
497
4
#
498
5
# This program is free software: you can redistribute it and/or modify it
499
6
# under the terms of the GNU General Public License version 3, as published
500
7
# by the Free Software Foundation.
501
8
#
502
9
# This program is distributed in the hope that it will be useful,
503
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
504
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
505
12
# GNU General Public License for more details.
506
13
#
507
14
# You should have received a copy of the GNU General Public License
508
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
509
16
510
17
import testtools
511
18
from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
512
19
513
20
514
21
class TestMediaAccessPermission(StartOpenRemotePageTestCaseBase):
515
22
516
23
    def setUp(self):
517
24
        super(TestMediaAccessPermission, self).setUp()
518
25
        self.url = self.base_url + "/media/"
519
26
        self.allowed_url = self.base_url + "/test1"
520
27
        self.denied_url = self.base_url + "/test2"
521
28
522
29
    @testtools.skip("We can't guarantee/test that audio/video devices exist")
523
30
    def test_allow(self):
524
31
        # verify that trying to access any media raises an authorization dialog
525
32
        url = self.url + "a"
526
33
        self.main_window.go_to_url(url)
527
34
        self.main_window.wait_until_page_loaded(url)
528
35
        dialog = self.main_window.get_media_access_dialog()
529
36
530
37
        # note that we have no easy way to verify that the browser actually
531
38
        # grants or denied permission based on our choice, because we can't
532
39
        # easily inspect the contents of the page from AP tests. the simplest
533
40
        # workaround I could find was to redirect the user to two different
534
41
        # pages upon permission granted or denied, and detect that instead
535
42
        dialog.click_allow_button()
536
43
        dialog.wait_until_destroyed()
537
44
        self.main_window.wait_until_page_loaded(self.allowed_url)
538
45
539
46
        # verify that trying to access the same media for the same origin in
540
47
        # the same session will not ask for permission again...
541
48
        self.main_window.go_to_url(url)
542
49
        self.main_window.wait_until_page_loaded(self.allowed_url)
543
50
544
51
        # ...but it will ask if we try to access other media
545
52
        url = self.url + "v"
546
53
        self.main_window.go_to_url(url)
547
54
        self.main_window.wait_until_page_loaded(url)
548
55
        dialog = self.main_window.get_media_access_dialog()
549
56
        dialog.click_allow_button()
550
57
        dialog.wait_until_destroyed()
551
58
        self.main_window.wait_until_page_loaded(self.allowed_url)
552
59
553
60
        # now that we granted both permissions, verify that asking for both
554
61
        # together will also not raise the dialog
555
62
        url = self.url + "av"
556
63
        self.main_window.go_to_url(url)
557
64
        self.main_window.wait_until_page_loaded(self.allowed_url)
558
65
559
66
    def test_deny(self):
560
67
        # verify that trying to access any media raises an authorization dialog
561
68
        # and we get redirected to the denial page in case we refuse to give
562
69
        # permission
563
70
        url = self.url + "a"
564
71
        self.main_window.go_to_url(url)
565
72
        self.main_window.wait_until_page_loaded(url)
566
73
        dialog = self.main_window.get_media_access_dialog()
567
74
        dialog.click_deny_button()
568
75
        dialog.wait_until_destroyed()
569
76
        self.main_window.wait_until_page_loaded(self.denied_url)
570
77
571
78
        # verify that trying to access the same media for the same origin in
572
79
        # the same session will not ask for permission again...
573
80
        self.main_window.go_to_url(url)
574
81
        self.main_window.wait_until_page_loaded(self.denied_url)
575
82
576
83
    @testtools.skip("Skipping due to oxide bug, see http://pad.lv/1501017")
577
84
    def test_deny_combined(self):
578
85
        # deny first one input type, then try to ask both and verify that a
579
86
        # request is made for the media that was not asked for the fist time
580
87
        url = self.url + "a"
581
88
        self.main_window.go_to_url(url)
582
89
        self.main_window.wait_until_page_loaded(url)
583
90
        dialog = self.main_window.get_media_access_dialog()
584
91
        dialog.click_deny_button()
585
92
        dialog.wait_until_destroyed()
586
93
        self.main_window.wait_until_page_loaded(self.denied_url)
587
94
588
95
        url = self.url + "av"
589
96
        self.main_window.go_to_url(url)
590
97
        self.main_window.wait_until_page_loaded(url)
591
98
        dialog = self.main_window.get_media_access_dialog()
592
0
99
593
=== added file 'tests/unittests/qml/tst_SettingsPage.qml'
594
--- tests/unittests/qml/tst_SettingsPage.qml	1970-01-01 00:00:00 +0000
595
+++ tests/unittests/qml/tst_SettingsPage.qml	2015-10-19 12:13:40 +0000
596
@@ -0,0 +1,113 @@
597
1
/*
598
2
 * Copyright 2015 Canonical Ltd.
599
3
 *
600
4
 * This file is part of webbrowser-app.
601
5
 *
602
6
 * webbrowser-app is free software; you can redistribute it and/or modify
603
7
 * it under the terms of the GNU General Public License as published by
604
8
 * the Free Software Foundation; version 3.
605
9
 *
606
10
 * webbrowser-app is distributed in the hope that it will be useful,
607
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
608
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
609
13
 * GNU General Public License for more details.
610
14
 *
611
15
 * You should have received a copy of the GNU General Public License
612
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
613
17
 */
614
18
615
19
import QtQuick 2.4
616
20
import QtTest 1.0
617
21
import Ubuntu.Test 1.0
618
22
import webbrowserapp.private 0.1
619
23
import webbrowsertest.private 0.1
620
24
import "../../../src/app/webbrowser"
621
25
622
26
Item {
623
27
    width: 400
624
28
    height: 600
625
29
626
30
    property var settingsPage: settingsPageLoader.item
627
31
628
32
    Loader {
629
33
        id: settingsPageLoader
630
34
        anchors.fill: parent
631
35
        active: false
632
36
        sourceComponent: SettingsPage {
633
37
            anchors.fill: parent
634
38
635
39
            // NOTE: the following properties are not necessary for the tests
636
40
            // currently in this file, but if we don't provide them a lot of
637
41
            // warnings will be generated.
638
42
            // Ideally either more tests that use them will be added or the code
639
43
            // in SettingsPage will be refactored to cope with the missing
640
44
            // settings.
641
45
            settingsObject: QtObject {
642
46
                property url homepage
643
47
                property string searchEngine
644
48
                property int newTabDefaultSection: 0
645
49
            }
646
50
        }
647
51
    }
648
52
649
53
    UbuntuTestCase {
650
54
        name: "TestSettingsPage"
651
55
        when: windowShown
652
56
653
57
        function clickItem(item) {
654
58
            var center = centerOf(item)
655
59
            mouseClick(item, center.x, center.y)
656
60
        }
657
61
658
62
        function swipeItemRight(item) {
659
63
            var center = centerOf(item)
660
64
            var dx = item.width * 0.5
661
65
            mousePress(item, center.x, center.y)
662
66
            mouseMoveSlowly(item, center.x, center.y, dx, 0, 10, 0.01)
663
67
            mouseRelease(item, center.x + dx, center.y)
664
68
        }
665
69
666
70
        function init() {
667
71
            settingsPageLoader.active = true
668
72
            waitForRendering(settingsPageLoader.item)
669
73
        }
670
74
671
75
        function cleanup() {
672
76
            settingsPageLoader.active = false
673
77
        }
674
78
675
79
        function getListItems(name, itemName) {
676
80
            var list = findChild(settingsPage, name)
677
81
            var items = []
678
82
            if (list) {
679
83
                // ensure all the delegates are created
680
84
                list.cacheBuffer = list.count * 1000
681
85
682
86
                // In some cases the ListView might add other children to the
683
87
                // contentItem, so we filter the list of children to include
684
88
                // only actual delegates (names for delegates in this case
685
89
                // follow the pattern "name_index")
686
90
                var children = list.contentItem.children
687
91
                for (var i = 0; i < children.length; i++) {
688
92
                    if (children[i].objectName.indexOf(itemName) == 0) {
689
93
                        items.push(children[i])
690
94
                    }
691
95
                }
692
96
            }
693
97
            return items
694
98
        }
695
99
696
100
        function activateSettingsItem(itemName, pageName) {
697
101
            var item = findChild(settingsPage, itemName)
698
102
            clickItem(item)
699
103
            var page = findChild(settingsPage, pageName)
700
104
            waitForRendering(page)
701
105
            return page
702
106
        }
703
107
704
108
        function goToMediaAccessPage() {
705
109
            activateSettingsItem("privacy", "privacySettings")
706
110
            return activateSettingsItem("privacy.mediaAccess", "mediaAccessSettings")
707
111
        }
708
112
    }
709
113
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-10-20
Olivier Tilloy		2015-09-30	Approve on 2015-10-19
Review via email: mp+272919@code.launchpad.net