1
=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
2
--- tests/autopilot/webbrowser_app/emulators/browser.py	2014-12-18 15:53:25 +0000
3
+++ tests/autopilot/webbrowser_app/emulators/browser.py	2014-12-18 15:53:25 +0000
4
@@ -47,15 +47,28 @@
5
47
        self.chrome = self._get_chrome()
47
        self.chrome = self._get_chrome()
6
48
        self.address_bar = self.chrome.address_bar
48
        self.address_bar = self.chrome.address_bar
7
49
49
8
50
    def _get_chrome(self):
9
51
        return self.select_single(Chrome)
10
52
11
50
    def go_to_url(self, url):
53
    def go_to_url(self, url):
12
51
        self.address_bar.go_to_url(url)
54
        self.address_bar.go_to_url(url)
13
52
55
14
56
    def wait_until_page_loaded(self, url):
15
57
        webview = self.get_current_webview()
16
58
        webview.url.wait_for(url)
17
59
        # loadProgress == 100 ensures that a page has actually loaded
18
60
        webview.loadProgress.wait_for(100, timeout=20)
19
61
        webview.loading.wait_for(False)
20
62
21
63
    def go_back(self):
22
64
        self.chrome.go_back()
23
65
24
66
    def go_forward(self):
25
67
        self.chrome.go_forward()
26
68
27
53
    def get_window(self):
69
    def get_window(self):
28
54
        return self.get_parent()
70
        return self.get_parent()
29
55
71
30
56
    def _get_chrome(self):
31
57
        return self.select_single(Chrome)
32
58
33
59
    def get_current_webview(self):
72
    def get_current_webview(self):
34
60
        return self.select_single("WebViewImpl", current=True)
73
        return self.select_single("WebViewImpl", current=True)
35
61
74
36
@@ -102,12 +115,32 @@
37
102
    def _get_address_bar(self):
115
    def _get_address_bar(self):
38
103
        return self.select_single(AddressBar)
116
        return self.select_single(AddressBar)
39
104
117
41
105
    def get_back_button(self):
118
    @autopilot.logging.log_action(logger.info)
42
119
    def go_back(self):
43
120
        back_button = self._get_back_button()
44
121
        back_button.enabled.wait_for(True)
45
122
        self.pointing_device.click_object(back_button)
46
123
47
124
    def _get_back_button(self):
48
106
        return self.select_single("ChromeButton", objectName="backButton")
125
        return self.select_single("ChromeButton", objectName="backButton")
49
107
126
51
108
    def get_forward_button(self):
127
    def is_back_button_enabled(self):
52
128
        back_button = self._get_back_button()
53
129
        return back_button.enabled
54
130
55
131
    @autopilot.logging.log_action(logger.info)
56
132
    def go_forward(self):
57
133
        forward_button = self._get_forward_button()
58
134
        forward_button.enabled.wait_for(True)
59
135
        self.pointing_device.click_object(forward_button)
60
136
61
137
    def _get_forward_button(self):
62
109
        return self.select_single("ChromeButton", objectName="forwardButton")
138
        return self.select_single("ChromeButton", objectName="forwardButton")
63
110
139
64
140
    def is_forward_button_enabled(self):
65
141
        forward_button = self._get_forward_button()
66
142
        return forward_button.enabled
67
143
68
111
    def get_drawer_button(self):
144
    def get_drawer_button(self):
69
112
        return self.select_single("ChromeButton", objectName="drawerButton")
145
        return self.select_single("ChromeButton", objectName="drawerButton")
70
113
146
71
114
147
72
=== modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
73
--- tests/autopilot/webbrowser_app/tests/__init__.py	2014-12-18 15:53:25 +0000
74
+++ tests/autopilot/webbrowser_app/tests/__init__.py	2014-12-18 15:53:25 +0000
75
@@ -87,18 +87,6 @@
76
87
    def main_window(self):
87
    def main_window(self):
77
88
        return self.app.main_window
88
        return self.app.main_window
78
89
89
79
90
    def assert_page_eventually_loading(self):
80
91
        webview = self.main_window.get_current_webview()
81
92
        self.assertThat(webview.loading, Eventually(Equals(True)))
82
93
83
94
    def assert_page_eventually_loaded(self, url):
84
95
        webview = self.main_window.get_current_webview()
85
96
        self.assertThat(webview.url, Eventually(Equals(url)))
86
97
        # loadProgress == 100 ensures that a page has actually loaded
87
98
        self.assertThat(webview.loadProgress,
88
99
                        Eventually(Equals(100), timeout=20))
89
100
        self.assertThat(webview.loading, Eventually(Equals(False)))
90
101
91
102
    def open_tabs_view(self):
90
    def open_tabs_view(self):
92
103
        chrome = self.main_window.chrome
91
        chrome = self.main_window.chrome
