@@ -353,12 +353,12 @@ Rectangle {
353353
354354 function test_tutorialLeftFinish() {
355355 var tutorial = findChild(shell, "tutorial");
356− var tutorialLeft = findChild(tutorial, "tutorialLeft");
356+ var tutorialLeftLoader = findChild(tutorial, "tutorialLeftLoader");
357357 var launcher = findChild(shell, "launcher");
358358
359359 touchFlick(shell, 0, halfHeight, halfWidth, halfHeight);
360360
361− tryCompare(tutorialLeft, "shown", false);
361+ tryCompare(tutorialLeftLoader, "shown", false);
362362 tryCompare(AccountsService, "demoEdgesCompleted", ["left"]);
363363 tryCompare(launcher, "state", "visible");
364364 }
@@ -368,6 +368,7 @@ Rectangle {
368368 // letting go (i.e. not triggering the "progress" property of
369369 // Launcher).
370370 var tutorialLeft = findChild(shell, "tutorialLeft");
371+ var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
371372 var launcher = findChild(shell, "launcher");
372373
373374 // Confirm fade during drag
@@ -384,13 +385,13 @@ Rectangle {
384385 // out much.
385386 touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.4, halfHeight);
386387 tryCompare(launcher, "state", ""); // should remain hidden
387− tryCompare(tutorialLeft, "shown", true); // and we should still be on left
388+ tryCompare(tutorialLeftLoader, "shown", true); // and we should still be on left
388389
389390
390391 // Now drag out but not past launcher itself
391392 touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.9, halfHeight);
392393
393− tryCompare(tutorialLeft, "shown", false);
394+ tryCompare(tutorialLeftLoader, "shown", false);
394395 tryCompare(AccountsService, "demoEdgesCompleted", ["left"]);
395396 tryCompare(launcher, "state", "visible");
396397 }
@@ -402,12 +403,11 @@ Rectangle {
402403 ApplicationManager.startApplication("gallery-app");
403404
404405 var launcher = findChild(shell, "launcher");
405− var tutorialLeft = findChild(shell, "tutorialLeftLoader");
406− verify(tutorialLeft);
406+ var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
407407
408408 touchFlick(shell, 0, halfHeight, shell.width, halfHeight);
409409
410− tryCompare(tutorialLeft, "shown", false);
410+ tryCompare(tutorialLeftLoader, "shown", false);
411411 tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long"]);
412412 }
413413
@@ -444,13 +444,13 @@ Rectangle {
444444
445445 function test_tutorialTopFinish() {
446446 var tutorial = findChild(shell, "tutorial");
447− var tutorialTop = findChild(tutorial, "tutorialTop");
447+ var tutorialTopLoader = findChild(tutorial, "tutorialTopLoader");
448448 var panel = findChild(shell, "panel");
449449
450450 openTutorialTop();
451451 touchFlick(shell, halfWidth, 0, halfWidth, shell.height);
452452
453− tryCompare(tutorialTop, "shown", false);
453+ tryCompare(tutorialTopLoader, "shown", false);
454454 tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long", "top"]);
455455 tryCompare(panel.indicators, "fullyOpened", true);
456456 }
@@ -476,10 +476,10 @@ Rectangle {
476476 // Test that we skip the tutorial if user uses top edge themselves
477477
478478 var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
479− var tutorialTop = findChild(shell, "tutorialTop");
479+ var tutorialTopLoader = findChild(shell, "tutorialTopLoader");
480480 AccountsService.demoEdgesCompleted = ["left", "left-long"];
481481 tryCompare(tutorialLeftLoader, "active", false);
482− verify(!tutorialTop.shown);
482+ verify(!tutorialTopLoader.shown);
483483
484484 touchFlick(shell, halfWidth, 0, halfWidth, shell.height);
485485 tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long", "top"]);
@@ -506,13 +506,13 @@ Rectangle {
506506
507507 function test_tutorialRightFinish() {
508508 var tutorial = findChild(shell, "tutorial");
509− var tutorialRight = findChild(tutorial, "tutorialRight");
509+ var tutorialRightLoader = findChild(tutorial, "tutorialRightLoader");
510510 var stage = findChild(shell, "stage");
511511
512512 openTutorialRight();
513513 touchFlick(shell, shell.width, halfHeight, 0, halfHeight);
514514
515− tryCompare(tutorialRight, "shown", false);
515+ tryCompare(tutorialRightLoader, "shown", false);
516516 tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long", "top", "right"]);
517517 }
518518
@@ -536,8 +536,8 @@ Rectangle {
536536 function test_tutorialRightDelay() {
537537 // Test that if we exit the top tutorial, we don't immediately
538538 // jump into right tutorial.
539− var tutorialRight = findChild(shell, "tutorialRight");
540− var tutorialRightTimer = findInvisibleChild(tutorialRight, "tutorialRightInactivityTimer");
539+ var tutorialRightLoader = findChild(shell, "tutorialRightLoader");
540+ var tutorialRightTimer = findInvisibleChild(tutorialRightLoader, "tutorialRightInactivityTimer");
541541
542542 tutorialRightTimer.interval = 1;
543543 openTutorialTop();
@@ -547,8 +547,8 @@ Rectangle {
547547
548548 AccountsService.demoEdgesCompleted = ["left", "left-long", "top"];
549549 verify(tutorialRightTimer.running, true);
550− verify(!tutorialRight.shown);
551− tryCompare(tutorialRight, "shown", true);
550+ verify(!tutorialRightLoader.shown);
551+ tryCompare(tutorialRightLoader, "shown", true);
552552 }
553553
554554 function test_tutorialRightAutoSkipped() {
@@ -585,12 +585,12 @@ Rectangle {
585585
586586 function test_tutorialBottomFinish() {
587587 var tutorial = findChild(shell, "tutorial");
588− var tutorialBottom = findChild(tutorial, "tutorialBottom");
588+ var tutorialBottomLoader = findChild(tutorial, "tutorialBottomLoader");
589589
590590 openTutorialBottom();
591591 touchFlick(shell, halfWidth, shell.height, halfWidth, halfHeight);
592592
593− tryCompare(tutorialBottom, "shown", false);
593+ tryCompare(tutorialBottomLoader, "shown", false);
594594 tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long", "top", "right", "bottom-dialer-app"]);
595595
596596 // OK, we did one, just confirm that when all are done, we mark whole tutorial as done.
@@ -679,28 +679,28 @@ Rectangle {
679679 }
680680
681681 function test_dialerInterruptionWithNoOverlappingTutorials() {
682− var tutorialLeft = findChild(shell, "tutorialLeft");
683− var tutorialBottom = findChild(shell, "tutorialBottom");
684− verify(tutorialLeft.shown);
682+ var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
683+ var tutorialBottomLoader = findChild(shell, "tutorialBottomLoader");
684+ verify(tutorialLeftLoader.shown);
685685
686686 // Start call, hiding left tutorial
687687 callManager.foregroundCall = phoneCall;
688− tryCompare(tutorialLeft, "shown", false);
688+ tryCompare(tutorialLeftLoader, "shown", false);
689689
690690 // Start dialer app
691691 ApplicationManager.startApplication("dialer-app");
692692 tryCompare(ApplicationManager, "focusedApplicationId", "dialer-app");
693− verify(!tutorialBottom.shown);
693+ verify(!tutorialBottomLoader.shown);
694694
695695 // Dismiss call, bottom tutorial should appear
696696 callManager.foregroundCall = null;
697− tryCompare(tutorialBottom, "shown", true);
698− verify(!tutorialLeft.shown);
697+ tryCompare(tutorialBottomLoader, "shown", true);
698+ verify(!tutorialLeftLoader.shown);
699699
700700 // Get rid of bottom tutorial, left should now be shown
701701 touchFlick(shell, halfWidth, shell.height, halfWidth, halfHeight);
702− tryCompare(tutorialBottom, "shown", false);
703− tryCompare(tutorialLeft, "shown", true);
702+ tryCompare(tutorialBottomLoader, "shown", false);
703+ tryCompare(tutorialLeftLoader, "shown", true);
704704 }
705705
706706 function test_greeterInterruptsTutorial() {
@@ -763,22 +763,22 @@ Rectangle {
763763 function test_desktopTutorialRightFinish() {
764764 loadShell("desktop");
765765
766− var tutorialRight = findChild(shell, "tutorialRight");
766+ var tutorialRightLoader = findChild(shell, "tutorialRightLoader");
767767 ApplicationManager.startApplication("dialer-app");
768768 ApplicationManager.startApplication("camera-app");
769− tryCompare(tutorialRight, "shown", true);
769+ tryCompare(tutorialRightLoader, "shown", true);
770770
771771 var stage = findChild(shell, "stage");
772772 mouseMove(shell, shell.width, shell.height / 2);
773773 stage.pushRightEdge(units.gu(8));
774− tryCompare(tutorialRight, "shown", false);
774+ tryCompare(tutorialRightLoader, "shown", false);
775775
776776 tryCompare(AccountsService, "demoEdges", false);
777777 }
778778
779779 function test_oskDoesNotHideTutorial() {
780− var tutorialLeft = findChild(shell, "tutorialLeft");
781− verify(tutorialLeft.shown);
780+ var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
781+ verify(tutorialLeftLoader.shown);
782782
783783 var surface = SurfaceManager.inputMethodSurface;
784784 surface.setState(Mir.RestoredState);
@@ -786,7 +786,7 @@ Rectangle {
786786 var inputMethod = findInvisibleChild(shell, "inputMethod");
787787 tryCompare(inputMethod, "state", "shown");
788788
789− verify(tutorialLeft.shown);
789+ verify(tutorialLeftLoader.shown);
790790 }
791791
792792 function test_oskPreventsTutorial() {
@@ -801,26 +801,24 @@ Rectangle {
801801 tryCompare(tutorial, "keyboardVisible", true);
802802
803803 AccountsService.demoEdges = true;
804− var tutorialLeft = findChild(shell, "tutorialLeft");
805− verify(!tutorialLeft.shown);
804+ var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
805+ verify(!tutorialLeftLoader.shown);
806806
807807 surface.setState(Mir.MinimizedState);
808808 tryCompare(inputMethod, "state", "hidden");
809− tryCompare(tutorialLeft, "shown", false);
809+ tryCompare(tutorialLeftLoader, "shown", false);
810810 }
811811
812812 function test_accountsServiceSettings() {
813− var tutorialLeft = findChild(shell, "tutorialLeft");
814− verify(tutorialLeft != null);
815− verify(tutorialLeft.shown);
813+ var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
814+ verify(tutorialLeftLoader.shown);
816815
817816 AccountsService.demoEdges = false;
818− verify(findChild(shell, "tutorialLeft") == null);
817+ verify(findChild(shell, "tutorialLeftLoader") == null);
819818
820819 AccountsService.demoEdges = true;
821− tutorialLeft = findChild(shell, "tutorialLeft");
822− verify(tutorialLeft != null);
823− tryCompare(tutorialLeft, "shown", true);
820+ tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
821+ tryCompare(tutorialLeftLoader, "shown", true);
824822 }
825823 }
826824}