@@ -104,53 +104,50 @@ Item {
104104 tryCompare(genericScopeView.scope, "searchQuery", "test")
105105 }
106106
107− function test_filter_expand_collapse() {
107+ function test_expand_collapse() {
108108 tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0") != null; }, true);
109109
110− var header = findChild(genericScopeView, "dashSectionHeader0")
111110 var category = findChild(genericScopeView, "dashCategory0")
111+ var seeAll = findChild(category, "seeAll")
112112
113− waitForRendering(header);
113+ waitForRendering(seeAll);
114114 verify(category.expandable);
115115 verify(!category.expanded);
116116
117117 var initialHeight = category.height;
118− var middleHeight;
119− mouseClick(header, header.width / 2, header.height / 2);
120− tryCompareFunction(function() { middleHeight = category.height; return category.height > initialHeight; }, true);
121− tryCompare(category, "expanded", true);
122− tryCompareFunction(function() { return category.height > middleHeight; }, true);
118+ mouseClick(seeAll, seeAll.width / 2, seeAll.height / 2);
119+ verify(category.expanded);
120+ tryCompareFunction(function() { return category.height > initialHeight; }, true);
123121
124− mouseClick(header, header.width / 2, header.height / 2);
125− verify(category.expandable);
126− tryCompare(category, "expanded", false);
122+ mouseClick(seeAll, seeAll.width / 2, seeAll.height / 2);
123+ verify(!category.expanded);
127124 }
128125
129− function test_filter_expand_expand_collapse() {
126+ function test_expand_expand_collapse() {
130127 // wait for the item to be there
131128 tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader2") != null; }, true);
132129
133130 var categoryListView = findChild(genericScopeView, "categoryListView");
134131 categoryListView.contentY = categoryListView.height;
135132
136− var header2 = findChild(genericScopeView, "dashSectionHeader2")
137133 var category2 = findChild(genericScopeView, "dashCategory2")
134+ var seeAll2 = findChild(category2, "seeAll")
138135
139− waitForRendering(header2);
136+ waitForRendering(seeAll2);
140137 verify(category2.expandable);
141138 verify(!category2.expanded);
142139
143− mouseClick(header2, header2.width / 2, header2.height / 2);
140+ mouseClick(seeAll2, seeAll2.width / 2, seeAll2.height / 2);
144141 tryCompare(category2, "expanded", true);
145142
146143 categoryListView.positionAtBeginning();
147144
148− var header0 = findChild(genericScopeView, "dashSectionHeader0")
149145 var category0 = findChild(genericScopeView, "dashCategory0")
150− mouseClick(header0, header0.width / 2, header0.height / 2);
146+ var seeAll0 = findChild(category0, "seeAll")
147+ mouseClick(seeAll0, seeAll0.width / 2, seeAll0.height / 2);
151148 tryCompare(category0, "expanded", true);
152149 tryCompare(category2, "expanded", false);
153− mouseClick(header0, header0.width / 2, header0.height / 2);
150+ mouseClick(seeAll0, seeAll0.width / 2, seeAll0.height / 2);
154151 tryCompare(category0, "expanded", false);
155152 tryCompare(category2, "expanded", false);
156153 }
@@ -163,11 +160,11 @@ Item {
163160 shell.width = units.gu(20)
164161 var categoryListView = findChild(genericScopeView, "categoryListView");
165162 categoryListView.contentY = units.gu(20);
166− var header0 = findChild(genericScopeView, "dashSectionHeader0")
167− mouseClick(header0, header0.width / 2, header0.height / 2);
163+ var seeAll = findChild(category, "seeAll")
164+ mouseClick(seeAll, seeAll.width / 2, seeAll.height / 2);
168165 tryCompare(category, "expanded", true);
169166 tryCompareFunction(function() { return category.item.height == genericScopeView.height - category.item.displayMarginBeginning - category.item.displayMarginEnd; }, true);
170− mouseClick(header0, header0.width / 2, header0.height / 2);
167+ mouseClick(seeAll, seeAll.width / 2, seeAll.height / 2);
171168 tryCompare(category, "expanded", false);
172169 }
173170