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

[Günter Schwann]

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

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:737
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/603/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2917
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/460
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/460
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/460/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2923
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2923/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2481

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/603/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2013-08-21 13:51:07 +0000
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2013-09-03 10:40:35 +0000
@@ -241,6 +241,9 @@
         """Open the next tab."""
         # Click the tab bar to switch to selection mode.
         self.pointing_device.click_object(self)
+        if not self.selectionMode:
+            # in case someone stole the click, like the open toolbar
+            self.pointing_device.click_object(self)
         self.pointing_device.click_object(self._get_next_tab_button())
 
     def _get_next_tab_button(self):
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2013-08-09 00:48:33 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2013-09-03 10:40:35 +0000
@@ -173,14 +173,35 @@
         Tab {
             objectName: "tab1"
             title: "Tab1"
+            Page {
+                tools: ToolbarItems {
+                    ToolbarButton {
+                        text: "Test1"
+                    }
+                }
+            }
         }
         Tab {
             objectName: "tab2"
             title: "Tab2"
+            Page {
+                tools: ToolbarItems {
+                    ToolbarButton {
+                        text: "Test2"
+                    }
+                }
+            }
         }
         Tab {
             objectName: "tab3"
             title: "Tab3"
+            Page {
+                tools: ToolbarItems {
+                    ToolbarButton {
+                        text: "Test3"
+                    }
+                }
+            }
         }
     }
 }