@@ -41,17 +41,10 @@ Item {
4141 signal mainStageFocusedApplicationChanged()
4242 }
4343
44− PreviewListView {
45− id: previewListView
46− anchors.fill: parent
47− openEffect: openEffect
48− categoryView: genericScopeView.categoryView
49− scope: genericScopeView.scope
50− }
51−
5244 DashContentOpenEffect {
5345 id: openEffect
5446 previewListView: previewListView
47+ sourceItem: genericScopeView
5548 }
5649
5750 PageHeaderLabel {
@@ -110,6 +103,7 @@ Item {
110103 previewListView.open = true;
111104 scopes.get(0).hideDash();
112105 tryCompare(previewListView, "open", false);
106+ tryCompare(openEffect, "gap", 0);
113107 }
114108
115109 function openPreview() {
@@ -194,6 +188,7 @@ Item {
194188
195189 function test_previewCycle() {
196190 tryCompare(previewListView, "open", false);
191+ tryCompare(openEffect, "gap", 0);
197192
198193 openPreview();
199194
@@ -211,7 +206,7 @@ Item {
211206 checkArrowPosition(0);
212207
213208 // flick to the next previews
214−
209+ tryCompare(previewListView, "count", 15);
215210 for (var i = 1; i < previewListView.count; ++i) {
216211
217212 mouseFlick(previewListView, previewListView.width - units.gu(1),
@@ -332,7 +327,7 @@ Item {
332327 tryCompare(previewListView, "open", false);
333328 }
334329
335− function test_filter_expand_expand() {
330+ function test_filter_expand_expand_collapse() {
336331 // wait for the item to be there
337332 tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader2") != undefined; }, true);
338333
@@ -368,11 +363,15 @@ Item {
368363 tryCompare(category0, "filtered", false);
369364 tryCompare(category2, "filtered", true);
370365 tryCompare(category2FilterGrid, "filter", true);
366+ mouseClick(header0, header0.width / 2, header0.height / 2);
367+ tryCompare(category0, "filtered", true);
368+ tryCompare(category2, "filtered", true);
371369 }
372370
373371 function test_narrow_delegate_ranges_expand() {
374372 tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory0") != undefined; }, true);
375373 var category = findChild(genericScopeView, "dashCategory0")
374+ tryCompare(category, "filtered", true);
376375
377376 shell.width = units.gu(20)
378377 var categoryListView = findChild(genericScopeView, "categoryListView");
@@ -386,4 +385,12 @@ Item {
386385 }
387386 }
388387 }
388+
389+ PreviewListView {
390+ id: previewListView
391+ anchors.fill: parent
392+ openEffect: openEffect
393+ categoryView: genericScopeView.categoryView
394+ scope: genericScopeView.scope
395+ }
389396}