Merge lp:~aacid/unity8/cardCreatorTest7Update into lp:unity8

[Albert Astals Cid]

Update expected result for test 7

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

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

* 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?
N/A

* If you changed the UI, has there been a design review?
N/A

[Andrea Cimitan (cimi)]

Conflicts with
https://code.launchpad.net/~cimi/unity8/card_touchdown_2/+merge/229030

which fixes the code too

review: Disapprove

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1115
http://jenkins.qa.ubuntu.com/job/unity8-ci/3792/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3098
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/794
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/886
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/886
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/886/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/886
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4341
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4341/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11080

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

review: Approve (continuous-integration)

Unmerged revisions

1115. By Albert Astals Cid on 2014-08-06

Update expected result for test 7

=== modified file 'tests/plugins/Dash/cardcreator/7.res'
--- tests/plugins/Dash/cardcreator/7.res	2014-07-24 10:03:58 +0000
+++ tests/plugins/Dash/cardcreator/7.res	2014-08-06 10:56:24 +0000
@@ -116,7 +116,7 @@
                             objectName: "attributesRow"; 
                             anchors { left: parent.left; right: parent.right } 
                             color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey"); 
-                            model: cardData["attributes"] 
+                            model: cardData && cardData["attributes"] || undefined; 
                           }
  
                     ]