93
104
        drawer_button = chrome.get_drawer_button()
92
        drawer_button = chrome.get_drawer_button()
94
@@ -157,4 +145,4 @@
95
157
        self.assert_home_page_eventually_loaded()
145
        self.assert_home_page_eventually_loaded()
96
158
146
97
159
    def assert_home_page_eventually_loaded(self):
147
    def assert_home_page_eventually_loaded(self):
99
160
        self.assert_page_eventually_loaded(self.url)
148
        self.main_window.wait_until_page_loaded(self.url)
100
161
149
101
=== modified file 'tests/autopilot/webbrowser_app/tests/test_addressbar_bookmark.py'
102
--- tests/autopilot/webbrowser_app/tests/test_addressbar_bookmark.py	2014-12-18 15:53:25 +0000
103
+++ tests/autopilot/webbrowser_app/tests/test_addressbar_bookmark.py	2014-12-18 15:53:25 +0000
104
@@ -37,7 +37,7 @@
105
37
        self.open_new_tab()
37
        self.open_new_tab()
106
38
        url = self.base_url + "/test2"
38
        url = self.base_url + "/test2"
107
39
        self.main_window.go_to_url(url)
39
        self.main_window.go_to_url(url)
109
40
        self.assert_page_eventually_loaded(url)
40
        self.main_window.wait_until_page_loaded(url)
110
41
        self.assertThat(chrome.bookmarked, Eventually(Equals(False)))
41
        self.assertThat(chrome.bookmarked, Eventually(Equals(False)))
111
42
42
112
43
        self.open_tabs_view()
43
        self.open_tabs_view()
113
44
44
114
=== modified file 'tests/autopilot/webbrowser_app/tests/test_backforward.py'
115
--- tests/autopilot/webbrowser_app/tests/test_backforward.py	2014-12-18 15:53:25 +0000
116
+++ tests/autopilot/webbrowser_app/tests/test_backforward.py	2014-12-18 15:53:25 +0000
117
@@ -15,7 +15,6 @@
118
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/>.
119
16
16
120
17
from testtools.matchers import Equals
17
from testtools.matchers import Equals
121
18
from autopilot.matchers import Eventually
122
19
18
123
20
from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
19
from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
124
21
20
125
@@ -24,26 +23,30 @@
126
24
23
127
25
    """Tests the back and forward functionality."""
24
    """Tests the back and forward functionality."""
128
26
25
129
26
    def setUp(self):
130
27
        super().setUp()
131
28
        self.chrome = self.main_window.chrome
132
29
133
27
    def test_homepage_no_history(self):
30
    def test_homepage_no_history(self):
156
28
        chrome = self.main_window.chrome
31
        self.assertThat(self.chrome.is_back_button_enabled(), Equals(False))
157
29
        self.assertThat(chrome.get_back_button().enabled, Equals(False))
32
        self.assertThat(self.chrome.is_forward_button_enabled(), Equals(False))
158
30
        self.assertThat(chrome.get_forward_button().enabled, Equals(False))
33
159
31
34
    def test_go_back_after_opening_a_new_page(self):
160
32
    def test_opening_new_page_enables_back_button(self):
35
        """Test that the back button must open the previous page."""
161
33
        back_button = self.main_window.chrome.get_back_button()
36
        self.assertThat(self.chrome.is_back_button_enabled(), Equals(False))
162
34
        self.assertThat(back_button.enabled, Equals(False))
37
        url = self.base_url + "/test2"
163
35
        url = self.base_url + "/test2"
38
        self.main_window.go_to_url(url)
164
36
        self.main_window.go_to_url(url)
39
        self.main_window.wait_until_page_loaded(url)
165
37
        self.assert_page_eventually_loaded(url)
40
        self.main_window.go_back()
166
38
        self.assertThat(back_button.enabled, Eventually(Equals(True)))
41
        self.assert_home_page_eventually_loaded()
167
39
42
168
40
    def test_navigating_back_enables_forward_button(self):
43
    def test_go_forward_after_going_back(self):
169
41
        url = self.base_url + "/test2"
44
        """Test that the forward button must open the previous page."""
170
42
        self.main_window.go_to_url(url)
45
        url = self.base_url + "/test2"
171
43
        self.assert_page_eventually_loaded(url)
46
        self.main_window.go_to_url(url)
172
44
        chrome = self.main_window.chrome
47
        self.main_window.wait_until_page_loaded(url)
173
45
        forward_button = chrome.get_forward_button()
48
        self.assertThat(self.chrome.is_forward_button_enabled(), Equals(False))
174
46
        self.assertThat(forward_button.enabled, Equals(False))
49
        self.main_window.go_back()
175
47
        self.pointing_device.click_object(chrome.get_back_button())
50
        self.assert_home_page_eventually_loaded()
176
48
        self.assert_home_page_eventually_loaded()
