Merge into trunk : preview-rating-input-tweaks : Code : Unity 8

Reviewer	Review Type	Date Requested	Status
Michael Terry			Approve on 2016-05-20
Albert Astals Cid (community)		2016-02-24	Approve on 2016-05-12
Unity8 CI Bot	continuous-integration		Approve on 2016-05-11
Michał Sawicz			Needs Fixing on 2016-03-10
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-02-25
Review via email: mp+287065@code.launchpad.net

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-24:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/476/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-24:

#

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-24:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/477/rebuild

review: Approve (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-02-25:

#

Title of the Rating & review widget to be same size as the others (i.e.: “Info”, “Updates”) and sizes of stars must be x1.5 current size.

review: Needs Fixing

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-25:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/482/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-25:

#

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-25:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/488/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-02-25:

#

existing reviews (i.e. not the one you are making but others people did) don't show the stars anymore

review: Needs Fixing

Andrea Cimitan (cimi) wrote on 2016-02-25:

#

> existing reviews (i.e. not the one you are making but others people did) don't
> show the stars anymore

I changed che Rating image code to use a specified height, while before it was using the maximum size of the rating image (was breaking with big SVG from the icon theme) now I set an implicit height of 2gu

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-25:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/493/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-25:

#

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-25:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/495/rebuild

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-25:

#

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-02-26:

#

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass?
Yes

* Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

Michał Sawicz (saviq) wrote on 2016-03-10:

#

We need to scroll the view to contain the text entry after having rated.

review: Needs Fixing

Andrea Cimitan (cimi) wrote on 2016-03-10:

#

> We need to scroll the view to contain the text entry after having rated.

https://code.launchpad.net/~unity-team/unity8/preview-rating-position-listview/+merge/288707

Michał Sawicz (saviq) wrote on 2016-03-10:

#

Could use an expand animation, too.

review: Needs Fixing

Andrea Cimitan (cimi) wrote on 2016-03-10:

#

> Could use an expand animation, too.
thought about it too... but what are you going to animate? behavior on height? didn't look particularly better than without so I scrapped it.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-24:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/846/rebuild

review: Needs Fixing (continuous-integration)

lp:~cimi/unity8/preview-rating-input-tweaks updated on 2016-05-03

2209. By Andrea Cimitan on 2016-05-03: merged trunk

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-03:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1109/rebuild

review: Needs Fixing (continuous-integration)

lp:~cimi/unity8/preview-rating-input-tweaks updated on 2016-05-04

2210. By Andrea Cimitan on 2016-05-03: Merged makeSureVisible fix
2211. By Andrea Cimitan on 2016-05-04: Added animation
2212. By Andrea Cimitan on 2016-05-04: Changed animation

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-04:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1121/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-04:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1123/rebuild

review: Needs Fixing (continuous-integration)

lp:~cimi/unity8/preview-rating-input-tweaks updated on 2016-05-05

2213. By Andrea Cimitan on 2016-05-05: fixed test

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-05:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1130/rebuild

review: Needs Fixing (continuous-integration)

lp:~cimi/unity8/preview-rating-input-tweaks updated on 2016-05-10

2214. By Andrea Cimitan on 2016-05-10: fix remaining failing qml test

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-10:

#

PASSED: Continuous integration, rev:2214
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1168/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/715
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/715
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1561
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1521
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1521
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1521
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1521/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1521
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1521/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1521
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1521/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1521
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1521/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1521
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1521/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1521
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1521/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1168/rebuild

review: Approve (continuous-integration)

lp:~cimi/unity8/preview-rating-input-tweaks updated on 2016-05-10

2215. By Andrea Cimitan on 2016-05-10: better fix

Albert Astals Cid (aacid) wrote on 2016-05-10:

#

The root.makeSureVisible(rating); thing doesn't make sense to me.

Are you sure we don't want it to be root.makeSureVisible(reviewTextArea); ?

review: Needs Information

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-10:

#

PASSED: Continuous integration, rev:2215
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1170/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/716
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/716
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1563
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1523
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1523
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1523
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1523/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1523
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1523/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1523
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1523/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1523
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1523/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1523
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1523/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1523
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1523/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1170/rebuild

review: Approve (continuous-integration)

lp:~cimi/unity8/preview-rating-input-tweaks updated on 2016-05-11

2216. By Andrea Cimitan on 2016-05-11: as review
2217. By Andrea Cimitan on 2016-05-11: remove comment

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-11:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1191/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-11:

#

PASSED: Continuous integration, rev:2217
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1195/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/737
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/737
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1597
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1552
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1552
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1552
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1552/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1552
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1552/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1552
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1552/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1552
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1552/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1552
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1552/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1552
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1552/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1195/rebuild

review: Approve (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-05-12:

#

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass?
Yes

review: Approve

lp:~cimi/unity8/preview-rating-input-tweaks updated on 2016-05-20

2218. By Andrea Cimitan on 2016-05-20: Keep the button disabled when the requirements are not met
2219. By Andrea Cimitan on 2016-05-20: this is no longer required since we disable the button

Michael Terry (mterry) wrote on 2016-05-20:

#

Still fine.

review: Approve

Unity 8

Merge lp:~cimi/unity8/preview-rating-input-tweaks into lp:unity8

Commit Message

Description of the Change

Preview Diff

Subscribers

 === modified file 'qml/Components/Rating.qml'
 --- qml/Components/Rating.qml	2015-07-15 15:07:19 +0000
 +++ qml/Components/Rating.qml	2016-05-20 14:22:11 +0000
@@ -21,6 +21,7 @@
  StyledItem {
      id: root
++    implicitHeight: units.gu(2)
      //! True if it accepts user input.
      property bool interactive: true
 === modified file 'qml/Components/RatingStyle.qml'
 --- qml/Components/RatingStyle.qml	2015-07-15 15:07:19 +0000
 +++ qml/Components/RatingStyle.qml	2016-05-20 14:22:11 +0000
@@ -36,6 +36,9 @@
          property url urlIconHalf: styledItem.urlIconHalf || "graphics/icon_star_half.png"
          Image {
++            height: parent.height
++            fillMode: Image.PreserveAspectFit
++            sourceSize.height: height
              opacity: styledItem.value < 0 ? 0.4 : 1 // Let's make the stars look inactive for a not-set value
              source: {
                  if (index === repeater.indexHalfValue) return repeater.urlIconHalf;
 === modified file 'qml/Dash/Previews/PreviewRatingInput.qml'
 --- qml/Dash/Previews/PreviewRatingInput.qml	2015-09-14 07:47:24 +0000
 +++ qml/Dash/Previews/PreviewRatingInput.qml	2016-05-20 14:22:11 +0000
@@ -40,14 +40,16 @@
          switch(widgetData["visible"]) {
              default:
              case "both":
--                return ratingLabelAndWidgetContainer.implicitHeight + reviewContainer.implicitHeight;
++                return ratingLabelAndWidgetContainer.implicitHeight + (reviewContainer.visible ? reviewContainer.implicitHeight : 0);
              case "rating":
                  return ratingLabelAndWidgetContainer.implicitHeight;
              case "review":
                  return reviewContainer.implicitHeight;
--            }
++        }
+     }
++    clip: reviewContainer.visible
++
      property alias ratingValue: rating.value
      property alias reviewText: reviewTextArea.text
@@ -64,21 +66,17 @@
          triggered(root.widgetId, "rated", data);
+     }
--    Item {
++    Column {
          id: ratingLabelAndWidgetContainer
--        anchors {
--            left: parent.left
--            right: parent.right
--        }
--        implicitHeight: rating.height
++        anchors { left: parent.left; right: parent.right; }
++        spacing: units.gu(0.5)
          visible: widgetData["visible"] !== "review"
          Label {
++            id: ratingLabel
              objectName: "ratingLabel"
--            anchors {
--                verticalCenter: parent.verticalCenter
--                left: parent.left
--            }
++            anchors { left: parent.left; right: parent.right; }
++            fontSize: "large"
              color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
              opacity: .8
              text: widgetData["rating-label"] || i18n.tr("Rate this")
@@ -87,23 +85,22 @@
          Rating {
              id: rating
              objectName: "rating"
--            anchors {
--                verticalCenter: parent.verticalCenter
--                right: parent.right
--            }
++            anchors.left: parent.left
              size: 5
++            height: units.gu(4)
              onValueChanged: {
                  if (widgetData["visible"] === "rating") root.submit();
+             }
--            property var urlIconEmpty: widgetData["rating-icon-empty"]
--            property var urlIconFull: widgetData["rating-icon-full"]
++            property var urlIconEmpty: widgetData["rating-icon-empty"] || "image://theme/non-starred"
++            property var urlIconFull: widgetData["rating-icon-full"] || "image://theme/starred"
+         }
+     }
      Item {
          id: reviewContainer
--        implicitHeight: reviewLabel.implicitHeight + reviewSubmitContainer.implicitHeight + anchors.topMargin
++        objectName: "reviewContainer"
++        implicitHeight: visible ? reviewSubmitContainer.implicitHeight + anchors.topMargin : 0
          readonly property real innerMargin: units.gu(1)
@@ -112,32 +109,31 @@
              right: parent.right
              top: ratingLabelAndWidgetContainer.visible ? ratingLabelAndWidgetContainer.bottom : parent.top
              bottom: parent.bottom
--            topMargin: ratingLabelAndWidgetContainer.visible ? reviewContainer.innerMargin : 0
--        }
--        visible: widgetData["visible"] !== "rating"
++            topMargin: ratingLabelAndWidgetContainer.visible ? innerMargin : 0
++        }
++        visible: {
++            switch(widgetData["visible"]) {
++                default:
++                case "both":
++                    return widgetData["required"] === "review" || rating.value > 0;
++                case "rating":
++                    return false;
++                case "review":
++                    return true;
++            }
++        }
--        Label {
--            objectName: "reviewLabel"
--            id: reviewLabel
--            anchors {
--                top: parent.top
--                left: parent.left
--                right: parent.right
++        Behavior on implicitHeight {
++            UbuntuNumberAnimation {
++                duration: UbuntuAnimation.FastDuration
++                easing.type: Easing.OutCubic
+             }
--            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
--            opacity: .8
--            text: widgetData["review-label"] || i18n.tr("Add a review")
+         }
          Item {
              id: reviewSubmitContainer
--            anchors {
--                top: reviewLabel.bottom
--                left: parent.left
--                right: parent.right
--                bottom: parent.bottom
--                topMargin: reviewContainer.innerMargin
--            }
++            objectName: "reviewSubmitContainer"
++            anchors.fill: parent
              implicitHeight: reviewTextArea.implicitHeight + anchors.topMargin
              TextArea {
@@ -148,12 +144,17 @@
                      if(inputMethodVisible && activeFocus)
                          root.makeSureVisible(reviewTextArea);
+                 }
++                onVisibleChanged: {
++                    if (visible && widgetData["visible"] !== "review")
++                        focus = true;
++                }
                  anchors {
                      top: parent.top
                      left: parent.left
                      right: submitButton.left
                      rightMargin: reviewContainer.innerMargin
+                 }
++                placeholderText: widgetData["review-label"] || i18n.tr("Add a review")
+             }
              Button {
@@ -170,11 +171,9 @@
                      top: parent.top
                      right: parent.right
+                 }
--                color: readyToSubmit ? theme.palette.selected.base : theme.palette.normal.base
++                enabled: readyToSubmit
                  text: widgetData["submit-label"] || i18n.tr("Send")
--                onClicked: {
--                    if (readyToSubmit) root.submit()
--                }
++                onClicked: root.submit()
+             }
+         }
+     }
 === modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml'
 --- tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml	2015-07-15 15:07:19 +0000
 +++ tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml	2016-05-20 14:22:11 +0000
@@ -50,7 +50,8 @@
              var authorLabel = findChild(previewRatingEdit, "authorLabel");
              var reviewTextArea = findChild(previewRatingEdit, "reviewTextArea");
--            var inputRating = findChild(findChild(previewRatingEdit, "input"), "rating");
++            var ratingInput = findChild(previewRatingEdit, "input");
++            var inputRating = findChild(ratingInput, "rating");
              verify(authorLabel.visible)
              verify(!reviewTextArea.visible)
@@ -65,6 +66,9 @@
              reviewTextArea.text = "Ho Ho";
              inputRating.value = 3;
++            var reviewContainer = findChild(ratingInput, "reviewContainer");
++            var reviewSubmitContainer = findChild(ratingInput, "reviewSubmitContainer");
++            tryCompare(reviewContainer, "implicitHeight", reviewSubmitContainer.implicitHeight + reviewContainer.anchors.topMargin);
              var submitButton = findChild(previewRatingEdit, "submitButton")
              mouseClick(submitButton);
 === modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml'
 --- tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml	2015-07-15 15:07:19 +0000
 +++ tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml	2016-05-20 14:22:11 +0000
@@ -73,11 +73,10 @@
          function test_labels() {
              var ratingLabel = findChild(previewRatingInput, "ratingLabel");
--            var reviewLabel = findChild(previewRatingInput, "reviewLabel");
              previewRatingInput.widgetData = widgetDataNewLabels;
              compare(ratingLabel.text, widgetDataNewLabels["rating-label"]);
--            compare(reviewLabel.text, widgetDataNewLabels["review-label"]);
++            compare(reviewTextArea.placeholderText, widgetDataNewLabels["review-label"]);
              compare(submitButton.text, widgetDataNewLabels["submit-label"]);
+         }
@@ -120,10 +119,17 @@
              previewRatingInput.widgetData = data.widgetData;
++            if (data.widgetData["visible"] === "both" && data.widgetData["required"] === "both")
++                compare(reviewTextArea.visible, false);
++
              if (data.widgetData["visible"] !== "review") {
--                verify(rating.visible === true);
++                compare(rating.visible, true);
                  rating.value = data.inputRating;
++
++                if (data.inputRating > 0 && data.widgetData["visible"] === "both")
++                    compare(reviewTextArea.visible, true);
++
                  if (data.widgetData["required"] !== "rating" ||
                      data.widgetData["visible"] !== "rating" ||
                      data.inputRating < 0) {
@@ -132,13 +138,19 @@
                      compare(spy.count, 1);
+                 }
              } else {
--                verify(rating.visible === false);
++                compare(rating.visible, false);
+             }
              if (data.widgetData["visible"] !== "rating") {
--                verify(reviewTextArea.visible === true);
++                if (data.widgetData["visible"] === "review" || data.widgetData["required"] === "review")
++                    compare(reviewTextArea.visible, true);
                  reviewTextArea.text = data.inputText;
++                var reviewContainer = findChild(previewRatingInput, "reviewContainer");
++                if (reviewContainer.visible) {
++                    var reviewSubmitContainer = findChild(previewRatingInput, "reviewSubmitContainer");
++                    tryCompare(reviewContainer, "implicitHeight", reviewSubmitContainer.implicitHeight + reviewContainer.anchors.topMargin);
++                }
                  mouseClick(submitButton);
                  switch (data.widgetData["required"]) {
                      case "rating": {
@@ -164,7 +176,7 @@
+                     }
+                 }
              } else {
--                verify(reviewTextArea.visible === false);
++                compare(reviewTextArea.visible, false);
+             }
              compare(spy.count === 1, data.emitted);