on xenial help sign in
Fix typo that caused the tutorial to tease the launcher on top of the greeter.

Approved by: Albert Astals Cid

commit7ee2c219a5277b2df5f265f6d40aa0ad7f05116e authorMichael Terry <michael.terry@canonical.com> dateTue 15 Sep 2015, 12:05 (11 years ago) parent3cf6eff757710f
2 files changed+14−1
qml/Shell.qml+1−1 tests/qmltests/tst_Shell.qml+13
qml/Shell.qml+1−1
@@ -383,7 +383,7 @@ Item {
383383 // more clever here.
384384 active: usageScenario != "desktop" && AccountsService.demoEdges
385385
386− paused: LightDM.Greeter.active
386+ paused: lightDM.greeter.active
387387 launcher: launcher
388388 panel: panel
389389 edgeSize: shell.edgeSize
tests/qmltests/tst_Shell.qml+13
@@ -1104,6 +1104,19 @@ Rectangle {
11041104 compare(tutorialLeft, null); // should be destroyed with tutorial
11051105 }
11061106
1107+ function test_tutorialPausedDuringGreeter() {
1108+ loadShell("phone");
1109+
1110+ var tutorial = findChild(shell, "tutorial");
1111+
1112+ AccountsService.demoEdges = true;
1113+ tryCompare(tutorial, "running", true);
1114+ tryCompare(tutorial, "paused", true);
1115+
1116+ swipeAwayGreeter();
1117+ tryCompare(tutorial, "paused", false);
1118+ }
1119+
11071120 function test_tapOnRightEdgeReachesApplicationSurface() {
11081121 loadShell("phone");
11091122 swipeAwayGreeter();