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

[Albert Astals Cid]

PreviewExpandable: "widgets" is a model, not an array

 * 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

[Andrea Cimitan (cimi)]

Specs don't state whether should be an array or a model [1], so this branch is doing the same as previews with 'widgets' being a model.

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Let's wait a silo for that (requires integration), but code is fine
 * Did CI run pass? If not, please explain why.
Waiting CI

[1] https://docs.google.com/a/canonical.com/document/d/1NmiM4UCnJgf6IEawmfyTOHRNAA5ZGrqpyrPqPOibwc8/edit

review: Approve

[Paweł Stołowski (stolowski)]

LGTM; tested with my WIP branches of scopes api and shell plugin before and after the change, and it now works.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1185
http://jenkins.qa.ubuntu.com/job/unity8-ci/4051/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3899
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1052
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1145
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1145
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3753
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5146
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5146/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11895

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

 * 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.
N, temporary fail in ap and known broken qml test.

review: Approve

=== modified file 'qml/Dash/Previews/PreviewExpandable.qml'
--- qml/Dash/Previews/PreviewExpandable.qml	2014-08-13 10:29:21 +0000
+++ qml/Dash/Previews/PreviewExpandable.qml	2014-08-21 11:25:15 +0000
@@ -80,9 +80,9 @@
             delegate: PreviewWidgetFactory {
                 height: visible ? implicitHeight : 0
                 width: parent.width
-                widgetId: modelData.widgetId
-                widgetType: modelData.type
-                widgetData: modelData.properties
+                widgetId: model.widgetId
+                widgetType: model.type
+                widgetData: model.properties
                 isCurrentPreview: root.isCurrentPreview
                 scopeStyle: root.scopeStyle
                 anchors {
 
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2014-07-30 14:16:03 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2014-08-21 11:25:15 +0000
@@ -30,15 +30,21 @@
     property string longText2: "This is a very very very long text. 1 This is a very very very long text. 2 This is a very very very long text. 3 This is a very very very long text. 4 This is a very very very long text. 5 This is a very very very long text. 6 This is a very very very long text. 7 This is a very very very long text. 8 This is a very very very long text. 9 This is a very very very long text. 10 This is a very very very long text. 11 This is a very very very long text."
     property string shortText: "This is a short text :)"
 
+    ListModel {
+        id: widgetsModel
+    }
+
     property var widgetData: {
         "title": "Title here",
         "collapsed-widgets": 2,
-        "widgets": [
-            { "type": "text", "widgetId" : "text1", "properties" : { "text": longText } },
-            { "type": "text", "widgetId" : "text2", "properties" : { "text": longText2 } },
-            { "type": "text", "widgetId" : "text3", "properties" : { "text": shortText } },
-            { "type": "text", "widgetId" : "text4", "properties" : { "text": longText } }
-        ]
+        "widgets": widgetsModel
+    }
+
+    Component.onCompleted: {
+        widgetsModel.append({"type": "text", "widgetId": "text1", "properties": { "text": longText }});
+        widgetsModel.append({"type": "text", "widgetId": "text2", "properties": { "text": longText2 }});
+        widgetsModel.append({"type": "text", "widgetId": "text3", "properties": { "text": shortText }});
+        widgetsModel.append({"type": "text", "widgetId": "text4", "properties": { "text": longText }});
     }
 
     PreviewExpandable {