git.iko.soy/unity8
on xenial help sign in
Fix dash tests
96f8b91Josh Arenson
tests/qmltests/Dash/tst_Dash.qml+4−3
compare with xenial
unifiedsplit
@@ -588,10 +588,10 @@ Item {
588
588
589 // Go to a temp scope
589 // Go to a temp scope
590 open_manage_dash();
590 open_manage_dash();
591+ flickToYEnd(findChild(dash, "scopesListFlickable"));
591
592
592 var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother");
593 var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother");
593 var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
594 var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
594− flickToYEnd(findChild(dash, "scopesListFlickable"));
595 tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);
595 tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);
596 mouseClick(nonfavScopesListCategoryList.currentItem);
596 mouseClick(nonfavScopesListCategoryList.currentItem);
597 var dashTempScopeItem = findChild(dash, "dashTempScopeItem");
597 var dashTempScopeItem = findChild(dash, "dashTempScopeItem");
@@ -660,13 +660,14 @@ Item {
660 // Go to a temp scope
660 // Go to a temp scope
661 open_manage_dash();
661 open_manage_dash();
662
662
663+ var scopesListFlickable = findChild(dash, "scopesListFlickable");
664+ flickToYEnd(scopesListFlickable);
665+
663 var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother");
666 var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother");
664 var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
667 var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
665− var scopesListFlickable = findChild(dash, "scopesListFlickable");
666 tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);
668 tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);
667
669
668 // Ensure the non-favorites, located at the bottom, are visible
670 // Ensure the non-favorites, located at the bottom, are visible
669− flickToYEnd(scopesListFlickable);
670 mouseClick(nonfavScopesListCategoryList.currentItem);
671 mouseClick(nonfavScopesListCategoryList.currentItem);
671 var dashTempScopeItem = findChild(dash, "dashTempScopeItem");
672 var dashTempScopeItem = findChild(dash, "dashTempScopeItem");
672 tryCompare(dashTempScopeItem, "x", 0);
673 tryCompare(dashTempScopeItem, "x", 0);