@@ -76,6 +76,7 @@ Item {
7676 tryCompare(scopes, "loaded", true);
7777
7878 genericScopeView.scope = scopes.getScope(2);
79+ genericScopeView.isCurrent = true;
7980 shell.width = units.gu(120);
8081 genericScopeView.categoryView.positionAtBeginning();
8182 waitForRendering(genericScopeView.categoryView);
@@ -116,6 +117,7 @@ Item {
116117 }
117118
118119 function test_isActive() {
120+ genericScopeView.isCurrent = false
119121 tryCompare(genericScopeView.scope, "isActive", false)
120122 genericScopeView.isCurrent = true
121123 tryCompare(genericScopeView.scope, "isActive", true)
@@ -140,6 +142,7 @@ Item {
140142 }
141143
142144 function test_searchQuery() {
145+ genericScopeView.isCurrent = false
143146 genericScopeView.scope = scopes.getScope(0);
144147 genericScopeView.scope.searchQuery = "test";
145148 genericScopeView.scope = scopes.getScope(1);
@@ -151,6 +154,7 @@ Item {
151154 }
152155
153156 function test_changeScope() {
157+ genericScopeView.isCurrent = false;
154158 genericScopeView.scope.searchQuery = "test"
155159 var originalScopeId = genericScopeView.scope.id;
156160 genericScopeView.scope = scopes.getScope(originalScopeId + 1)
@@ -458,6 +462,7 @@ Item {
458462 function test_seeAllTwoCategoriesScenario1() {
459463 mockScope.setId("mockScope");
460464 mockScope.setName("Mock Scope");
465+ mockScope.isActive = true;
461466 mockScope.categories.setCount(2);
462467 mockScope.categories.resultModel(0).setResultCount(50);
463468 mockScope.categories.resultModel(1).setResultCount(25);
@@ -501,6 +506,7 @@ Item {
501506 function test_seeAllTwoCategoriesScenario2() {
502507 mockScope.setId("mockScope");
503508 mockScope.setName("Mock Scope");
509+ mockScope.isActive = true;
504510 mockScope.categories.setCount(2);
505511 mockScope.categories.resultModel(0).setResultCount(25);
506512 mockScope.categories.resultModel(1).setResultCount(50);
@@ -601,6 +607,7 @@ Item {
601607 var category0 = findChild(categoryListView, "dashCategory0");
602608 waitForRendering(category0);
603609
610+ tryCompareFunction(function() { return category0.item != null; }, true);
604611 var cardGrid = category0.item;
605612 compare(cardGrid.cardTool.template["non-interactive"], true);
606613