@@ -176,7 +176,7 @@ Rectangle {
176176 if (shellLoader.status !== Loader.Ready)
177177 return;
178178
179− var greeter = testCase.findChild(shellLoader.item, "greeter");
179+ var greeter = shellLoader.item.greeter;
180180 if (!greeter.shown) {
181181 LightDM.Greeter.showGreeter();
182182 }
@@ -189,7 +189,7 @@ Rectangle {
189189 if (shellLoader.status !== Loader.Ready)
190190 return;
191191
192− var greeter = testCase.findChild(shellLoader.item, "greeter");
192+ var greeter = shellLoader.item.greeter;
193193 if (greeter.shown) {
194194 greeter.hide()
195195 }
@@ -503,11 +503,6 @@ Rectangle {
503503 signalName: "sessionStarted"
504504 }
505505
506− SignalSpy {
507− id: dashCommunicatorSpy
508− signalName: "setCurrentScopeCalled"
509− }
510−
511506 SignalSpy {
512507 id: broadcastUrlSpy
513508 target: SessionBroadcast
@@ -581,10 +576,10 @@ Rectangle {
581576 removeTimeConstraintsFromSwipeAreas(shellLoader.item);
582577 tryCompare(shell, "waitingOnGreeter", false); // reset by greeter when ready
583578
584− sessionSpy.target = findChild(shell, "greeter")
585− dashCommunicatorSpy.target = findInvisibleChild(shell, "dashCommunicator");
579+ sessionSpy.target = shell.greeter;
586580
587581 var launcher = findChild(shell, "launcher");
582+ verify(!!launcher);
588583 launcherShowDashHomeSpy.target = launcher;
589584
590585 var panel = findChild(launcher, "launcherPanel");