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

[Albert Astals Cid]

PreviewExpandable should be not expanded on startup

 * 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

 * Did you have a look at the warnings when running tests? Can they be reduced?
N/A

[Albert Astals Cid (aacid)]

XiaoGuo Liu can you check that with this changes it works as expected for you?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1832
http://jenkins.qa.ubuntu.com/job/unity8-ci/5864/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/168/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/145
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/114/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/168
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/168/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21413

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

review: Needs Fixing (continuous-integration)

[XiaoGuo, Liu (liu-xiao-guo)]

Hi Albert,

I am sorry that I do not how can I get the release and do the testing. I'd
love to do that.

Thanks & best regards,
XiaoGuo

On Tue, Jun 23, 2015 at 10:31 PM, Albert Astals Cid <
<email address hidden>> wrote:

> XiaoGuo Liu can you check that with this changes it works as expected for
> you?
> --
>
> https://code.launchpad.net/~aacid/unity8/expandable_not_expanded_by_default/+merge/262719
> You are requested to review the proposed merge of
> lp:~aacid/unity8/expandable_not_expanded_by_default into lp:unity8.
>

--
XiaoGuo, Liu (刘晓国）
Mobile: [phone]

[Albert Astals Cid (aacid)]

> Hi Albert,
>
> I am sorry that I do not how can I get the release and do the testing. I'd
> love to do that.

Either use the debian file provided in the previous comment at http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/168/artifact/work/output/*zip*/output.zip or just edit the file PreviewWidgetFactory.qml on your phone manually.

[XiaoGuo, Liu (liu-xiao-guo)]

OK. thanks!

On Tue, Jun 30, 2015 at 4:54 PM, Albert Astals Cid <
<email address hidden>> wrote:

> > Hi Albert,
> >
> > I am sorry that I do not how can I get the release and do the testing.
> I'd
> > love to do that.
>
> Either use the debian file provided in the previous comment at
> http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/168/artifact/work/output/*zip*/output.zip
> or just edit the file PreviewWidgetFactory.qml on your phone manually.
> --
>
> https://code.launchpad.net/~aacid/unity8/expandable_not_expanded_by_default/+merge/262719
> You are requested to review the proposed merge of
> lp:~aacid/unity8/expandable_not_expanded_by_default into lp:unity8.
>

--
XiaoGuo, Liu (刘晓国）
Mobile: [phone]

[Andrea Cimitan (cimi)]

Shall we also test that is expanded for the others with a small test in previewwidgetfactory?

[Albert Astals Cid (aacid)]

> Shall we also test that is expanded for the others with a small test in
> previewwidgetfactory?

Done

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1833
http://jenkins.qa.ubuntu.com/job/unity8-ci/5907/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/227/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/188
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/152/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/227
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/227/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21591

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5907/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.
ap
 * Did you make sure that the branch does not contain spurious tags?
y

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1833
http://jenkins.qa.ubuntu.com/job/unity8-ci/6038/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/340/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/276
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/277
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/246/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/340
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/340/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21859

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

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

review: Approve

=== modified file 'qml/Dash/Previews/PreviewWidgetFactory.qml'
--- qml/Dash/Previews/PreviewWidgetFactory.qml	2015-07-01 15:48:29 +0000
+++ qml/Dash/Previews/PreviewWidgetFactory.qml	2015-07-21 07:22:53 +0000
@@ -35,7 +35,7 @@
     property var scopeStyle: null
 
     //! Should the widget show in expanded mode (For those that support it)
-    property bool expanded: true
+    property bool expanded: widgetType !== "expandable"
 
     //! Set to true if the parent preview is displayed.
     property bool isCurrentPreview: false

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2015-07-21 07:22:53 +0000
@@ -51,9 +51,10 @@
         widgetsModel.append({"type": "text", "widgetId": "text4", "properties": { "text": longText }});
     }
 
-    PreviewExpandable {
+    PreviewWidgetFactory {
         id: previewExpandable
         anchors { left: parent.left; right: parent.right }
+        widgetType: "expandable"
         widgetData: root.widgetData
     }
 
@@ -77,6 +78,7 @@
         }
 
         function init() {
+            checkInitialState();
         }
 
         function test_collapsed_by_default() {

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2015-07-01 15:48:29 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2015-07-21 07:22:53 +0000
@@ -75,20 +75,20 @@
 
         function test_mapping_data() {
             return [
-                { tag: "Actions", type: "actions", source: "PreviewActions.qml" },
-                { tag: "Audio", type: "audio", source: "PreviewAudioPlayback.qml" },
-                { tag: "Comment", type: "comment", source: "PreviewComment.qml" },
-                { tag: "Comment Input", type: "comment-input", source: "PreviewCommentInput.qml" },
-                { tag: "Expandable", type: "expandable", source: "PreviewExpandable.qml" },
-                { tag: "Gallery", type: "gallery", source: "PreviewImageGallery.qml" },
-                { tag: "Header", type: "header", source: "PreviewHeader.qml" },
-                { tag: "Image", type: "image", source: "PreviewZoomableImage.qml" },
-                { tag: "Progress", type: "progress", source: "PreviewProgress.qml" },
-                { tag: "Rating Input", type: "rating-input", source: "PreviewRatingInput.qml" },
-                { tag: "Rating Display", type: "reviews", source: "PreviewRatingDisplay.qml" },
-                { tag: "Table", type: "table", source: "PreviewTable.qml" },
-                { tag: "Text", type: "text", source: "PreviewTextSummary.qml" },
-                { tag: "Video", type: "video", source: "PreviewVideoPlayback.qml" },
+                { tag: "Actions", type: "actions", source: "PreviewActions.qml", expanded: true },
+                { tag: "Audio", type: "audio", source: "PreviewAudioPlayback.qml", expanded: true },
+                { tag: "Comment", type: "comment", source: "PreviewComment.qml", expanded: true },
+                { tag: "Comment Input", type: "comment-input", source: "PreviewCommentInput.qml", expanded: true },
+                { tag: "Expandable", type: "expandable", source: "PreviewExpandable.qml", expanded: false },
+                { tag: "Gallery", type: "gallery", source: "PreviewImageGallery.qml", expanded: true },
+                { tag: "Header", type: "header", source: "PreviewHeader.qml", expanded: true },
+                { tag: "Image", type: "image", source: "PreviewZoomableImage.qml", expanded: true },
+                { tag: "Progress", type: "progress", source: "PreviewProgress.qml", expanded: true },
+                { tag: "Rating Input", type: "rating-input", source: "PreviewRatingInput.qml", expanded: true },
+                { tag: "Rating Display", type: "reviews", source: "PreviewRatingDisplay.qml", expanded: true },
+                { tag: "Table", type: "table", source: "PreviewTable.qml", expanded: true },
+                { tag: "Text", type: "text", source: "PreviewTextSummary.qml", expanded: true },
+                { tag: "Video", type: "video", source: "PreviewVideoPlayback.qml", expanded: true },
             ];
         }
 
@@ -97,6 +97,7 @@
             factory.widgetType = data.type;
 
             verify((String(factory.source)).indexOf(data.source) != -1);
+            compare(factory.item.expanded, data.expanded);
         }
     }
 }