Merge lp:~mzanetti/unity8/fix_snap_decision_test-rtm into lp:unity8/rtm-14.09

[Michael Zanetti]

Fix lp:1370240 by making stages interactive when a snap decision is dismissed.

 * Are there any related MPs required for this MP to build/function as expected? Please list.

no

 * 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?

no

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

no

[lp:~mzanetti/unity8/fix_snap_decision_test-rtm]

1326. By Michael Zanetti on 2014-10-14

revert to activeFocus, make it a bit more robust

1327. By Michael Zanetti on 2014-10-14

s/compare/tryCompare/

1328. By Michael Zanetti on 2014-10-14

add more waitForRending

1329. By Michael Zanetti on 2014-10-15

cherry-pick over fixes

[Michał Sawicz (saviq)]

As per the upstream change.

review: Approve

=== modified file 'qml/Notifications/Notifications.qml'
--- qml/Notifications/Notifications.qml	2014-08-25 11:31:05 +0000
+++ qml/Notifications/Notifications.qml	2014-10-15 09:16:33 +0000
@@ -31,6 +31,7 @@
 
     SortFilterProxyModel {
         id: snapDecisionProxyModel
+        objectName: "snapDecisionProxyModel"
 
         model: notificationList.model
         filterRole: UnityNotifications.ModelInterface != undefined ? UnityNotifications.ModelInterface.RoleType : 0

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-10-08 20:36:48 +0000
+++ qml/Shell.qml	2014-10-15 09:16:33 +0000
@@ -240,7 +240,7 @@
             Binding {
                 target: applicationsDisplayLoader.item
                 property: "interactive"
-                value: edgeDemo.stagesEnabled && !greeter.shown && !lockscreen.shown && panel.indicators.fullyClosed && launcher.progress == 0
+                value: edgeDemo.stagesEnabled && !greeter.shown && !lockscreen.shown && panel.indicators.fullyClosed && launcher.progress == 0 && !notifications.useModal
             }
             Binding {
                 target: applicationsDisplayLoader.item

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2014-10-15 09:16:32 +0000
+++ tests/qmltests/tst_Shell.qml	2014-10-15 09:16:33 +0000
@@ -25,14 +25,17 @@
 import Ubuntu.Telephony 0.1 as Telephony
 import Unity.Application 0.1
 import Unity.Connectivity 0.1
+import Unity.Notifications 1.0
 import Unity.Test 0.1 as UT
 import Powerd 0.1
 
 import "../../qml"
 
-Row {
+Item {
     id: root
-    spacing: 0
+
+    width: units.gu(60)
+    height: units.gu(71)
 
     QtObject {
         id: applicationArguments
@@ -50,49 +53,42 @@
         }
     }
 
-    Loader {
-        id: shellLoader
-
-        // Copied from Shell.qml
-        property bool tablet: false
-        width: tablet ? units.gu(160)
-                      : applicationArguments.hasGeometry() ? applicationArguments.width()
-                                                           : units.gu(40)
-        height: tablet ? units.gu(100)
-                       : applicationArguments.hasGeometry() ? applicationArguments.height()
-                                                            : units.gu(71)
-
-        property bool itemDestroyed: false
-        sourceComponent: Component {
-            Shell {
-                property string indicatorProfile: "phone"
-
-                Component.onDestruction: {
-                    shellLoader.itemDestroyed = true;
+    Row {
+        anchors.fill: parent
+
+        Loader {
+            id: shellLoader
+
+            property bool itemDestroyed: false
+            sourceComponent: Component {
+                Shell {
+                    Component.onDestruction: {
+                        shellLoader.itemDestroyed = true;
+                    }
                 }
             }
         }
-    }
-
-    Rectangle {
-        color: "white"
-        width: units.gu(30)
-        height: shellLoader.height
-
-        Column {
-            anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
-            spacing: units.gu(1)
-            Row {
-                anchors { left: parent.left; right: parent.right }
-                Button {
-                    text: "Show Greeter"
-                    onClicked: {
-                        if (shellLoader.status !== Loader.Ready)
-                            return;
-
-                        var greeter = testCase.findChild(shellLoader.item, "greeter");
-                        if (!greeter.shown) {
-                            greeter.show();
+
+        Rectangle {
+            color: "white"
+            width: units.gu(30)
+            height: shellLoader.height
+
+            Column {
+                anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
+                spacing: units.gu(1)
+                Row {
+                    anchors { left: parent.left; right: parent.right }
+                    Button {
+                        text: "Show Greeter"
+                        onClicked: {
+                            if (shellLoader.status !== Loader.Ready)
+                                return;
+
+                            var greeter = testCase.findChild(shellLoader.item, "greeter");
+                            if (!greeter.shown) {
+                                greeter.show();
+                            }
                         }
                     }
                 }
@@ -100,6 +96,33 @@
         }
     }
 
+    Component {
+        id: mockNotification
+
+        QtObject {
+            function invokeAction(actionId) {
+                mockNotificationsModel.actionInvoked(actionId)
+            }
+        }
+    }
+
+    ListModel {
+        id: mockNotificationsModel
+
+        signal actionInvoked(string actionId)
+
+        function getRaw(id) {
+            return mockNotification.createObject(mockNotificationsModel)
+        }
+
+        onActionInvoked: {
+            if(actionId == "ok_id") {
+                mockNotificationsModel.clear()
+            }
+        }
+    }
+
+
     SignalSpy {
         id: sessionSpy
         signalName: "sessionStarted"
@@ -116,6 +139,12 @@
         signalName: "unlockingAllModems"
     }
 
+    SignalSpy {
+        id: notificationActionSpy
+        target: mockNotificationsModel
+        signalName: "actionInvoked"
+    }
+
     Telephony.CallEntry {
         id: phoneCall
         phoneNumber: "[phone]"
@@ -170,6 +199,65 @@
             compare(ApplicationManager.count, 1)
         }
 
+        function test_snapDecisionDismissalReturnsFocus() {
+            var notifications = findChild(shell, "notificationList");
+            var app = ApplicationManager.startApplication("camera-app");
+            var stage = findChild(shell, "stage")
+            // Open an application and focus
+            waitUntilApplicationWindowIsFullyVisible(app);
+            ApplicationManager.focusApplication(app);
+            tryCompare(app.session.surface, "activeFocus", true);
+
+            notifications.model = mockNotificationsModel;
+
+            // FIXME: Hack: SortFilterProxyModelQML doesn't work with QML ListModels which we use
+            // for mocking here (RoleType can't be found in the QML model). As we only need to show
+            // one SnapDecision lets just disable the filtering and make appear any notification as a
+            // SnapDecision.
+            var snapDecisionProxyModel = findInvisibleChild(shell, "snapDecisionProxyModel");
+            snapDecisionProxyModel.filterRegExp = RegExp("");
+
+            // Pop-up a notification
+            addSnapDecisionNotification();
+            waitForRendering(shell);
+
+            // Make sure the notification really opened
+            var notification = findChild(notifications, "notification" + (mockNotificationsModel.count - 1));
+            verify(notification !== undefined && notification != null, "notification wasn't found");
+            tryCompare(notification, "height", notification.implicitHeight)
+            waitForRendering(notification);
+
+            // Make sure activeFocus went away from the app window
+            tryCompare(app.session.surface, "activeFocus", false);
+            tryCompare(stage, "interactive", false);
+
+            // Clicking the button should dismiss the notification and return focus
+            var buttonAccept = findChild(notification, "notify_button0");
+            mouseClick(buttonAccept, buttonAccept.width / 2, buttonAccept.height / 2);
+
+            // Make sure we're back to normal
+            tryCompare(app.session.surface, "activeFocus", true);
+            compare(stage.interactive, true, "Stages not interactive again after modal notification has closed");
+        }
+
+        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"}]
+            }
+
+            mockNotificationsModel.append(n)
+        }
+
         function test_leftEdgeDrag_data() {
             return [
                 {tag: "without launcher", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true},