Merge lp:~tpeeters/ubuntu-ui-toolkit/fix-header-ap-landing into lp:~bzoltan/ubuntu-ui-toolkit/OTA9_landing_2015-12-05

[Tim Peeters]

Fix several header CPO related issues.

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_actionbar.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_actionbar.py	2015-10-05 10:52:11 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_actionbar.py	2015-12-07 14:20:31 +0000
@@ -60,7 +60,7 @@
         """
 
         try:
-            object_name = action_object_name + "_action_button"
+            object_name = action_object_name + "_button"
             button = self.select_single(objectName=object_name)
             self.pointing_device.click_object(button)
         except dbus.StateNotFoundError:
@@ -68,6 +68,6 @@
             try:
                 popover = self._open_overflow()
                 popover.click_action_button(action_object_name)
-            except dbus.StateNotFoundError:
+            except _common.ToolkitException:
                 raise _common.ToolkitException(
                     'Button not found in ActionBar or overflow')

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2015-10-01 14:51:53 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2015-12-07 14:20:31 +0000
@@ -110,20 +110,6 @@
         self.header.click_action_button('action0')
         self.assertEqual(self.label.text, 'Button 0 clicked.')
 
-    def test_overflow_button(self):
-        # there are 5 actions plus a custom back action
-        overflow_button = self.header.select_single(
-            objectName='actions_overflow_button')
-        self.assertEqual(overflow_button.visible, True)
-
-        hide_actions_button = self.main_view.select_single(
-            'Button',
-            objectName='hide_actions_button')
-        self.pointing_device.click_object(hide_actions_button)
-
-        # only three actions are visible
-        self.assertEqual(overflow_button.visible, False)
-
 
 class SectionsTestCase(tests.QMLFileAppTestCase):