1
=== modified file 'src/app/webbrowser/ActivityView.qml'
2
--- src/app/webbrowser/ActivityView.qml	2014-03-12 22:45:12 +0000
3
+++ src/app/webbrowser/ActivityView.qml	2014-04-25 02:58:59 +0000
4
@@ -1,5 +1,5 @@
5
1
/*
1
/*
7
2
 * Copyright 2013 Canonical Ltd.
2
 * Copyright 2013, 2014 Canonical Ltd.
8
3
 *
3
 *
9
4
 * This file is part of webbrowser-app.
4
 * This file is part of webbrowser-app.
10
5
 *
5
 *
11
@@ -21,6 +21,7 @@
12
21
21
13
22
Tabs {
22
Tabs {
14
23
    id: activityView
23
    id: activityView
15
24
    objectName: "activityViewTabs"
16
24
25
17
25
    property alias tabsModel: timelineView.tabsModel
26
    property alias tabsModel: timelineView.tabsModel
18
26
    property alias historyModel: timelineView.historyModel
27
    property alias historyModel: timelineView.historyModel
19
@@ -34,6 +35,7 @@
20
34
35
21
35
    Tab {
36
    Tab {
22
36
        title: i18n.tr("Activity")
37
        title: i18n.tr("Activity")
23
38
        objectName: "activityTab"
24
37
        page: Page {
39
        page: Page {
25
38
            TimelineView {
40
            TimelineView {
26
39
                id: timelineView
41
                id: timelineView
27
@@ -49,9 +51,9 @@
28
49
            }
51
            }
29
50
        }
52
        }
30
51
    }
53
    }
31
52
32
53
    Tab {
54
    Tab {
33
54
        title: i18n.tr("Bookmarks")
55
        title: i18n.tr("Bookmarks")
34
56
        objectName: "bookmarksTab"
35
55
        page: Page {
57
        page: Page {
36
56
            BookmarksView {
58
            BookmarksView {
37
57
                id: bookmarksView
59
                id: bookmarksView
38
58
60
39
=== modified file 'src/app/webbrowser/PageDelegate.qml'
40
--- src/app/webbrowser/PageDelegate.qml	2014-03-12 22:45:12 +0000
41
+++ src/app/webbrowser/PageDelegate.qml	2014-04-25 02:58:59 +0000
42
@@ -1,5 +1,5 @@
43
1
/*
1
/*
45
2
 * Copyright 2013 Canonical Ltd.
2
 * Copyright 2013, 2014 Canonical Ltd.
46
3
 *
3
 *
47
4
 * This file is part of webbrowser-app.
4
 * This file is part of webbrowser-app.
48
5
 *
5
 *
49
@@ -65,6 +65,7 @@
50
65
65
51
66
                Image {
66
                Image {
52
67
                    id: starIcon
67
                    id: starIcon
53
68
                    objectName: "bookmarkImage"
54
68
                    source: pageDelegate.bookmarked ? "assets/browser_favourite_on.png"
69
                    source: pageDelegate.bookmarked ? "assets/browser_favourite_on.png"
55
69
                                                    : "assets/browser_favourite_off.png"
70
                                                    : "assets/browser_favourite_off.png"
56
70
                    visible: pageDelegate.canBookmark
71
                    visible: pageDelegate.canBookmark
57
71
72
58
=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
59
--- tests/autopilot/webbrowser_app/emulators/browser.py	2014-02-06 04:31:01 +0000
60
+++ tests/autopilot/webbrowser_app/emulators/browser.py	2014-04-25 02:58:59 +0000
61
@@ -1,6 +1,6 @@
62
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
63
2
#
2
#
65
3
# Copyright 2013 Canonical
3
# Copyright 2013, 2014 Canonical
66
4
#
4
#
67
5
# This program is free software: you can redistribute it and/or modify it
5
# This program is free software: you can redistribute it and/or modify it
68
6
# under the terms of the GNU General Public License version 3, as published
6
# under the terms of the GNU General Public License version 3, as published
69
@@ -14,9 +14,21 @@
70
14
# You should have received a copy of the GNU General Public License
14
# You should have received a copy of the GNU General Public License
71
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
72
16
16
73
17
import logging
74
18
import operator
75
19
76
20
from autopilot import logging as autopilot_logging
77
21
78
17
from ubuntuuitoolkit import emulators as uitk
22
from ubuntuuitoolkit import emulators as uitk
79
18
23
80
19
24
81
25
logger = logging.getLogger(__name__)
82
26
83
27
84
28
class BrowserEmulatorException(uitk.ToolkitEmulatorException):
85
29
    """Exception raised when there is an error with the emulator."""
86
30
87
31
88
20
class Panel(uitk.Toolbar):
32
class Panel(uitk.Toolbar):
89
21
    pass
33
    pass
90
22
34
91
@@ -27,6 +39,15 @@
92
27
    An emulator class that makes it easy to interact with the webbrowser app.
39
    An emulator class that makes it easy to interact with the webbrowser app.
93
28
    """
40
    """
94
29
41
95
42
    def get_tabs(self):
96
43
        """Return the Tabs emualtor of the MainView.
97
44
98
45
        Overriden because on the browser the Tabs container gets the
99
46
        ActivityView name.
100
47
101
48
        """
102
49
        return self.select_single(ActivityView)
103
50
104
30
    def get_toolbar(self):
51
    def get_toolbar(self):
105
31
        # Overridden since the browser doesn’t use the MainView’s Toolbar.
52
        # Overridden since the browser doesn’t use the MainView’s Toolbar.
106
32
        return self.select_single(Panel)
53
        return self.select_single(Panel)
107
@@ -101,3 +122,113 @@
108
101
        tabs = view.select_many("PageDelegate", objectName="openTabDelegate")
122
        tabs = view.select_many("PageDelegate", objectName="openTabDelegate")
109
102
        tabs.sort(key=lambda tab: tab.x)
123
        tabs.sort(key=lambda tab: tab.x)
110
103
        return tabs
124
        return tabs
111
125
112
126
    @autopilot_logging.log_action(logger.info)
113
127
    def open_activity(self):
114
128
        """Open the Activity view."""
115
129
        if self.activityViewVisible:
116
130
            logger.debug('The activity view is already opened.')
117
131
        else:
118
132
            toolbar = self.open_toolbar()
119
133
            toolbar.click_button('activityButton')
120
134
            self.activityViewVisible.wait_for(True)
121
135
        return self.select_single(ActivityView)
122
136
123
137
124
138
class ActivityView(uitk.Tabs):
125
139
126
140
    def __init__(self, *args):
127
141
        super(ActivityView, self).__init__(*args)
128
142
        # XXX we need a better way to keep reference to the main view.
129
143
        # --elopio - 2014-01-31
130
144
        self.main_view = self.get_root_instance().select_single(Browser)
131
145
132
146
    def open_activity_tab(self):
133
147
        self.main_view.switch_to_tab('activityTab')
134
148
        return self.select_single(TimelineView)
135
149
136
150
    def open_bookmarks_tab(self):
137
151
        self.main_view.switch_to_tab('bookmarksTab')
138
152
        return self.select_single(BookmarksView)
139
153
140
154
141
155
class TimelineView(uitk.UbuntuUIToolkitEmulatorBase):
142
156
143
157
    @autopilot_logging.log_action(logger.info)
144
158
    def bookmark_page(self, url):
145
159
        """Add a page to the bookmarks.
146
160
147
161
        :parameter url: The URL of the page to bookmark.
148
162
        :raises BrowserEmulatorException: if the page is not in the currently
149
163
            viewing list.
150
164
151
165
        """
152
166
        pages = self._get_currently_viewing_page_delegates()
153
167
        for page in pages:
154
168
            if page.url == url:
155
169
                page.bookmark()
156
170
                break
157
171
        else:
158
172
            raise BrowserEmulatorException(
159
173
                'The page with URL {!r} is not open.'.format(url))
160
174
161
175
    def _get_currently_viewing_page_delegates(self):
162
176
        tabs_list = self.select_single('TabsList')
163
177
        pages = tabs_list.select_many(
164
178
            PageDelegate, objectName='openTabDelegate')
165
179
        pages.sort(key=lambda page: page.x)
166
180
        return pages
167
181
168
182
169
183
class PageDelegate(uitk.UbuntuUIToolkitEmulatorBase):
170
184
171
185
    def bookmark(self):
172
186
        """Add this page to the bookmarks.
173
187
174
188
        :raises BrowserEmulatorException: if the page is already bookmarked.
175
189
176
190
        """
177
191
        if self.bookmarked:
178
192
            raise BrowserEmulatorException(
179
193
                'The page with URL {!r} is already bookmarked.'.format(
180
194
                    self.url))
181
195
        else:
182
196
            bookmark_image = self.select_single(
183
197
                'QQuickImage', objectName='bookmarkImage')
184
198
            self.pointing_device.click_object(bookmark_image)
185
199
            self.bookmarked.wait_for(True)
186
200
187
201
    def remove_bookmark(self):
188
202
        """Remove this page from the bookmarks.
189
203
190
204
        :raises BrowserEmulatorException: if the page is not bookmarked.
191
205
192
206
        """
193
207
        if not self.bookmarked:
194
208
            raise BrowserEmulatorException(
195
209
                'The page with URL {!r} is not bookmarked.'.format(self.url))
196
210
        else:
197
211
            bookmark_image = self.select_single(
198
212
                'QQuickImage', objectName='bookmarkImage')
199
213
            self.pointing_device.click_object(bookmark_image)
200
214
            # We can't just wait for the bookmarked value to be False, because
201
215
            # on the Bookmarks view the element is removed. The check is left
202
216
            # to the caller.
203
217
204
218
205
219
class BookmarksView(uitk.UbuntuUIToolkitEmulatorBase):
206
220
207
221
    def get_bookmarked_pages(self):
208
222
        """Return a list with the URLs of the bookmarked pages."""
209
223
        pages = self._get_bookmarked_page_delegates()
210
224
        return [page.url for page in pages]
211
225
212
226
    def _get_bookmarked_page_delegates(self):
213
227
        pages = self.select_many(PageDelegate)
214
228
        pages.sort(key=operator.attrgetter('x'))
215
229
        return pages
216
230
217
231
    def remove_all_bookmarks(self):
218
232
        for page in self._get_bookmarked_page_delegates():
219
233
            page.remove_bookmark()
220
234
            page.wait_until_destroyed()
221
104
235
222
=== added file 'tests/autopilot/webbrowser_app/tests/test_bookmarks.py'
223
--- tests/autopilot/webbrowser_app/tests/test_bookmarks.py	1970-01-01 00:00:00 +0000
224
+++ tests/autopilot/webbrowser_app/tests/test_bookmarks.py	2014-04-25 02:58:59 +0000
225
@@ -0,0 +1,40 @@
226
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
227
2
#
228
3
# Copyright 2014 Canonical
229
4
#
230
5
# This program is free software: you can redistribute it and/or modify it
231
6
# under the terms of the GNU General Public License version 3, as published
232
7
# by the Free Software Foundation.
233
8
#
234
9
# This program is distributed in the hope that it will be useful,
235
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
236
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
237
12
# GNU General Public License for more details.
238
13
#
239
14
# You should have received a copy of the GNU General Public License
240
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
241
16
242
17
from webbrowser_app import tests
243
18
244
19
from testtools.matchers import Contains
245
20
246
21
247
22
class BookmarksTestCase(tests.StartOpenRemotePageTestCaseBase):
248
23
249
24
    def setUp(self):
250
25
        super(BookmarksTestCase, self).setUp()
251
26
        self.addCleanup(self.remove_all_bookmarks)
252
27
253
28
    def remove_all_bookmarks(self):
254
29
        activity = self.main_window.open_activity()
255
30
        bookmarks_tab = activity.open_bookmarks_tab()
256
31
        bookmarks_tab.remove_all_bookmarks()
257
32
258
33
    def test_bookmark_page_must_add_it_to_bookmarks_tab(self):
259
34
        activity = self.main_window.open_activity()
260
35
        activity_tab = activity.open_activity_tab()
261
36
        activity_tab.bookmark_page(self.url)
262
37
263
38
        bookmarks_tab = activity.open_bookmarks_tab()
264
39
        self.assertThat(
265
40
            bookmarks_tab.get_bookmarked_pages(), Contains(self.url))
Status:	Rejected
Rejected by:	Olivier Tilloy on 2014-08-01
Proposed branch:	lp:~elopio/webbrowser-app/test_add_bookmark
Merge into:	lp:webbrowser-app
Prerequisite:	lp:~elopio/webbrowser-app/copyright
Diff against target:	265 lines (+178/-4) 4 files modified src/app/webbrowser/ActivityView.qml (+4/-2) src/app/webbrowser/PageDelegate.qml (+2/-1) tests/autopilot/webbrowser_app/emulators/browser.py (+132/-1) tests/autopilot/webbrowser_app/tests/test_bookmarks.py (+40/-0)
To merge this branch:	bzr merge lp:~elopio/webbrowser-app/test_add_bookmark
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Olivier Tilloy		2014-02-06	Disapprove on 2014-08-01
Leo Arias (community)			Disapprove on 2014-05-10
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-04-28
Javier Collado (community)		2014-02-06	Approve on 2014-02-06
Richard Huddie		2014-02-06	Pending
Víctor R. Ruiz		2014-02-06	Pending
Review via email: mp+205080@code.launchpad.net