@@ -94,6 +94,16 @@ Item {
9494 return findChild(genericScopeView, category);
9595 }
9696
97+ function scrollToEnd()
98+ {
99+ var categoryListView = findChild(genericScopeView, "categoryListView");
100+ while (!categoryListView.atYEnd) {
101+ mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,
102+ genericScopeView.width/2, genericScopeView.y)
103+ tryCompare(categoryListView, "moving", false);
104+ }
105+ }
106+
97107 function test_isActive() {
98108 tryCompare(genericScopeView.scope, "isActive", false)
99109 genericScopeView.isCurrent = true
@@ -420,7 +430,7 @@ Item {
420430 tryCompare(category0, "height", category0.item.expandedHeight + seeAll0.height);
421431 tryCompare(genericScopeView.categoryView, "contentY", units.gu(13.5));
422432
423− scrollToCategory("dashCategory1");
433+ scrollToEnd();
424434
425435 tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory1") !== null; }, true);
426436 var category1 = findChild(genericScopeView, "dashCategory1")
@@ -462,7 +472,7 @@ Item {
462472 verify(category0.expanded);
463473 tryCompare(category0, "height", category0.item.expandedHeight + seeAll0.height);
464474
465− scrollToCategory("dashCategory1");
475+ scrollToEnd();
466476
467477 var category1 = findChild(genericScopeView, "dashCategory1")
468478 var seeAll1 = findChild(category1, "seeAll")
@@ -473,10 +483,7 @@ Item {
473483 verify(!category0.expanded);
474484 verify(category1.expanded);
475485 tryCompare(category1, "height", category1.item.expandedHeight + seeAll1.height);
476− tryCompareFunction(function() {
477− return category0.height + genericScopeView.categoryView.pageHeader.height + category1.y
478− == genericScopeView.categoryView.contentY;}
479− , true);
486+ tryCompare(category1, "y", units.gu(5));
480487 }
481488 }
482489 }