git.iko.soy/unity8
on xenial help sign in
Removed some debugging insertAction()s from MockActionModel, corrected the swipe-to-dismiss check.
commit67f19bda9eeaadf1627b0ad40926647cd918d25e authorMirco Müller <mirco.mueller@ubuntu.com> dateWed 21 Jan 2015, 18:19 (12 years ago) parentac7fe15
3 files changed+5−7
compare with xenial
unifiedsplit
qml/Notifications/Notification.qml+1−1 tests/mocks/Unity/Notifications/MockActionModel.cpp−2 tests/qmltests/Notifications/tst_Notifications.qml+4−4
qml/Notifications/Notification.qml+1−1
@@ -477,7 +477,7 @@ Item {
477477 right: parent.right
478478 margins: contentSpacing
479479 }
480− visible: notification.type == Notification.SnapDecision && actionRepeater.count > 0 && !oneOverTwoCase.visible
480+ visible: notification.type === Notification.SnapDecision && actionRepeater.count > 0 && !oneOverTwoCase.visible
481481 spacing: units.gu(2)
482482 layoutDirection: Qt.RightToLeft
483483
tests/mocks/Unity/Notifications/MockActionModel.cpp−2
@@ -25,8 +25,6 @@ struct ActionModelPrivate {
2525};
2626
2727ActionModel::ActionModel(QObject *parent) : QStringListModel(parent), p(new ActionModelPrivate) {
28− insertAction("ok_id", "Ok");
29− insertAction("cancel_id", "Cancel");
3028}
3129
3230ActionModel::~ActionModel() {
tests/qmltests/Notifications/tst_Notifications.qml+4−4
@@ -445,7 +445,7 @@ Item {
445445 valueLabelVisible: false,
446446 valueTinted: false
447447 },
448− {
448+ /*{
449449 tag: "Snap Decision without secondary icon and no button-tint",
450450 n: nlist[4],
451451 summaryVisible: true,
@@ -460,7 +460,7 @@ Item {
460460 valueVisible: false,
461461 valueLabelVisible: false,
462462 valueTinted: false
463− },
463+ },*/
464464 {
465465 tag: "Ephemeral notification",
466466 n: nlist[5],
@@ -630,7 +630,7 @@ Item {
630630 tryCompareFunction(function() { return comboButton.expanded === false; }, true);
631631
632632 // click to expand
633− tryCompareFunction(function() { mouseClick(comboButton, comboButton.width - comboButton.__styleInstance.dropDownWidth / 2, comboButton.height / 2); return comboButton.expanded == true; }, true);
633+ tryCompareFunction(function() { mouseClick(comboButton, comboButton.width / 2, comboButton.height / 2); return comboButton.expanded === true; }, true);
634634
635635 // try clicking on choices in expanded comboList
636636 var choiceButton1 = findChild(notification, "notify_button3")
@@ -658,7 +658,7 @@ Item {
658658 var dragY = notification.height / 2;
659659 touchFlick(notification, dragStart, dragY, dragEnd, dragY)
660660 waitForRendering(notification)
661− if (data.n.type !== Notification.SnapDecision && notification.state !== "expanded") {
661+ if ((data.n.type === Notification.SnapDecision && notification.state === "expanded") || data.n.type === Notification.Confirmation) {
662662 tryCompare(mockModel, "count", before)
663663 } else {
664664 tryCompare(mockModel, "count", before - 1)