@@ -144,7 +144,7 @@ Item {
144 var pages = findChild(wizard, "wizardPages");
144 var pages = findChild(wizard, "wizardPages");
145 var stack = findChild(pages, "pageStack");
145 var stack = findChild(pages, "pageStack");
146 // don't simply call tryCompare here, because stack.currentPage will be swapped out itself
146 // don't simply call tryCompare here, because stack.currentPage will be swapped out itself
147− tryCompareFunction(function() { return stack.currentPage.objectName; }, name);
147+ tryCompareFunction(function() { return stack.currentPage.objectName; }, name, 15000);
148 tryCompare(stack.currentPage, "opacity", 1.0);
148 tryCompare(stack.currentPage, "opacity", 1.0);
149 tryCompare(stack.currentPage, "enabled", true);
149 tryCompare(stack.currentPage, "enabled", true);
150 tryCompare(stack.currentPage, "skipValid", true);
150 tryCompare(stack.currentPage, "skipValid", true);
@@ -153,17 +153,6 @@ Item {
153 return stack.currentPage;
153 return stack.currentPage;
156− function verifyPageIsBlocked(name) {
157− var pages = findChild(wizard, "wizardPages");
158− var stack = findChild(pages, "pageStack");
159− // don't simply call tryCompare here, because stack.currentPage will be swapped out itself
160− tryCompareFunction(function() { return stack.currentPage.objectName; }, name);
161− tryCompare(stack.currentPage, "enabled", false);
162− tryCompare(stack.currentPage, "skipValid", false);
163− waitForRendering(stack.currentPage);
164− return stack.currentPage;
167 function goToPage(name, skipSim, skipLocation, skipReporting) {
156 function goToPage(name, skipSim, skipLocation, skipReporting) {
168 if (skipSim === undefined) {
157 if (skipSim === undefined) {
169 skipSim = false;
158 skipSim = false;
@@ -196,6 +185,8 @@ Item {
198 page = waitForPage("tzPage");
187 page = waitForPage("tzPage");
188+ var contentAnimation = findInvisibleChild(page, "contentAnimation");
189+ tryCompareFunction(function() { return contentAnimation.running; }, false);
199 if (name === page.objectName) return page;
190 if (name === page.objectName) return page;
200 waitUntilTransitionsEnd(page);
191 waitUntilTransitionsEnd(page);
201 var tzList = findChild(page, "tzList");
192 var tzList = findChild(page, "tzList");