1
=== modified file 'src/app/webbrowser/Browser.qml'
2
--- src/app/webbrowser/Browser.qml	2015-08-27 14:02:05 +0000
3
+++ src/app/webbrowser/Browser.qml	2015-09-02 08:46:05 +0000
4
@@ -1463,6 +1463,7 @@
5
1463
            if (tab) {
1463
            if (tab) {
6
1464
                tab.load()
1464
                tab.load()
7
1465
            }
1465
            }
8
1466
            internal.resetFocus()
9
1466
        }
1467
        }
10
1467
        onCountChanged: {
1468
        onCountChanged: {
11
1468
            if (tabsModel.count == 0) {
1469
            if (tabsModel.count == 0) {
12
1469
1470
13
=== modified file 'tests/autopilot/webbrowser_app/tests/test_tabs.py'
14
--- tests/autopilot/webbrowser_app/tests/test_tabs.py	2015-08-12 12:31:56 +0000
15
+++ tests/autopilot/webbrowser_app/tests/test_tabs.py	2015-09-02 08:46:05 +0000
16
@@ -18,6 +18,7 @@
17
18
from autopilot.matchers import Eventually
18
from autopilot.matchers import Eventually
18
19
from autopilot.platform import model
19
from autopilot.platform import model
19
20
20
20
21
import testtools
21
21
import unittest
22
import unittest
22
22
23
23
23
from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
24
from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
24
@@ -131,6 +132,61 @@
25
131
        self.check_current_tab(url)
132
        self.check_current_tab(url)
26
132
133
27
133
134
28
135
@testtools.skipIf(model() != "Desktop", "on desktop only")
29
136
class TestTabsFocus(StartOpenRemotePageTestCaseBase, TestTabsMixin):
30
137
31
138
    def test_focus_on_switch(self):
32
139
        """Test that switching between tabs correctly resets focus to the
33
140
           webview if a page is loaded, and to the address bar if we are in
34
141
           the new page view"""
35
142
        address_bar = self.main_window.address_bar
36
143
37
144
        self.main_window.press_key('Ctrl+T')
38
145
        self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
39
146
40
147
        self.main_window.press_key('Ctrl+Tab')
41
148
        self.assertThat(address_bar.activeFocus, Eventually(Equals(False)))
42
149
        webview = self.main_window.get_current_webview()
43
150
        self.assertThat(webview.activeFocus, Eventually(Equals(True)))
44
151
45
152
        self.main_window.press_key('Ctrl+Tab')
46
153
        self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
47
154
        webview = self.main_window.get_current_webview()
48
155
        self.assertThat(webview.activeFocus, Eventually(Equals(False)))
49
156
50
157
    def test_focus_on_close(self):
51
158
        """Test that closing tabs correctly resets focus,
52
159
           allowing keyboard shortcuts to work without interruption"""
53
160
        address_bar = self.main_window.address_bar
54
161
55
162
        self.main_window.press_key('Ctrl+T')
56
163
        self.main_window.press_key('Ctrl+T')
57
164
        url = self.base_url + "/test1"
58
165
        self.main_window.go_to_url(url)
59
166
        self.main_window.wait_until_page_loaded(url)
60
167
61
168
        self.main_window.press_key('Ctrl+T')
62
169
        url = self.base_url + "/test2"
63
170
        self.main_window.go_to_url(url)
64
171
        self.main_window.wait_until_page_loaded(url)
65
172
        self.main_window.press_key('Ctrl+T')
66
173
        self.main_window.press_key('Ctrl+T')
67
174
68
175
        self.main_window.press_key('Ctrl+W')
69
176
        self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
70
177
71
178
        self.main_window.press_key('Ctrl+W')
72
179
        webview = self.main_window.get_current_webview()
73
180
        self.assertThat(webview.activeFocus, Eventually(Equals(True)))
74
181
75
182
        self.main_window.press_key('Ctrl+W')
76
183
        webview = self.main_window.get_current_webview()
77
184
        self.assertThat(webview.activeFocus, Eventually(Equals(True)))
78
185
79
186
        self.main_window.press_key('Ctrl+W')
80
187
        self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
81
188
82
189
83
134
class TestTabsManagement(StartOpenRemotePageTestCaseBase, TestTabsMixin):
190
class TestTabsManagement(StartOpenRemotePageTestCaseBase, TestTabsMixin):
84
135
191
85
136
    def test_open_target_blank_in_new_tab(self):
192
    def test_open_target_blank_in_new_tab(self):
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-09-02
Olivier Tilloy		2015-08-25	Approve on 2015-09-02
Riccardo Padovani (community)			Approve on 2015-08-31
Review via email: mp+269083@code.launchpad.net