git.iko.soy/unity8
on xenial help sign in
fix some tests
commite6c1ccdd6752db66ba6c1d53684cb667bf00e208 authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 24 Nov 2016, 15:53 (10 years ago) parent8d637f8
2 files changed+6−7
compare with xenial
unifiedsplit
tests/qmltests/Stage/tst_PhoneStage.qml+4−5 tests/qmltests/Tutorial/tst_Tutorial.qml+2−2
tests/qmltests/Stage/tst_PhoneStage.qml+4−5
@@ -433,11 +433,10 @@ Item {
433433
434434 function test_mouseEdgePush() {
435435 addApps(1);
436− mouseMove(stage, stage.width - 1, units.gu(10));
437− for (var i = 0; i < units.gu(10); i++) {
438− stage.pushRightEdge(1);
439− }
440− mouseMove(stage, stage.width - units.gu(5), units.gu(10));
436+ // When progress goes to 1 it should switch to spread, but stay there even if progress goes back
437+ stage.rightEdgePushProgress = 1;
438+ compare(stage.state, "spread");
439+ stage.rightEdgePushProgress = 0;
441440 compare(stage.state, "spread");
442441 }
443442
tests/qmltests/Tutorial/tst_Tutorial.qml+2−2
@@ -699,9 +699,9 @@ Rectangle {
699699 ApplicationManager.startApplication("facebook-webapp");
700700 tryCompare(tutorialRightLoader, "shown", true);
701701
702− var stage = findChild(shell, "stage");
702+ var cursor = findChild(shell, "cursor");
703703 mouseMove(shell, shell.width, shell.height / 2);
704− stage.pushRightEdge(units.gu(8));
704+ cursor.pushedRightBoundary(units.gu(8), 0);
705705 tryCompare(tutorialRightLoader, "shown", false);
706706
707707 tryCompare(AccountsService, "demoEdges", false);