@@ -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) {
@@ -375,7 +374,15 @@ Item {
375374 tryCompare(greeter, "fullyShown", true);
376375
377376 // Swipe away greeter to focus app
377+
378+ // greeter unloads its internal components when hidden
379+ // and reloads them when shown. Thus we have to do this
380+ // again before interacting with it otherwise any
381+ // DirectionalDragAreas in there won't be easily fooled by
382+ // fake swipes.
383+ removeTimeConstraintsFromDirectionalDragAreas(greeter);
378384 swipeAwayGreeter();
385+
379386 tryCompare(ApplicationManager, "suspended", false);
380387 compare(mainApp.state, ApplicationInfoInterface.Running);
381388 tryCompare(ApplicationManager, "focusedApplicationId", mainAppId);
@@ -593,11 +600,25 @@ Item {
593600 && itemRectInShell.y + itemRectInShell.height <= shell.height;
594601 }
595602
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+
596617 function test_greeterDoesNotChangeIndicatorProfile() {
597618 var panel = findChild(shell, "panel");
598619 tryCompare(panel.indicators.indicatorsModel, "profile", shell.indicatorProfile);
599620
600− LightDM.Greeter.showGreeter();
621+ showGreeter();
601622 tryCompare(panel.indicators.indicatorsModel, "profile", shell.indicatorProfile);
602623
603624 LightDM.Greeter.hideGreeter();
@@ -632,8 +653,7 @@ Item {
632653
633654 waitUntilDashIsFocused();
634655
635− LightDM.Greeter.showGreeter();
636− tryCompare(greeter, "fullyShown", true);
656+ showGreeter();
637657
638658 // The main point of this test
639659 ApplicationManager.requestFocusApplication("dialer-app");
@@ -664,15 +684,13 @@ Item {
664684 tryCompare(greeter, "shown", false)
665685 }
666686
667− function test_login() {
668− var greeter = findChild(shell, "greeter")
669− waitForRendering(greeter)
670− LightDM.Greeter.showGreeter();
671− tryCompare(greeter, "fullyShown", true)
672−
687+ function test_greeterLoginsAutomaticallyWhenNoPasswordSet() {
673688 sessionSpy.clear();
674− swipeAwayGreeter()
675− tryCompare(sessionSpy, "count", 1)
689+ verify(sessionSpy.valid);
690+
691+ showGreeter();
692+
693+ tryCompare(sessionSpy, "count", 1);
676694 }
677695
678696 function test_fullscreen() {