on xenial help sign in
move the animation test into waitForPage()
commit7006a54fc846b730c2a0461bb4af46ac747c0840 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateFri 6 May 2016, 15:44 (10 years ago) parent0ee5c8d
1 file changed+2−2
tests/qmltests/Wizard/tst_Wizard.qml+2−2
tests/qmltests/Wizard/tst_Wizard.qml+2−2
@@ -143,6 +143,8 @@ Item {
143143 function waitForPage(name) {
144144 var pages = findChild(wizard, "wizardPages");
145145 var stack = findChild(pages, "pageStack");
146+ var contentAnimation = findInvisibleChild(stack.currentPage, "contentAnimation");
147+ tryCompareFunction(function() { return contentAnimation.running; }, false);
146148 // don't simply call tryCompare here, because stack.currentPage will be swapped out itself
147149 tryCompareFunction(function() { return stack.currentPage.objectName; }, name, 15000);
148150 tryCompare(stack.currentPage, "opacity", 1.0);
@@ -185,8 +187,6 @@ Item {
185187 }
186188
187189 page = waitForPage("tzPage");
188− var contentAnimation = findInvisibleChild(page, "contentAnimation");
189− tryCompareFunction(function() { return contentAnimation.running; }, false);
190190 if (name === page.objectName) return page;
191191 waitUntilTransitionsEnd(page);
192192 var tzList = findChild(page, "tzList");