Merge lp:~dandrader/unity8/outOfSourceTreeCardTests into lp:unity8

[Daniel d'Andrada]

Make tst_Card work from outside the source tree (LP:1359201)

Currently it only works if you buid&run them from inside a subdir
of the unity8 source tree (ie, ./build).

If you build&run from a sibling directory it would not find the image
files and would therefore fail.

* Are there any related MPs required for this MP to build/function as expected? Please list.
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* Did you make sure that your branch does not contain spurious tags?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable

* If you changed the UI, has there been a design review?
Not applicable

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1234
http://jenkins.qa.ubuntu.com/job/unity8-ci/4238/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4466
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1239
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1332
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1332
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5718
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5718/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12678

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4238/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
y
* Did CI run pass? If not, please explain why.

Y

Tested, works fine

review: Approve

[Michał Sawicz (saviq)]

Please run http://people.canonical.com/~msawicz/unity8/strip-u8-tags.py on this branch and any local checkouts you might have.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1234
http://jenkins.qa.ubuntu.com/job/unity8-ci/4262/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4671
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1263
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1356
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1356
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4455
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5923
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5923/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13006

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4262/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'tests/qmltests/Dash/tst_Card.qml'
--- tests/qmltests/Dash/tst_Card.qml	2014-08-22 14:43:02 +0000
+++ tests/qmltests/Dash/tst_Card.qml	2014-09-04 15:47:06 +0000
@@ -29,9 +29,9 @@
 
     property string cardData: '
     {
-      "art": "../../../tests/qmltests/Dash/artwork/music-player-design.png",
-      "mascot": "../../../tests/qmltests/Dash/artwork/avatar.png",
-      "emblem": "../../../tests/qmltests/Dash/artwork/emblem.png",
+      "art": "'+Qt.resolvedUrl("artwork/music-player-design.png").toString()+'",
+      "mascot": "'+Qt.resolvedUrl("artwork/avatar.png").toString()+'",
+      "emblem": "'+Qt.resolvedUrl("artwork/emblem.png").toString()+'",
       "title": "foo",
       "subtitle": "bar",
       "summary": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",