git.iko.soy/unity8
on xenial help sign in
More stable tests
commitf2f422707361b1f7c58d35e9f0706fb9be999467 authorAlbert Astals <albert.astals@canonical.com> dateTue 29 Jul 2014, 15:36 (12 years ago) parentc3a5eef
2 files changed+3−2
compare with xenial
unifiedsplit
qml/Dash/GenericScopeView.qml+1−1 tests/qmltests/Dash/tst_GenericScopeView.qml+2−1
qml/Dash/GenericScopeView.qml+1−1
@@ -220,7 +220,7 @@ FocusScope {
220220 baseItem.expand(shouldExpand, false /*animate*/);
221221 }
222222 updateDelegateCreationRange();
223− if (scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local")) {
223+ if (scope && scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local")) {
224224 // Yeah, hackish :/
225225 cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));
226226 }
tests/qmltests/Dash/tst_GenericScopeView.qml+2−1
@@ -129,8 +129,9 @@ Item {
129129 var initialHeight = category.height;
130130 mouseClick(seeAll, seeAll.width / 2, seeAll.height / 2);
131131 verify(category.expanded);
132− tryCompareFunction(function() { return category.height > initialHeight; }, true);
132+ tryCompare(category, "height", category.item.expandedHeight + seeAll.height);
133133
134+ waitForRendering(seeAll);
134135 mouseClick(seeAll, seeAll.width / 2, seeAll.height / 2);
135136 verify(!category.expanded);
136137 }