51
        self.main_window.go_forward()
177
49
        self.assertThat(forward_button.enabled, Eventually(Equals(True)))
52
        self.main_window.wait_until_page_loaded(url)
178
50
53
179
=== modified file 'tests/autopilot/webbrowser_app/tests/test_content_pick.py'
180
--- tests/autopilot/webbrowser_app/tests/test_content_pick.py	2014-12-18 15:53:25 +0000
181
+++ tests/autopilot/webbrowser_app/tests/test_content_pick.py	2014-12-18 15:53:25 +0000
182
@@ -30,7 +30,7 @@
183
30
    def test_picker_dialog_shows_up(self):
30
    def test_picker_dialog_shows_up(self):
184
31
        url = self.base_url + "/uploadform"
31
        url = self.base_url + "/uploadform"
185
32
        self.main_window.go_to_url(url)
32
        self.main_window.go_to_url(url)
187
33
        self.assert_page_eventually_loaded(url)
33
        self.main_window.wait_until_page_loaded(url)
188
34
        webview = self.main_window.get_current_webview()
34
        webview = self.main_window.get_current_webview()
189
35
        self.pointing_device.click_object(webview)
35
        self.pointing_device.click_object(webview)
190
36
        dialog = self.main_window.get_content_picker_dialog()
36
        dialog = self.main_window.get_content_picker_dialog()
191
37
37
192
=== modified file 'tests/autopilot/webbrowser_app/tests/test_errorsheet.py'
193
--- tests/autopilot/webbrowser_app/tests/test_errorsheet.py	2014-12-18 15:53:25 +0000
194
+++ tests/autopilot/webbrowser_app/tests/test_errorsheet.py	2014-12-18 15:53:25 +0000
195
@@ -43,19 +43,17 @@
196
43
        error = self.main_window.get_error_sheet()
43
        error = self.main_window.get_error_sheet()
197
44
        self.main_window.go_to_url(INVALID_URL)
44
        self.main_window.go_to_url(INVALID_URL)
198
45
        self.assertThat(error.visible, Eventually(Equals(True)))
45
        self.assertThat(error.visible, Eventually(Equals(True)))
201
46
        chrome = self.main_window.chrome
46
        self.main_window.go_back()
200
47
        self.pointing_device.click_object(chrome.get_back_button())
202
48
        self.assertThat(error.visible, Eventually(Equals(False)))
47
        self.assertThat(error.visible, Eventually(Equals(False)))
203
49
48
204
50
    def test_navigating_forward_discards_error_message(self):
49
    def test_navigating_forward_discards_error_message(self):
205
51
        error = self.main_window.get_error_sheet()
50
        error = self.main_window.get_error_sheet()
206
52
        self.main_window.go_to_url(INVALID_URL)
51
        self.main_window.go_to_url(INVALID_URL)
208
53
        self.assert_page_eventually_loaded(INVALID_URL)
52
        self.main_window.wait_until_page_loaded(INVALID_URL)
209
54
        url = self.base_url + "/test2"
53
        url = self.base_url + "/test2"
210
55
        self.main_window.go_to_url(url)
54
        self.main_window.go_to_url(url)
214
56
        self.assert_page_eventually_loaded(url)
55
        self.main_window.wait_until_page_loaded(url)
215
57
        chrome = self.main_window.chrome
56
        self.main_window.go_back()
213
58
        self.pointing_device.click_object(chrome.get_back_button())
216
59
        self.assertThat(error.visible, Eventually(Equals(True)))
57
        self.assertThat(error.visible, Eventually(Equals(True)))
218
60
        self.pointing_device.click_object(chrome.get_forward_button())
58
        self.main_window.go_forward()
219
61
        self.assertThat(error.visible, Eventually(Equals(False)))
59
        self.assertThat(error.visible, Eventually(Equals(False)))
220
62
60
221
=== modified file 'tests/autopilot/webbrowser_app/tests/test_fullscreen.py'
222
--- tests/autopilot/webbrowser_app/tests/test_fullscreen.py	2014-12-18 15:53:25 +0000
223
+++ tests/autopilot/webbrowser_app/tests/test_fullscreen.py	2014-12-18 15:53:25 +0000
224
@@ -41,7 +41,7 @@
225
41
        self.assert_eventually_windowed()
41
        self.assert_eventually_windowed()
226
42
        url = self.base_url + "/fullscreen"
42
        url = self.base_url + "/fullscreen"
227
43
        self.main_window.go_to_url(url)
43
        self.main_window.go_to_url(url)
229
44
        self.assert_page_eventually_loaded(url)
44
        self.main_window.wait_until_page_loaded(url)
230
45
        self.assert_eventually_windowed()
45
        self.assert_eventually_windowed()
231
46
        webview = self.main_window.get_current_webview()
46
        webview = self.main_window.get_current_webview()
