Unity 8

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

  1. expandable_test_fixes
  2. Merge into trunk
Proposed by Albert Astals Cid on 2015-08-04
Status: Merged
Approved by: Andrea Cimitan on 2015-08-06
Approved revision: 1901
Merged at revision: 1912
Proposed branch: lp:~aacid/unity8/expandable_test_fixes
Merge into: lp:unity8
Prerequisite: lp:~gary-wzl77/unity8/audio_track_layout
Diff against target: 15 lines (+2/-2)
1 file modified
tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml (+2/-2)
To merge this branch: bzr merge lp:~aacid/unity8/expandable_test_fixes
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) 2015-08-04 Approve on 2015-08-05
PS Jenkins bot continuous-integration Needs Fixing on 2015-08-04
Review via email: mp+266875@code.launchpad.net

Commit Message

Fix the expandable test

Make the table actually be a table
Make the longText2 actually be used

Description of the Change

* 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

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Andrea Cimitan (cimi) wrote :

 * 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.
unrelated
 * Did you make sure that the branch does not contain spurious tags?
y

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml'
2--- tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml 2015-06-23 14:28:55 +0000
3+++ tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml 2015-08-04 13:58:53 +0000
4@@ -46,9 +46,9 @@
5
6 Component.onCompleted: {
7 widgetsModel.append({"type": "text", "widgetId": "text1", "properties": { "text": longText }});
8- widgetsModel.append({"type": "text", "widgetId": "table1", "properties": { "text": tableData }});
9+ widgetsModel.append({"type": "table", "widgetId": "table1", "properties": tableData });
10 widgetsModel.append({"type": "text", "widgetId": "text3", "properties": { "text": shortText }});
11- widgetsModel.append({"type": "text", "widgetId": "text4", "properties": { "text": longText }});
12+ widgetsModel.append({"type": "text", "widgetId": "text4", "properties": { "text": longText2 }});
13 }
14
15 PreviewWidgetFactory {

Subscribers

People subscribed via source and target branches