Merge lp:~elopio/ubuntu-ui-toolkit/fix1209405-header_object_name into lp:ubuntu-ui-toolkit

[Leo Arias]

Added the objectName property to the top header.

[Nicholas Skaggs (nskaggs)]

Just a comment; I encountered this issue while using the emulator with the clock core app. The trouble with any generic select_single is the potential for dupes. I understand objectNames are not always desired, but imho, selecting exactly what you want is worth the price and is much more sustainable for us.

[Nicholas Skaggs (nskaggs)]

review: Approve (code)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:682
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/482/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1998
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/339
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/339
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/339/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2003
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2003/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1707

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/206/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2038
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-autolanding/132
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-autolanding/132/console
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-autolanding/132/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2043
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2043/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1737

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:685
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/487/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2040/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/344/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/344
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/344/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2045/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2013-07-18 12:27:33 +0000
+++ modules/Ubuntu/Components/MainView.qml	2013-08-08 19:44:22 +0000
@@ -267,6 +267,10 @@
           in \l Page to determine the area for the \l Page to fill.
          */
         Header {
+            // FIXME We need to set an object name to this header in order to differentiate it from the ListItem.Header on Autopilot tests.
+            // This is a temporary workaround while we find a better solution for https://bugs.launchpad.net/autopilot/+bug/1210265
+            // --elopio - 2013-08-08
+            objectName: "MainView_Header"
             id: headerItem
             property real bottomY: headerItem.y + headerItem.height
         }

=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2013-08-07 17:33:32 +0000
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2013-08-08 19:44:22 +0000
@@ -47,7 +47,7 @@
 
     def get_header(self):
         """Return the Header emulator of the MainView."""
-        return self.select_single('Header')
+        return self.select_single('Header', objectName='MainView_Header')
 
     def get_toolbar(self):
         """Return the Toolbar emulator of the MainView."""