232
47
        self.pointing_device.click_object(webview)
47
        self.pointing_device.click_object(webview)
233
48
48
234
=== modified file 'tests/autopilot/webbrowser_app/tests/test_geolocation.py'
235
--- tests/autopilot/webbrowser_app/tests/test_geolocation.py	2014-12-18 15:53:25 +0000
236
+++ tests/autopilot/webbrowser_app/tests/test_geolocation.py	2014-12-18 15:53:25 +0000
237
@@ -23,7 +23,7 @@
238
23
        super(TestGeolocation, self).setUp()
23
        super(TestGeolocation, self).setUp()
239
24
        url = self.base_url + "/geolocation"
24
        url = self.base_url + "/geolocation"
240
25
        self.main_window.go_to_url(url)
25
        self.main_window.go_to_url(url)
242
26
        self.assert_page_eventually_loaded(url)
26
        self.main_window.wait_until_page_loaded(url)
243
27
        self.dialog = self.main_window.get_geolocation_dialog()
27
        self.dialog = self.main_window.get_geolocation_dialog()
244
28
28
245
29
    def tearDown(self):
29
    def tearDown(self):
246
30
30
247
=== modified file 'tests/autopilot/webbrowser_app/tests/test_selection.py'
248
--- tests/autopilot/webbrowser_app/tests/test_selection.py	2014-12-18 15:53:25 +0000
249
+++ tests/autopilot/webbrowser_app/tests/test_selection.py	2014-12-18 15:53:25 +0000
250
@@ -28,7 +28,7 @@
251
28
        super(TestSelection, self).setUp()
28
        super(TestSelection, self).setUp()
252
29
        url = self.base_url + "/selection"
29
        url = self.base_url + "/selection"
253
30
        self.main_window.go_to_url(url)
30
        self.main_window.go_to_url(url)
255
31
        self.assert_page_eventually_loaded(url)
31
        self.main_window.wait_until_page_loaded(url)
256
32
        webview = self.main_window.get_current_webview()
32
        webview = self.main_window.get_current_webview()
257
33
        self.pointing_device.move_to_object(webview)
33
        self.pointing_device.move_to_object(webview)
258
34
        if model() == 'Desktop':
34
        if model() == 'Desktop':
259
35
35
260
=== modified file 'tests/autopilot/webbrowser_app/tests/test_tabs.py'
261
--- tests/autopilot/webbrowser_app/tests/test_tabs.py	2014-12-18 15:53:25 +0000
262
+++ tests/autopilot/webbrowser_app/tests/test_tabs.py	2014-12-18 15:53:25 +0000
263
@@ -129,7 +129,7 @@
264
129
    def test_open_target_blank_in_new_tab(self):
129
    def test_open_target_blank_in_new_tab(self):
265
130
        url = self.base_url + "/blanktargetlink"
130
        url = self.base_url + "/blanktargetlink"
266
131
        self.main_window.go_to_url(url)
131
        self.main_window.go_to_url(url)
268
132
        self.assert_page_eventually_loaded(url)
132
        self.main_window.wait_until_page_loaded(url)
269
133
        webview = self.main_window.get_current_webview()
133
        webview = self.main_window.get_current_webview()
270
134
        self.pointing_device.click_object(webview)
134
        self.pointing_device.click_object(webview)
271
135
        self.check_current_tab(self.base_url + "/test2")
135
        self.check_current_tab(self.base_url + "/test2")
272
@@ -138,7 +138,7 @@
273
138
    def test_open_iframe_target_blank_in_new_tab(self):
138
    def test_open_iframe_target_blank_in_new_tab(self):
274
139
        url = self.base_url + "/fulliframewithblanktargetlink"
139
        url = self.base_url + "/fulliframewithblanktargetlink"
275
140
        self.main_window.go_to_url(url)
140
        self.main_window.go_to_url(url)
277
141
        self.assert_page_eventually_loaded(url)
141
        self.main_window.wait_until_page_loaded(url)
278
142
        webview = self.main_window.get_current_webview()
142
        webview = self.main_window.get_current_webview()
279
143
        self.pointing_device.click_object(webview)
143
        self.pointing_device.click_object(webview)
280
144
        self.check_current_tab(self.base_url + "/test2")
144
        self.check_current_tab(self.base_url + "/test2")
