on xenial help sign in
Also use modal nature of snap-decision notifications when greeter/lockscreen is shown... adapted related autopilot-tests accordingly.
commitdaff3636e2b826bf1b7380edaef31f6677805f1b authorMirco Müller <mirco.mueller@canonical.com> dateThu 23 Oct 2014, 10:18 (12 years ago) parent0e59683
2 files changed+7−6
qml/Shell.qml+1−1 tests/autopilot/unity8/shell/tests/test_notifications.py+6−5
qml/Shell.qml+1−1
@@ -693,7 +693,7 @@ Item {
693693 Rectangle {
694694 id: modalNotificationBackground
695695
696− visible: notifications.useModal && !greeter.shown && (notifications.state == "narrow")
696+ visible: notifications.useModal && (notifications.state == "narrow")
697697 color: "#000000"
698698 anchors.fill: parent
699699 opacity: 0.9
tests/autopilot/unity8/shell/tests/test_notifications.py+6−5
@@ -248,7 +248,7 @@ class InteractiveNotificationBase(NotificationsBase):
248248 self.assert_notification_action_id_was_called("action_accept")
249249
250250 def test_modal_sd_without_greeter(self):
251− """Snap-decision should block input to shell without greeter."""
251+ """Snap-decision should block input to shell without greeter/lockscreen."""
252252 unity_proxy = self.launch_unity()
253253 unlock_unity(unity_proxy)
254254
@@ -295,7 +295,7 @@ class InteractiveNotificationBase(NotificationsBase):
295295 self.assert_notification_action_id_was_called("action_accept")
296296
297297 def test_modal_sd_with_greeter(self):
298− """A snap-decision should not block input to the greeter beneath it."""
298+ """A snap-decision should block input to the greeter/lockscreen beneath it."""
299299 self.launch_unity()
300300
301301 summary = "Incoming file"
@@ -322,11 +322,12 @@ class InteractiveNotificationBase(NotificationsBase):
322322 hints
323323 )
324324
325− # verify that we can swipe away the greeter (interact with the "shell")
325+ # verify that we cannot reveal the launcher (no longer interact with
326+ # the shell)
326327 time.sleep(1)
327328 self.main_window.show_dash_swiping()
328− greeter = self.main_window.get_greeter()
329− self.assertThat(greeter.shown, Eventually(Equals(False)))
329+ self.assertThat(
330+ self.main_window.is_launcher_open, Eventually(Equals(False)))
330331
331332 # verify and interact with the triggered snap-decision notification
332333 notify_list = self._get_notifications_list()