@@ -144,7 +144,7 @@ Item {
144144 var pages = findChild(wizard, "wizardPages");
145145 var stack = findChild(pages, "pageStack");
146146 // 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);
148148 tryCompare(stack.currentPage, "opacity", 1.0);
149149 tryCompare(stack.currentPage, "enabled", true);
150150 tryCompare(stack.currentPage, "skipValid", true);
@@ -153,17 +153,6 @@ Item {
153153 return stack.currentPage;
154154 }
155155
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;
165− }
166−
167156 function goToPage(name, skipSim, skipLocation, skipReporting) {
168157 if (skipSim === undefined) {
169158 skipSim = false;
@@ -196,6 +185,8 @@ Item {
196185 }
197186
198187 page = waitForPage("tzPage");
188+ var contentAnimation = findInvisibleChild(page, "contentAnimation");
189+ tryCompareFunction(function() { return contentAnimation.running; }, false);
199190 if (name === page.objectName) return page;
200191 waitUntilTransitionsEnd(page);
201192 var tzList = findChild(page, "tzList");