Merge lp:~mzanetti/unity8/snap-decision-states-wait-- into lp:~macslow/unity8/snap-decisions-states

[Michael Zanetti]

get rid of one of the waits

=== modified file 'qml/Notifications/Notification.qml'
--- qml/Notifications/Notification.qml	2014-03-17 15:12:32 +0000
+++ qml/Notifications/Notification.qml	2014-03-17 18:55:06 +0000
@@ -169,6 +169,7 @@
 
         Column {
             id: contentColumn
+            objectName: "contentColumn"
 
             anchors {
                 left: parent.left

=== modified file 'tests/qmltests/Notifications/tst_Notifications.qml'
--- tests/qmltests/Notifications/tst_Notifications.qml	2014-02-21 13:40:36 +0000
+++ tests/qmltests/Notifications/tst_Notifications.qml	2014-03-17 18:55:06 +0000
@@ -444,7 +444,12 @@
 
                     // click to expand
                     mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
-                    wait(500);
+                    var contentColumn = findChild(notification, "contentColumn")
+                    var collapsedContentColumnHeight = contentColumn.height;
+                    // Waiting for the inner column to change height because buttons appear
+                    tryCompareFunction(function() { return collapsedContentColumnHeight != contentColumn.height; }, true);
+                    // Waiting for notification to reach its target size
+                    tryCompare(notification, "height", contentColumn.height + contentColumn.spacing * 2)
                     actionSpy.clear()
 
                     // test the additional buttons