@@ -317,8 +317,7 @@ Item {
317317
318318 var greeter = findChild(shell, "greeter");
319319 if (data.greeterShown) {
320− LightDM.Greeter.showGreeter();
321− tryCompare(greeter, "fullyShown", true);
320+ showGreeter();
322321 }
323322
324323 if (data.revealLauncher) {
@@ -601,11 +600,25 @@ Item {
601600 && itemRectInShell.y + itemRectInShell.height <= shell.height;
602601 }
603602
603+ function showGreeter() {
604+ var greeter = findChild(shell, "greeter");
605+ LightDM.Greeter.showGreeter();
606+ waitForRendering(greeter);
607+ tryCompare(greeter, "fullyShown", true);
608+
609+ // greeter unloads its internal components when hidden
610+ // and reloads them when shown. Thus we have to do this
611+ // again before interacting with it otherwise any
612+ // DirectionalDragAreas in there won't be easily fooled by
613+ // fake swipes.
614+ removeTimeConstraintsFromDirectionalDragAreas(greeter);
615+ }
616+
604617 function test_greeterDoesNotChangeIndicatorProfile() {
605618 var panel = findChild(shell, "panel");
606619 tryCompare(panel.indicators.indicatorsModel, "profile", shell.indicatorProfile);
607620
608− LightDM.Greeter.showGreeter();
621+ showGreeter();
609622 tryCompare(panel.indicators.indicatorsModel, "profile", shell.indicatorProfile);
610623
611624 LightDM.Greeter.hideGreeter();
@@ -640,8 +653,7 @@ Item {
640653
641654 waitUntilDashIsFocused();
642655
643− LightDM.Greeter.showGreeter();
644− tryCompare(greeter, "fullyShown", true);
656+ showGreeter();
645657
646658 // The main point of this test
647659 ApplicationManager.requestFocusApplication("dialer-app");
@@ -672,22 +684,11 @@ Item {
672684 tryCompare(greeter, "shown", false)
673685 }
674686
675− function test_login() {
676− var greeter = findChild(shell, "greeter");
677− waitForRendering(greeter);
678− LightDM.Greeter.showGreeter();
679− tryCompare(greeter, "fullyShown", true);
680−
687+ function test_greeterLoginsAutomaticallyWhenNoPasswordSet() {
681688 sessionSpy.clear();
689+ verify(sessionSpy.valid);
682690
683− // greeter unloads its internal components when hidden
684− // and reloads them when shown. Thus we have to do this
685− // again before interacting with it otherwise any
686− // DirectionalDragAreas in there won't be easily fooled by
687− // fake swipes.
688− removeTimeConstraintsFromDirectionalDragAreas(greeter);
689−
690− swipeAwayGreeter();
691+ showGreeter();
691692
692693 tryCompare(sessionSpy, "count", 1);
693694 }