Merge lp:~macslow/unity8/fix-snap-decision-proxy-model-hack into lp:unity8

[Mirco Müller]

Fixed the snapDecisionProxyModel-hack in tst_Shell.qml, since we now have a proper mocked Notification-model.

Fixed the snapDecisionProxyModel-hack in tst_Shell.qml, since we now have a proper mocked Notification-model.

* Are there any related MPs required for this MP to build/function as expected? Please list.
No (but lp:~macslow/unity8/swipe-dismiss-snap-decisions is a prerequisite)

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

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

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable.

* If you changed the UI, has there been a design review?
Not applicable.

Unmerged revisions

1282. By Mirco Müller on 2015-01-26

Fixed the snapDecisionProxyModel-hack in tst_Shell.qml... almost at least, since there's still a bug with mouseClick() not happening or hitting the right button.

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2015-01-09 10:42:42 +0000
+++ tests/qmltests/tst_Shell.qml	2015-01-26 12:42:53 +0000
@@ -30,6 +30,7 @@
 import Powerd 0.1
 
 import "../../qml"
+import "../../qml/Notifications"
 
 Item {
     id: root
@@ -96,16 +97,7 @@
         }
     }
 
-    Component {
-        id: mockNotification
-
-        QtObject {
-            function invokeAction(actionId) {
-                mockNotificationsModel.actionInvoked(actionId)
-            }
-        }
-    }
-    ListModel {
+    NotificationModel {
         id: mockNotificationsModel
 
         signal actionInvoked(string actionId)
@@ -115,8 +107,8 @@
         }
 
         onActionInvoked: {
-            if(actionId == "ok_id") {
-                mockNotificationsModel.clear()
+            if(action == "ok_id") {
+                mockNotificationsModel.remove(1)
             }
         }
     }
@@ -253,20 +245,21 @@
         }
 
         function addSnapDecisionNotification() {
-            var n = {
-                type: Notification.SnapDecision,
-                hints: {"x-canonical-private-affirmative-tint": "true"},
-                summary: "Tom Ato",
-                body: "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",
-                icon: "../graphics/avatars/funky.png",
-                secondaryIcon: "../graphics/applicationIcons/facebook.png",
-                actions: [{ id: "ok_id", label: "Ok"},
-                    { id: "cancel_id", label: "Cancel"},
-                    { id: "notreally_id", label: "Not really"},
-                    { id: "noway_id", label: "messages:No way"},
-                    { id: "nada_id", label: "messages:Nada"}]
-            }
-
+            var component = Qt.createComponent("./Notifications/Notification.qml")
+            var n = component.createObject("notification", {"nid": 1,
+                                                            "type": Notification.SnapDecision,
+                                                            "hints": {"x-canonical-private-affirmative-tint": "true"},
+                                                            "summary": "Tom Ato",
+                                                            "body": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",
+                                                            "icon": "../graphics/avatars/funky.png",
+                                                            "secondaryIcon": "../graphics/applicationIcons/facebook.png",
+                                                            "rawActions": ["ok_id",        "Ok",
+                                                                           "cancel_id",    "Cancel",
+                                                                           "notreally_id", "Not really",
+                                                                           "noway_id",     "messages:No way",
+                                                                           "nada_id",      "messages:Nada"]})
+            n.completed.connect(mockNotificationsModel.onCompleted)
+            n.actionInvoked.connect(mockNotificationsModel.actionInvoked)
             mockNotificationsModel.append(n)
         }