git.iko.soy/unity8
on xenial help sign in
Some test fixes
3df724bMichael Terry
qml/Tutorial/TutorialBottom.qml−2
compare with xenial
unifiedsplit
@@ -78,8 +78,6 @@ TutorialPage {
78 i18n.tr("Swipe up to add a contact") :
78 i18n.tr("Swipe up to add a contact") :
79 application.appId === "com.ubuntu.calculator_calculator" ?
79 application.appId === "com.ubuntu.calculator_calculator" ?
80 i18n.tr("Swipe up for favorite calculations") :
80 i18n.tr("Swipe up for favorite calculations") :
81− application.appId === "com.ubuntu.clock_clock" ?
82− i18n.tr("Swipe up to manage alarms") :
83 application.appId === "dialer-app" ?
81 application.appId === "dialer-app" ?
84 i18n.tr("Swipe up for recent calls") :
82 i18n.tr("Swipe up for recent calls") :
85 application.appId === "messaging-app" ?
83 application.appId === "messaging-app" ?
tests/qmltests/Tutorial/tst_Tutorial.qml+13−4
@@ -267,8 +267,9 @@ Rectangle {
267 }
267 }
268
268
269 function prepareShell() {
269 function prepareShell() {
270− tryCompare(shell, "enabled", true); // enabled by greeter when ready
270+ tryCompare(shell, "enabled", true); // enabled by greeter when ready
271
271
272+ SurfaceManager.inputMethodSurface.setState(Mir.MinimizedState);
272 callManager.foregroundCall = null;
273 callManager.foregroundCall = null;
273 AccountsService.demoEdges = false;
274 AccountsService.demoEdges = false;
274 AccountsService.demoEdgesCompleted = [];
275 AccountsService.demoEdgesCompleted = [];
@@ -334,6 +335,7 @@ Rectangle {
334
335
335 AccountsService.demoEdgesCompleted = ["left", "left-long", "top", "right"];
336 AccountsService.demoEdgesCompleted = ["left", "left-long", "top", "right"];
336 ApplicationManager.startApplication("dialer-app");
337 ApplicationManager.startApplication("dialer-app");
338+ tryCompare(ApplicationManager, "focusedApplicationId", "dialer-app");
337
339
338 tryCompare(tutorialLeftLoader, "active", false);
340 tryCompare(tutorialLeftLoader, "active", false);
339 tryCompare(tutorialBottom, "shown", true);
341 tryCompare(tutorialBottom, "shown", true);
@@ -381,7 +383,7 @@ Rectangle {
381 // compare opacity with a bound rather than hard 0.6 because progress doesn't
383 // compare opacity with a bound rather than hard 0.6 because progress doesn't
382 // always match the drag perfectly (takes a moment for drag to kick in)
384 // always match the drag perfectly (takes a moment for drag to kick in)
383 tryCompareFunction(function() {
385 tryCompareFunction(function() {
384− return tutorialLeft.opacity >= 0.6 && tutorialLeft.opacity < 0.7;
386+ return tutorialLeft.opacity >= 0.6 && tutorialLeft.opacity < 0.8;
385 }, true);
387 }, true);
386 touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.4, halfHeight, false, true);
388 touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.4, halfHeight, false, true);
387
389
@@ -412,7 +414,7 @@ Rectangle {
412 touchFlick(shell, 0, halfHeight, shell.width, halfHeight);
414 touchFlick(shell, 0, halfHeight, shell.width, halfHeight);
413
415
414 tryCompare(tutorialLeft, "shown", false);
416 tryCompare(tutorialLeft, "shown", false);
415− tryCompare(AccountsService, "demoEdgesCompleted", ["left"]);
417+ tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long"]);
416 }
418 }
417
419
418 function test_tutorialLeftAutoSkipped() {
420 function test_tutorialLeftAutoSkipped() {
@@ -634,6 +636,8 @@ Rectangle {
634 var sideStageX = shell.width - units.gu(20);
636 var sideStageX = shell.width - units.gu(20);
635
637
636 openTutorialBottom();
638 openTutorialBottom();
639+ var app = ApplicationManager.findApplication("dialer-app");
640+ app.setStage(ApplicationInfoInterface.SideStage);
637
641
638 touchFlick(shell, mainStageX, shell.height, mainStageX, targetHeight, true, false);
642 touchFlick(shell, mainStageX, shell.height, mainStageX, targetHeight, true, false);
639 compare(tutorialBottom.opacity, 1);
643 compare(tutorialBottom.opacity, 1);
@@ -652,8 +656,13 @@ Rectangle {
652 var mainStageX = units.gu(20);
656 var mainStageX = units.gu(20);
653 var sideStageX = shell.width - units.gu(20);
657 var sideStageX = shell.width - units.gu(20);
654
658
659+ ApplicationManager.startApplication("gallery-app");
660+ var app = ApplicationManager.findApplication("gallery-app");
661+ app.setStage(ApplicationInfoInterface.SideStage);
662+ tryCompare(ApplicationManager, "focusedApplicationId", "gallery-app");
663+
655 openTutorialBottom();
664 openTutorialBottom();
656− var app = ApplicationManager.findApplication("dialer-app");
665+ app = ApplicationManager.findApplication("dialer-app");
657 app.setStage(ApplicationInfoInterface.MainStage);
666 app.setStage(ApplicationInfoInterface.MainStage);
658
667
659 touchFlick(shell, sideStageX, shell.height, sideStageX, targetHeight, true, false);
668 touchFlick(shell, sideStageX, shell.height, sideStageX, targetHeight, true, false);