on xenial help sign in
Fixed manual merge-issue causing problems in Notification-qmltest.
commitd78335dd5d8f0ed80da0f88f57fb571b3d0df4be authorMirco Müller <mirco.mueller@canonical.com> dateMon 10 Nov 2014, 10:07 (12 years ago) parentd51efda
1 file changed+10−10
tests/qmltests/Notifications/tst_Notifications.qml+10−10
tests/qmltests/Notifications/tst_Notifications.qml+10−10
@@ -666,17 +666,17 @@ Item {
666666 compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")
667667 }
668668 }
669− }
670669
671− // swipe-to-dismiss check
672− if (data.type !== Notification.SnapDecision && notification.state !== "expanded") {
673− var before = mockModel.count
674− var dragStart = notification.width * 0.25;
675− var dragEnd = notification.width;
676− var dragY = notification.height / 2;
677− touchFlick(notification, dragStart, dragY, dragEnd, dragY)
678− waitForRendering(notification)
679− tryCompare(mockModel, "count", before - 1)
670+ // swipe-to-dismiss check
671+ if (data.type !== Notification.SnapDecision && notification.state !== "expanded") {
672+ var before = mockModel.count
673+ var dragStart = notification.width * 0.25;
674+ var dragEnd = notification.width;
675+ var dragY = notification.height / 2;
676+ touchFlick(notification, dragStart, dragY, dragEnd, dragY)
677+ waitForRendering(notification)
678+ tryCompare(mockModel, "count", before - 1)
679+ }
680680 }
681681 }
682682 }