on xenial help sign in
fix some tests
e6c1ccdMichael Zanetti
tests/qmltests/Stage/tst_PhoneStage.qml+4−5
@@ -433,11 +433,10 @@ Item {
433
433
434 function test_mouseEdgePush() {
434 function test_mouseEdgePush() {
435 addApps(1);
435 addApps(1);
436− mouseMove(stage, stage.width - 1, units.gu(10));
436+ // When progress goes to 1 it should switch to spread, but stay there even if progress goes back
437− for (var i = 0; i < units.gu(10); i++) {
437+ stage.rightEdgePushProgress = 1;
438− stage.pushRightEdge(1);
438+ compare(stage.state, "spread");
439− }
439+ stage.rightEdgePushProgress = 0;
440− mouseMove(stage, stage.width - units.gu(5), units.gu(10));
441 compare(stage.state, "spread");
440 compare(stage.state, "spread");
442 }
441 }
443
442
tests/qmltests/Tutorial/tst_Tutorial.qml+2−2
@@ -699,9 +699,9 @@ Rectangle {
699 ApplicationManager.startApplication("facebook-webapp");
699 ApplicationManager.startApplication("facebook-webapp");
700 tryCompare(tutorialRightLoader, "shown", true);
700 tryCompare(tutorialRightLoader, "shown", true);
701
701
702− var stage = findChild(shell, "stage");
702+ var cursor = findChild(shell, "cursor");
703 mouseMove(shell, shell.width, shell.height / 2);
703 mouseMove(shell, shell.width, shell.height / 2);
704− stage.pushRightEdge(units.gu(8));
704+ cursor.pushedRightBoundary(units.gu(8), 0);
705 tryCompare(tutorialRightLoader, "shown", false);
705 tryCompare(tutorialRightLoader, "shown", false);
706
706
707 tryCompare(AccountsService, "demoEdges", false);
707 tryCompare(AccountsService, "demoEdges", false);