on xenial help sign in
fix tests
commit02fba253d9c7b3c12b4209abd50310a60d614594 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateWed 6 Apr 2016, 14:16 (11 years ago) parentb8df2bf
2 files changed+4−7
qml/Notifications/Notification.qml+1−1 tests/qmltests/Notifications/tst_Notifications.qml+3−6
qml/Notifications/Notification.qml+1−1
@@ -217,6 +217,7 @@ StyledItem {
217217
218218 Column {
219219 id: outterColumn
220+ objectName: "outterColumn"
220221
221222 anchors {
222223 left: parent.left
@@ -229,7 +230,6 @@ StyledItem {
229230
230231 Row {
231232 id: topRow
232− objectName: "topRow"
233233
234234 spacing: notification.margins
235235 anchors {
tests/qmltests/Notifications/tst_Notifications.qml+3−6
@@ -573,10 +573,7 @@ Item {
573573 var notification = findChild(notifications, "notification" + (mockModel.count - 1))
574574 waitForRendering(notification);
575575 verify(notification, "notification wasn't found");
576−
577− var topRow = findChild(notification, "topRow");
578− tryCompare(notification, "height", notification.state === "contracted" ? topRow.childrenRect.height + notification.margins * 2
579− : notification.implicitHeight);
576+ tryCompare(notification, "height", notification.implicitHeight);
580577
581578 var icon = findChild(notification, "icon")
582579 var centeredIcon = findChild(notification, "centeredIcon")
@@ -617,8 +614,8 @@ Item {
617614 for (var i = 0; i < mockModel.count; ++i) {
618615 var n = findChild(notifications, "notification" + i)
619616 waitForRendering(n);
620− var topRow = findChild(n, "topRow");
621− tryCompare(n, "height", n.state === "contracted" ? topRow.childrenRect.height + n.margins * 2 : n.implicitHeight);
617+ var outterColumn = findChild(n, "outterColumn");
618+ tryCompare(n, "height", outterColumn.height + n.margins * 2);
622619 }
623620
624621 if (data.hasSound) {