git.iko.soy/unity8
on xenial help sign in
Merge pull request #167 from ubports/xenial_-_edge_-_vroom-vroom-tests
22e398aRodney
tests/qmltests/tst_Shell.qml+4−9
compare with xenial
unifiedsplit
@@ -176,7 +176,7 @@ Rectangle {
176 if (shellLoader.status !== Loader.Ready)
176 if (shellLoader.status !== Loader.Ready)
177 return;
177 return;
178
178
179− var greeter = testCase.findChild(shellLoader.item, "greeter");
179+ var greeter = shellLoader.item.greeter;
180 if (!greeter.shown) {
180 if (!greeter.shown) {
181 LightDM.Greeter.showGreeter();
181 LightDM.Greeter.showGreeter();
182 }
182 }
@@ -189,7 +189,7 @@ Rectangle {
189 if (shellLoader.status !== Loader.Ready)
189 if (shellLoader.status !== Loader.Ready)
190 return;
190 return;
191
191
192− var greeter = testCase.findChild(shellLoader.item, "greeter");
192+ var greeter = shellLoader.item.greeter;
193 if (greeter.shown) {
193 if (greeter.shown) {
194 greeter.hide()
194 greeter.hide()
195 }
195 }
@@ -503,11 +503,6 @@ Rectangle {
503 signalName: "sessionStarted"
503 signalName: "sessionStarted"
504 }
504 }
505
505
506− SignalSpy {
507− id: dashCommunicatorSpy
508− signalName: "setCurrentScopeCalled"
509− }
510−
511 SignalSpy {
506 SignalSpy {
512 id: broadcastUrlSpy
507 id: broadcastUrlSpy
513 target: SessionBroadcast
508 target: SessionBroadcast
@@ -581,10 +576,10 @@ Rectangle {
581 removeTimeConstraintsFromSwipeAreas(shellLoader.item);
576 removeTimeConstraintsFromSwipeAreas(shellLoader.item);
582 tryCompare(shell, "waitingOnGreeter", false); // reset by greeter when ready
577 tryCompare(shell, "waitingOnGreeter", false); // reset by greeter when ready
583
578
584− sessionSpy.target = findChild(shell, "greeter")
579+ sessionSpy.target = shell.greeter;
585− dashCommunicatorSpy.target = findInvisibleChild(shell, "dashCommunicator");
586
580
587 var launcher = findChild(shell, "launcher");
581 var launcher = findChild(shell, "launcher");
582+ verify(!!launcher);
588 launcherShowDashHomeSpy.target = launcher;
583 launcherShowDashHomeSpy.target = launcher;
589
584
590 var panel = findChild(launcher, "launcherPanel");
585 var panel = findChild(launcher, "launcherPanel");