80fa757 · unity8 · git.iko.soy

on xenial help sign in

Merge from refactor branch

80fa757Michael Terry12 years ago

tests/qmltests/Tutorial/tst_Tutorial.qml+2

@@ -103,6 +103,7 @@ Item {

103 property real halfHeight: shell ? shell.height / 2 : 0

104

105 function init() {

106+ tryCompare(shell, "enabled", true); // enabled by greeter when ready

106 swipeAwayGreeter();

107 swipeAwayGreeter();

107 AccountsService.demoEdges = false;

108 AccountsService.demoEdges = false;

108 AccountsService.demoEdges = true;

109 AccountsService.demoEdges = true;

@@ -153,6 +154,7 @@ Item {

153 }

154 }

154

155

155 function waitForPage(name) {

156 function waitForPage(name) {

157+ waitForRendering(findChild(shell, name));

156 var page = findChild(shell, name);

158 var page = findChild(shell, name);

157 tryCompare(page, "shown", true);

159 tryCompare(page, "shown", true);

158 tryCompare(page.showAnimation, "running", false);

160 tryCompare(page.showAnimation, "running", false);