Merge lp:~nskaggs/ubuntu-filemanager-app/fix-ap-item-renames into lp:ubuntu-filemanager-app

[Nicholas Skaggs]

Fix autopilot tests in trunk -- UI element types changed slightly.

Fix autopilot tests in trunk -- UI element types changed slightly.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:514
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/107/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/381/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/107/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-autolanding/18/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1439/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-autolanding/19/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1440/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/filemanager/__init__.py'
--- tests/autopilot/filemanager/__init__.py	2015-03-12 21:39:41 +0000
+++ tests/autopilot/filemanager/__init__.py	2016-01-14 16:46:35 +0000
@@ -108,7 +108,7 @@
         """Bring the places page to the screen"""
         try:
             action_item = self.wait_select_single(
-                'ShapeItem', objectName='bottomEdgeTip')
+                'UCUbuntuShape', objectName='bottomEdgeTip')
             action_item.visible.wait_for(True)
             action_item.isAnimating.wait_for(False)
             start_x = (action_item.globalRect.x +
@@ -396,7 +396,7 @@
 
     def _split_header_text(self):
         header_text = self.select_single(
-            'Header', objectName='listViewSmallHeader').text
+            'ListItemHeader', objectName='listViewSmallHeader').text
         match = re.match(self.SPLIT_HEADER_REGEX, header_text)
         if match:
             path = match.group(1)
@@ -432,7 +432,7 @@
 
     def _split_header_text(self):
         header_text = self.select_single(
-            'Header', objectName='iconViewHeader').text
+            'ListItemHeader', objectName='iconViewHeader').text
         match = re.match(self.SPLIT_HEADER_REGEX, header_text)
         if match:
             path = match.group(1)