Merge lp:~schwann/ubuntu-ui-toolkit/uitk-autopilot-tab-switch-issue into lp:ubuntu-ui-toolkit

Proposed by Günter Schwann on 2013-09-03
Status: Merged
Approved by: Zoltan Balogh on 2013-09-03
Approved revision: 737
Merged at revision: 739
Proposed branch: lp:~schwann/ubuntu-ui-toolkit/uitk-autopilot-tab-switch-issue
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 53 lines (+24/-0)
2 files modified
tests/autopilot/ubuntuuitoolkit/emulators.py (+3/-0)
tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py (+21/-0)
To merge this branch: bzr merge lp:~schwann/ubuntu-ui-toolkit/uitk-autopilot-tab-switch-issue
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2013-09-03
Ubuntu SDK team 2013-09-03 Pending
Review via email: mp+183625@code.launchpad.net

Commit message

Fixes tab switching with open toolbar fixes https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1220064

Description of the change

When the toolbar is open, the tabbar does not receive the needed click

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
2--- tests/autopilot/ubuntuuitoolkit/emulators.py 2013-08-21 13:51:07 +0000
3+++ tests/autopilot/ubuntuuitoolkit/emulators.py 2013-09-03 10:40:35 +0000
4@@ -241,6 +241,9 @@
5 """Open the next tab."""
6 # Click the tab bar to switch to selection mode.
7 self.pointing_device.click_object(self)
8+ if not self.selectionMode:
9+ # in case someone stole the click, like the open toolbar
10+ self.pointing_device.click_object(self)
11 self.pointing_device.click_object(self._get_next_tab_button())
12
13 def _get_next_tab_button(self):
14
15=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
16--- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py 2013-08-09 00:48:33 +0000
17+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py 2013-09-03 10:40:35 +0000
18@@ -173,14 +173,35 @@
19 Tab {
20 objectName: "tab1"
21 title: "Tab1"
22+ Page {
23+ tools: ToolbarItems {
24+ ToolbarButton {
25+ text: "Test1"
26+ }
27+ }
28+ }
29 }
30 Tab {
31 objectName: "tab2"
32 title: "Tab2"
33+ Page {
34+ tools: ToolbarItems {
35+ ToolbarButton {
36+ text: "Test2"
37+ }
38+ }
39+ }
40 }
41 Tab {
42 objectName: "tab3"
43 title: "Tab3"
44+ Page {
45+ tools: ToolbarItems {
46+ ToolbarButton {
47+ text: "Test3"
48+ }
49+ }
50+ }
51 }
52 }
53 }

Subscribers

People subscribed via source and target branches

to status/vote changes: