53ed0b9 · unity8 · git.iko.soy

git.iko.soy/unity8

Fix 1309135 Fixes: 1309135

commit53ed0b9f2c9629e5577f5d395b977980d63b96a2 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateTue 29 Apr 2014, 15:20 (12 years ago) parent5cf9c62 a8da326

2 files changed+23−4

compare with xenial

unifiedsplit

qml/Dash/Previews/PreviewRatingInput.qml+2−2 tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml+21−2

qml/Dash/Previews/PreviewRatingInput.qml+2−2

@@ -155,8 +155,8 @@ PreviewWidget {

155155 objectName: "submitButton"

156156

157157 readonly property bool readyToSubmit: {

158− if (reviewTextArea.text === "" ||

159− (widgetData["visible"] === "both" && rating.value < 0)) return false;

158+ if ((widgetData["required"] !== "review" && rating.value < 0) ||

159+ (widgetData["required"] !== "rating" && reviewTextArea.text === "")) return false;

160160 else return true;

161161 }

162162

tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml+21−2

@@ -36,6 +36,8 @@ Rectangle {

3636 property var triggeredDataReviewOnly: { "rating": invalidInputRating, "review": validInputText, "author": null }

3737

3838 property var widgetDataBoth: { "visible": "both", "required": "both" }

39+ property var widgetDataBothRequireRating: { "visible": "both", "required": "rating" }

40+ property var widgetDataBothRequireReview: { "visible": "both", "required": "review" }

3941 property var widgetDataRating: { "visible": "rating", "required": "rating" }

4042 property var widgetDataRatingBroken: { "visible": "rating", "required": "review" }

4143 property var widgetDataReview: { "visible": "review", "required": "review" }

@@ -85,6 +87,14 @@ Rectangle {

8587 {tag: "both, rating-only review", widgetData: widgetDataBoth, inputRating: validInputRating, inputText: invalidInputText, emitted: false},

8688 {tag: "both, review-only review", widgetData: widgetDataBoth, inputRating: invalidInputRating, inputText: validInputText, emitted: false},

8789 {tag: "both, complete review", widgetData: widgetDataBoth, inputRating: validInputRating, inputText: validInputText, emitted: true},

90+ {tag: "both require rating, null review", widgetData: widgetDataBothRequireRating, inputRating: invalidInputRating, inputText: invalidInputText, emitted: false},

91+ {tag: "both require rating, rating-only review", widgetData: widgetDataBothRequireRating, inputRating: validInputRating, inputText: invalidInputText, emitted: true},

92+ {tag: "both require rating, review-only review", widgetData: widgetDataBothRequireRating, inputRating: invalidInputRating, inputText: validInputText, emitted: false},

93+ {tag: "both require rating, complete review", widgetData: widgetDataBothRequireRating, inputRating: validInputRating, inputText: validInputText, emitted: true},

94+ {tag: "both require review, null review", widgetData: widgetDataBothRequireReview, inputRating: invalidInputRating, inputText: invalidInputText, emitted: false},

95+ {tag: "both require review, rating-only review", widgetData: widgetDataBothRequireReview, inputRating: validInputRating, inputText: invalidInputText, emitted: false},

96+ {tag: "both require review, review-only review", widgetData: widgetDataBothRequireReview, inputRating: invalidInputRating, inputText: validInputText, emitted: true},

97+ {tag: "both require review, complete review", widgetData: widgetDataBothRequireReview, inputRating: validInputRating, inputText: validInputText, emitted: true},

8898 {tag: "rating, null review", widgetData: widgetDataRating, inputRating: invalidInputRating, inputText: invalidInputText, emitted: false},

8999 {tag: "rating, rating-only review", widgetData: widgetDataRating, inputRating: validInputRating, inputText: invalidInputText, emitted: true},

90100 {tag: "rating, review-only review", widgetData: widgetDataRating, inputRating: invalidInputRating, inputText: validInputText, emitted: false},

@@ -114,7 +124,9 @@ Rectangle {

114124 verify(rating.visible === true);

115125

116126 rating.value = data.inputRating;

117− if (data.widgetData["required"] !== "rating" || data.inputRating < 0) {

127+ if (data.widgetData["required"] !== "rating" ||

128+ data.widgetData["visible"] !== "rating" ||

129+ data.inputRating < 0) {

118130 compare(spy.count, 0);

119131 } else {

120132 compare(spy.count, 1);

@@ -129,7 +141,14 @@ Rectangle {

129141 reviewTextArea.text = data.inputText;

130142 mouseClick(submitButton, submitButton.width / 2, submitButton.height / 2);

131143 switch (data.widgetData["required"]) {

132− case "rating": compare(spy.count, 0); break;

144+ case "rating": {

145+ if (rating.visible === false || data.inputRating < 0) {

146+ compare(spy.count, 0);

147+ } else {

148+ compare(spy.count, 1);

149+ }

150+ break;

151+ }

133152 case "both":

134153 default: {

135154 if (data.inputRating < 0 || data.inputText === "") {