Unity 8

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

Proposed by Albert Astals Cid on 2016-01-11

Status:	Merged
Approved by:	Michał Sawicz on 2016-01-13
Approved revision:	2114
Merged at revision:	2132
Proposed branch:	lp:~aacid/unity8/fix_card_creator_test
Merge into:	lp:unity8
Diff against target:	11 lines (+1/-0) 1 file modified tests/plugins/Dash/cardcreator/9.res (+1/-0)
To merge this branch:	bzr merge lp:~aacid/unity8/fix_card_creator_test
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michał Sawicz		2016-01-11	Approve on 2016-01-13
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-01-11
Review via email: mp+282187@code.launchpad.net

Make the card creator test pass again

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

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

PS Jenkins bot (ps-jenkins) wrote on 2016-01-11:

review: Needs Fixing (continuous-integration)

Michał Sawicz (saviq) on 2016-01-13:

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'tests/plugins/Dash/cardcreator/9.res'
2	--- tests/plugins/Dash/cardcreator/9.res 2015-12-03 16:01:50 +0000
3	+++ tests/plugins/Dash/cardcreator/9.res 2016-01-11 15:42:21 +0000
4	@@ -3,6 +3,7 @@
5	property var components;
6	property var cardData;
7	property string artShapeStyle: "inset";
8	+ property string backgroundShapeStyle: "inset";
9	property real fontScale: 1.0;
10	property var scopeStyle: null;
11	property int titleAlignment: Text.AlignLeft;