Status:	Merged
Approved by:	Olivier Tilloy on 2014-12-18
Approved revision:	852
Merged at revision:	859
Proposed branch:	lp:~canonical-platform-qa/webbrowser-app/autopilot-back-forward
Merge into:	lp:webbrowser-app
Prerequisite:	lp:~canonical-platform-qa/webbrowser-app/autopilot-address_bar-textfield
Diff against target:	280 lines (+77/-55) 10 files modified tests/autopilot/webbrowser_app/emulators/browser.py (+38/-5) tests/autopilot/webbrowser_app/tests/__init__.py (+1/-13) tests/autopilot/webbrowser_app/tests/test_addressbar_bookmark.py (+1/-1) tests/autopilot/webbrowser_app/tests/test_backforward.py (+26/-23) tests/autopilot/webbrowser_app/tests/test_content_pick.py (+1/-1) tests/autopilot/webbrowser_app/tests/test_errorsheet.py (+5/-7) tests/autopilot/webbrowser_app/tests/test_fullscreen.py (+1/-1) tests/autopilot/webbrowser_app/tests/test_geolocation.py (+1/-1) tests/autopilot/webbrowser_app/tests/test_selection.py (+1/-1) tests/autopilot/webbrowser_app/tests/test_tabs.py (+2/-2)
To merge this branch:	bzr merge lp:~canonical-platform-qa/webbrowser-app/autopilot-back-forward
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Olivier Tilloy		2014-12-13	Approve on 2014-12-18
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-12-18
Allan LeSage (community)			Approve on 2014-12-17
Richard Huddie (community)			Approve on 2014-12-15
Review via email: mp+244665@code.launchpad.net
1	=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
2	--- tests/autopilot/webbrowser_app/emulators/browser.py 2014-12-18 15:53:25 +0000
3	+++ tests/autopilot/webbrowser_app/emulators/browser.py 2014-12-18 15:53:25 +0000
4	@@ -47,15 +47,28 @@
5	47	self.chrome = self._get_chrome()	47	self.chrome = self._get_chrome()
6	48	self.address_bar = self.chrome.address_bar	48	self.address_bar = self.chrome.address_bar
7	49		49
8			50	def _get_chrome(self):
9			51	return self.select_single(Chrome)
10			52
11	50	def go_to_url(self, url):	53	def go_to_url(self, url):
12	51	self.address_bar.go_to_url(url)	54	self.address_bar.go_to_url(url)
13	52		55
14			56	def wait_until_page_loaded(self, url):
15			57	webview = self.get_current_webview()
16			58	webview.url.wait_for(url)
17			59	# loadProgress == 100 ensures that a page has actually loaded
18			60	webview.loadProgress.wait_for(100, timeout=20)
19			61	webview.loading.wait_for(False)
20			62
21			63	def go_back(self):
22			64	self.chrome.go_back()
23			65
24			66	def go_forward(self):
25			67	self.chrome.go_forward()
26			68
27	53	def get_window(self):	69	def get_window(self):
28	54	return self.get_parent()	70	return self.get_parent()
29	55		71
30	56	def _get_chrome(self):
31	57	return self.select_single(Chrome)
32	58
33	59	def get_current_webview(self):	72	def get_current_webview(self):
34	60	return self.select_single("WebViewImpl", current=True)	73	return self.select_single("WebViewImpl", current=True)
35	61		74
36	@@ -102,12 +115,32 @@
37	102	def _get_address_bar(self):	115	def _get_address_bar(self):
38	103	return self.select_single(AddressBar)	116	return self.select_single(AddressBar)
39	104		117
41	105	def get_back_button(self):	118	@autopilot.logging.log_action(logger.info)
42			119	def go_back(self):
43			120	back_button = self._get_back_button()
44			121	back_button.enabled.wait_for(True)
45			122	self.pointing_device.click_object(back_button)
46			123
47			124	def _get_back_button(self):
48	106	return self.select_single("ChromeButton", objectName="backButton")	125	return self.select_single("ChromeButton", objectName="backButton")
49	107		126
51	108	def get_forward_button(self):	127	def is_back_button_enabled(self):
52			128	back_button = self._get_back_button()
53			129	return back_button.enabled
54			130
55			131	@autopilot.logging.log_action(logger.info)
56			132	def go_forward(self):
57			133	forward_button = self._get_forward_button()
58			134	forward_button.enabled.wait_for(True)
59			135	self.pointing_device.click_object(forward_button)
60			136
61			137	def _get_forward_button(self):
62	109	return self.select_single("ChromeButton", objectName="forwardButton")	138	return self.select_single("ChromeButton", objectName="forwardButton")
63	110		139
64			140	def is_forward_button_enabled(self):
65			141	forward_button = self._get_forward_button()
66			142	return forward_button.enabled
67			143
68	111	def get_drawer_button(self):	144	def get_drawer_button(self):
69	112	return self.select_single("ChromeButton", objectName="drawerButton")	145	return self.select_single("ChromeButton", objectName="drawerButton")
70	113		146
71	114		147
72	=== modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
73	--- tests/autopilot/webbrowser_app/tests/__init__.py 2014-12-18 15:53:25 +0000
74	+++ tests/autopilot/webbrowser_app/tests/__init__.py 2014-12-18 15:53:25 +0000
75	@@ -87,18 +87,6 @@
76	87	def main_window(self):	87	def main_window(self):
77	88	return self.app.main_window	88	return self.app.main_window
78	89		89
79	90	def assert_page_eventually_loading(self):
80	91	webview = self.main_window.get_current_webview()
81	92	self.assertThat(webview.loading, Eventually(Equals(True)))
82	93
83	94	def assert_page_eventually_loaded(self, url):
84	95	webview = self.main_window.get_current_webview()
85	96	self.assertThat(webview.url, Eventually(Equals(url)))
86	97	# loadProgress == 100 ensures that a page has actually loaded
87	98	self.assertThat(webview.loadProgress,
88	99	Eventually(Equals(100), timeout=20))
89	100	self.assertThat(webview.loading, Eventually(Equals(False)))
90	101
91	102	def open_tabs_view(self):	90	def open_tabs_view(self):
92	103	chrome = self.main_window.chrome	91	chrome = self.main_window.chrome
93	104	drawer_button = chrome.get_drawer_button()	92	drawer_button = chrome.get_drawer_button()
94	@@ -157,4 +145,4 @@
95	157	self.assert_home_page_eventually_loaded()	145	self.assert_home_page_eventually_loaded()
96	158		146
97	159	def assert_home_page_eventually_loaded(self):	147	def assert_home_page_eventually_loaded(self):
99	160	self.assert_page_eventually_loaded(self.url)	148	self.main_window.wait_until_page_loaded(self.url)
100	161		149
101	=== modified file 'tests/autopilot/webbrowser_app/tests/test_addressbar_bookmark.py'
102	--- tests/autopilot/webbrowser_app/tests/test_addressbar_bookmark.py 2014-12-18 15:53:25 +0000
103	+++ tests/autopilot/webbrowser_app/tests/test_addressbar_bookmark.py 2014-12-18 15:53:25 +0000
104	@@ -37,7 +37,7 @@
105	37	self.open_new_tab()	37	self.open_new_tab()
106	38	url = self.base_url + "/test2"	38	url = self.base_url + "/test2"
107	39	self.main_window.go_to_url(url)	39	self.main_window.go_to_url(url)
109	40	self.assert_page_eventually_loaded(url)	40	self.main_window.wait_until_page_loaded(url)
110	41	self.assertThat(chrome.bookmarked, Eventually(Equals(False)))	41	self.assertThat(chrome.bookmarked, Eventually(Equals(False)))
111	42		42
112	43	self.open_tabs_view()	43	self.open_tabs_view()
113	44		44
114	=== modified file 'tests/autopilot/webbrowser_app/tests/test_backforward.py'
115	--- tests/autopilot/webbrowser_app/tests/test_backforward.py 2014-12-18 15:53:25 +0000
116	+++ tests/autopilot/webbrowser_app/tests/test_backforward.py 2014-12-18 15:53:25 +0000
117	@@ -15,7 +15,6 @@
118	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/>.
119	16		16
120	17	from testtools.matchers import Equals	17	from testtools.matchers import Equals
121	18	from autopilot.matchers import Eventually
122	19		18
123	20	from webbrowser_app.tests import StartOpenRemotePageTestCaseBase	19	from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
124	21		20
125	@@ -24,26 +23,30 @@
126	24		23
127	25	"""Tests the back and forward functionality."""	24	"""Tests the back and forward functionality."""
128	26		25
129			26	def setUp(self):
130			27	super().setUp()
131			28	self.chrome = self.main_window.chrome
132			29
133	27	def test_homepage_no_history(self):	30	def test_homepage_no_history(self):
156	28	chrome = self.main_window.chrome	31	self.assertThat(self.chrome.is_back_button_enabled(), Equals(False))
157	29	self.assertThat(chrome.get_back_button().enabled, Equals(False))	32	self.assertThat(self.chrome.is_forward_button_enabled(), Equals(False))
158	30	self.assertThat(chrome.get_forward_button().enabled, Equals(False))	33
159	31		34	def test_go_back_after_opening_a_new_page(self):
160	32	def test_opening_new_page_enables_back_button(self):	35	"""Test that the back button must open the previous page."""
161	33	back_button = self.main_window.chrome.get_back_button()	36	self.assertThat(self.chrome.is_back_button_enabled(), Equals(False))
162	34	self.assertThat(back_button.enabled, Equals(False))	37	url = self.base_url + "/test2"
163	35	url = self.base_url + "/test2"	38	self.main_window.go_to_url(url)
164	36	self.main_window.go_to_url(url)	39	self.main_window.wait_until_page_loaded(url)
165	37	self.assert_page_eventually_loaded(url)	40	self.main_window.go_back()
166	38	self.assertThat(back_button.enabled, Eventually(Equals(True)))	41	self.assert_home_page_eventually_loaded()
167	39		42
168	40	def test_navigating_back_enables_forward_button(self):	43	def test_go_forward_after_going_back(self):
169	41	url = self.base_url + "/test2"	44	"""Test that the forward button must open the previous page."""
170	42	self.main_window.go_to_url(url)	45	url = self.base_url + "/test2"
171	43	self.assert_page_eventually_loaded(url)	46	self.main_window.go_to_url(url)
172	44	chrome = self.main_window.chrome	47	self.main_window.wait_until_page_loaded(url)
173	45	forward_button = chrome.get_forward_button()	48	self.assertThat(self.chrome.is_forward_button_enabled(), Equals(False))
174	46	self.assertThat(forward_button.enabled, Equals(False))	49	self.main_window.go_back()
175	47	self.pointing_device.click_object(chrome.get_back_button())	50	self.assert_home_page_eventually_loaded()
176	48	self.assert_home_page_eventually_loaded()	51	self.main_window.go_forward()
177	49	self.assertThat(forward_button.enabled, Eventually(Equals(True)))	52	self.main_window.wait_until_page_loaded(url)
178	50		53
179	=== modified file 'tests/autopilot/webbrowser_app/tests/test_content_pick.py'
180	--- tests/autopilot/webbrowser_app/tests/test_content_pick.py 2014-12-18 15:53:25 +0000
181	+++ tests/autopilot/webbrowser_app/tests/test_content_pick.py 2014-12-18 15:53:25 +0000
182	@@ -30,7 +30,7 @@
183	30	def test_picker_dialog_shows_up(self):	30	def test_picker_dialog_shows_up(self):
184	31	url = self.base_url + "/uploadform"	31	url = self.base_url + "/uploadform"
185	32	self.main_window.go_to_url(url)	32	self.main_window.go_to_url(url)
187	33	self.assert_page_eventually_loaded(url)	33	self.main_window.wait_until_page_loaded(url)
188	34	webview = self.main_window.get_current_webview()	34	webview = self.main_window.get_current_webview()
189	35	self.pointing_device.click_object(webview)	35	self.pointing_device.click_object(webview)
190	36	dialog = self.main_window.get_content_picker_dialog()	36	dialog = self.main_window.get_content_picker_dialog()
191	37		37
192	=== modified file 'tests/autopilot/webbrowser_app/tests/test_errorsheet.py'
193	--- tests/autopilot/webbrowser_app/tests/test_errorsheet.py 2014-12-18 15:53:25 +0000
194	+++ tests/autopilot/webbrowser_app/tests/test_errorsheet.py 2014-12-18 15:53:25 +0000
195	@@ -43,19 +43,17 @@
196	43	error = self.main_window.get_error_sheet()	43	error = self.main_window.get_error_sheet()
197	44	self.main_window.go_to_url(INVALID_URL)	44	self.main_window.go_to_url(INVALID_URL)
198	45	self.assertThat(error.visible, Eventually(Equals(True)))	45	self.assertThat(error.visible, Eventually(Equals(True)))
201	46	chrome = self.main_window.chrome	46	self.main_window.go_back()
200	47	self.pointing_device.click_object(chrome.get_back_button())
202	48	self.assertThat(error.visible, Eventually(Equals(False)))	47	self.assertThat(error.visible, Eventually(Equals(False)))
203	49		48
204	50	def test_navigating_forward_discards_error_message(self):	49	def test_navigating_forward_discards_error_message(self):
205	51	error = self.main_window.get_error_sheet()	50	error = self.main_window.get_error_sheet()
206	52	self.main_window.go_to_url(INVALID_URL)	51	self.main_window.go_to_url(INVALID_URL)
208	53	self.assert_page_eventually_loaded(INVALID_URL)	52	self.main_window.wait_until_page_loaded(INVALID_URL)
209	54	url = self.base_url + "/test2"	53	url = self.base_url + "/test2"
210	55	self.main_window.go_to_url(url)	54	self.main_window.go_to_url(url)
214	56	self.assert_page_eventually_loaded(url)	55	self.main_window.wait_until_page_loaded(url)
215	57	chrome = self.main_window.chrome	56	self.main_window.go_back()
213	58	self.pointing_device.click_object(chrome.get_back_button())
216	59	self.assertThat(error.visible, Eventually(Equals(True)))	57	self.assertThat(error.visible, Eventually(Equals(True)))
218	60	self.pointing_device.click_object(chrome.get_forward_button())	58	self.main_window.go_forward()
219	61	self.assertThat(error.visible, Eventually(Equals(False)))	59	self.assertThat(error.visible, Eventually(Equals(False)))
220	62		60
221	=== modified file 'tests/autopilot/webbrowser_app/tests/test_fullscreen.py'
222	--- tests/autopilot/webbrowser_app/tests/test_fullscreen.py 2014-12-18 15:53:25 +0000
223	+++ tests/autopilot/webbrowser_app/tests/test_fullscreen.py 2014-12-18 15:53:25 +0000
224	@@ -41,7 +41,7 @@
225	41	self.assert_eventually_windowed()	41	self.assert_eventually_windowed()
226	42	url = self.base_url + "/fullscreen"	42	url = self.base_url + "/fullscreen"
227	43	self.main_window.go_to_url(url)	43	self.main_window.go_to_url(url)
229	44	self.assert_page_eventually_loaded(url)	44	self.main_window.wait_until_page_loaded(url)
230	45	self.assert_eventually_windowed()	45	self.assert_eventually_windowed()
231	46	webview = self.main_window.get_current_webview()	46	webview = self.main_window.get_current_webview()
232	47	self.pointing_device.click_object(webview)	47	self.pointing_device.click_object(webview)
233	48		48
234	=== modified file 'tests/autopilot/webbrowser_app/tests/test_geolocation.py'
235	--- tests/autopilot/webbrowser_app/tests/test_geolocation.py 2014-12-18 15:53:25 +0000
236	+++ tests/autopilot/webbrowser_app/tests/test_geolocation.py 2014-12-18 15:53:25 +0000
237	@@ -23,7 +23,7 @@
238	23	super(TestGeolocation, self).setUp()	23	super(TestGeolocation, self).setUp()
239	24	url = self.base_url + "/geolocation"	24	url = self.base_url + "/geolocation"
240	25	self.main_window.go_to_url(url)	25	self.main_window.go_to_url(url)
242	26	self.assert_page_eventually_loaded(url)	26	self.main_window.wait_until_page_loaded(url)
243	27	self.dialog = self.main_window.get_geolocation_dialog()	27	self.dialog = self.main_window.get_geolocation_dialog()
244	28		28
245	29	def tearDown(self):	29	def tearDown(self):
246	30		30
247	=== modified file 'tests/autopilot/webbrowser_app/tests/test_selection.py'
248	--- tests/autopilot/webbrowser_app/tests/test_selection.py 2014-12-18 15:53:25 +0000
249	+++ tests/autopilot/webbrowser_app/tests/test_selection.py 2014-12-18 15:53:25 +0000
250	@@ -28,7 +28,7 @@
251	28	super(TestSelection, self).setUp()	28	super(TestSelection, self).setUp()
252	29	url = self.base_url + "/selection"	29	url = self.base_url + "/selection"
253	30	self.main_window.go_to_url(url)	30	self.main_window.go_to_url(url)
255	31	self.assert_page_eventually_loaded(url)	31	self.main_window.wait_until_page_loaded(url)
256	32	webview = self.main_window.get_current_webview()	32	webview = self.main_window.get_current_webview()
257	33	self.pointing_device.move_to_object(webview)	33	self.pointing_device.move_to_object(webview)
258	34	if model() == 'Desktop':	34	if model() == 'Desktop':
259	35		35
260	=== modified file 'tests/autopilot/webbrowser_app/tests/test_tabs.py'
261	--- tests/autopilot/webbrowser_app/tests/test_tabs.py 2014-12-18 15:53:25 +0000
262	+++ tests/autopilot/webbrowser_app/tests/test_tabs.py 2014-12-18 15:53:25 +0000
263	@@ -129,7 +129,7 @@
264	129	def test_open_target_blank_in_new_tab(self):	129	def test_open_target_blank_in_new_tab(self):
265	130	url = self.base_url + "/blanktargetlink"	130	url = self.base_url + "/blanktargetlink"
266	131	self.main_window.go_to_url(url)	131	self.main_window.go_to_url(url)
268	132	self.assert_page_eventually_loaded(url)	132	self.main_window.wait_until_page_loaded(url)
269	133	webview = self.main_window.get_current_webview()	133	webview = self.main_window.get_current_webview()
270	134	self.pointing_device.click_object(webview)	134	self.pointing_device.click_object(webview)
271	135	self.check_current_tab(self.base_url + "/test2")	135	self.check_current_tab(self.base_url + "/test2")
272	@@ -138,7 +138,7 @@
273	138	def test_open_iframe_target_blank_in_new_tab(self):	138	def test_open_iframe_target_blank_in_new_tab(self):
274	139	url = self.base_url + "/fulliframewithblanktargetlink"	139	url = self.base_url + "/fulliframewithblanktargetlink"
275	140	self.main_window.go_to_url(url)	140	self.main_window.go_to_url(url)
277	141	self.assert_page_eventually_loaded(url)	141	self.main_window.wait_until_page_loaded(url)
278	142	webview = self.main_window.get_current_webview()	142	webview = self.main_window.get_current_webview()
279	143	self.pointing_device.click_object(webview)	143	self.pointing_device.click_object(webview)
280	144	self.check_current_tab(self.base_url + "/test2")	144	self.check_current_tab(self.base_url + "/test2")