git.iko.soy/unity8
on xenial help sign in
More stable tests
f2f4227Albert Astals
qml/Dash/GenericScopeView.qml+1−1
compare with xenial
unifiedsplit
@@ -220,7 +220,7 @@ FocusScope {
220 baseItem.expand(shouldExpand, false /*animate*/);
220 baseItem.expand(shouldExpand, false /*animate*/);
221 }
221 }
222 updateDelegateCreationRange();
222 updateDelegateCreationRange();
223− if (scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local")) {
223+ if (scope && scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local")) {
224 // Yeah, hackish :/
224 // Yeah, hackish :/
225 cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));
225 cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));
226 }
226 }
tests/qmltests/Dash/tst_GenericScopeView.qml+2−1
@@ -129,8 +129,9 @@ Item {
129 var initialHeight = category.height;
129 var initialHeight = category.height;
130 mouseClick(seeAll, seeAll.width / 2, seeAll.height / 2);
130 mouseClick(seeAll, seeAll.width / 2, seeAll.height / 2);
131 verify(category.expanded);
131 verify(category.expanded);
132− tryCompareFunction(function() { return category.height > initialHeight; }, true);
132+ tryCompare(category, "height", category.item.expandedHeight + seeAll.height);
133
133
134+ waitForRendering(seeAll);
134 mouseClick(seeAll, seeAll.width / 2, seeAll.height / 2);
135 mouseClick(seeAll, seeAll.width / 2, seeAll.height / 2);
135 verify(!category.expanded);
136 verify(!category.expanded);
136 }
137 }