Merge lp:~vthompson/music-app/fix-swipe-delete-test into lp:music-app/trusty

[Victor Thompson]

Fix swipe to delete test

Fix swipe to delete test, which is failing due to changes in the most recent 173 image in the ubuntu-ui-toolkit version 1.1.1179+14.10.20140804-0ubuntu1.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:550
http://91.189.93.70:8080/job/music-app-ci/977/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1303
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1303/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/201

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/977/rebuild

review: Needs Fixing (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/music-app-autolanding/503/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1314
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1314/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-autolanding/44

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

The tests failing in jenkins exhibit the same behaviour on the desktop and are easy to reproduce for me.

I realize the issues are not related ofc to this bug, but :-)

review: Needs Fixing

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/music-app-autolanding/504/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1320
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1320/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-autolanding/45

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Going to have a look at see if I can't propose something to fix these unrelated errors.

[lp:~vthompson/music-app/fix-swipe-delete-test]

551. By Victor Thompson on 2014-08-06

Make wideAspect dependent upon loadedUI bool

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'common/SwipeDelete.qml'
--- common/SwipeDelete.qml	2013-11-19 04:57:30 +0000
+++ common/SwipeDelete.qml	2014-08-06 23:22:40 +0000
@@ -42,6 +42,7 @@
         width: parent.width / 3
         Label {
             id: swipeBackgroundLeftText
+            objectName: "leftDelete"
             anchors.margins: units.gu(2)
             anchors.right: parent.right
             anchors.verticalCenter: parent.verticalCenter
@@ -77,6 +78,7 @@
         width: parent.width / 3
         Label {
             id: swipeBackgroundRightText
+            objectName: "rightDelete"
             anchors.left: parent.left
             anchors.margins: units.gu(2)
             anchors.verticalCenter: parent.verticalCenter

=== modified file 'music-app.qml'
--- music-app.qml	2014-08-06 02:13:53 +0000
+++ music-app.qml	2014-08-06 23:22:40 +0000
@@ -387,7 +387,7 @@
     signal collapseSwipeDelete(int index);
     signal onToolbarShownChanged(bool shown, var currentPage, var currentTab)
 
-    property bool wideAspect: width >= units.gu(70)
+    property bool wideAspect: width >= units.gu(70) && loadedUI
     property bool loadedUI: false  // property to detect if the UI has finished
 
     // FUNCTIONS

=== modified file 'tests/autopilot/music_app/emulators.py'
--- tests/autopilot/music_app/emulators.py	2014-07-24 13:57:08 +0000
+++ tests/autopilot/music_app/emulators.py	2014-08-06 23:22:40 +0000
@@ -274,4 +274,4 @@
     def get_swipedelete_icon(self):
         swipedelete = self.wait_select_single(
             "SwipeDelete", direction="swipingRight")
-        return swipedelete.select_many("Icon",  name="delete")[1]
+        return swipedelete.select_single("Label",  objectName="leftDelete")