on xenial help sign in
drop another skipped test and related code. This feature won't come back
commitc785353150fdd0282c310d8c95d3c4c62ce50f8e authorMichael Zanetti <michael.zanetti@canonical.com> dateMon 18 Apr 2016, 17:02 (11 years ago) parent3f410e1
2 files changed+1−66
qml/Dash/ScopesList.qml+1−13 tests/qmltests/Dash/tst_Dash.qml−53
qml/Dash/ScopesList.qml+1−13
@@ -49,18 +49,6 @@ Item {
4949 anchors.fill: parent
5050 }
5151
52− Binding {
53− target: root.scope
54− property: "searchQuery"
55− value: header.searchQuery
56− }
57−
58− Binding {
59− target: header
60− property: "searchQuery"
61− value: root.scope ? root.scope.searchQuery : ""
62− }
63−
6452 DashPageHeader {
6553 id: header
6654 objectName: "pageHeader"
@@ -70,7 +58,7 @@ Item {
7058 showBackButton: true
7159 backIsClose: root.state == "edit"
7260 storeEntryEnabled: root.state == "browse"
73− searchEntryEnabled: false // Disable search for now
61+ searchEntryEnabled: false
7462 scopeStyle: root.scopeStyle
7563 onBackClicked: {
7664 if (backIsClose) {
tests/qmltests/Dash/tst_Dash.qml−53
@@ -212,59 +212,6 @@ Item {
212212 compare(dashContentList.currentIndex, 0);
213213 }
214214
215− function test_manage_dash_search_temp_scope() {
216− // TODO Search is disabled for now in manage dash
217− skip();
218−
219− // Show the manage dash
220− touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));
221− var bottomEdgeController = findInvisibleChild(dash, "bottomEdgeController");
222− tryCompare(bottomEdgeController, "progress", 1);
223−
224− // Do a search
225− var scopesList = findChild(dash, "scopesList");
226− var scopesListPageHeader = findChild(scopesList, "pageHeader");
227− var searchButton = findChild(scopesListPageHeader, "search_header_button");
228− mouseClick(searchButton);
229−
230− // Type something
231− keyClick(Qt.Key_H);
232−
233− // Click on a temp scope in the search
234− tryCompareFunction( function() { return findChild(scopesList, "scopesListCategorysearchA") != null; }, true);
235− var dashCategorysearchA = findChild(scopesList, "scopesListCategorysearchA");
236− tryCompareFunction( function() { return findChild(dashCategorysearchA, "delegate2") != null; }, true);
237− var cardTempScope = findChild(dashCategorysearchA, "delegate2");
238−
239− waitForRendering(cardTempScope);
240− mouseClick(cardTempScope);
241−
242− // Check the bottom edge (overview) is disabled from temp scope
243− var overviewDragHandle = findChild(dash, "overviewDragHandle");
244− compare(overviewDragHandle.enabled, false);
245−
246− // Check temp scope is there
247− var dashTempScopeItem = findChild(dash, "dashTempScopeItem");
248− tryCompare(dashTempScopeItem, "x", 0);
249− tryCompare(dashTempScopeItem, "visible", true);
250−
251− // Check the manage dash is gone
252− tryCompare(bottomEdgeController, "progress", 0);
253−
254− // Go back
255− var dashTempScopeItemHeader = findChild(dashTempScopeItem, "scopePageHeader");
256− var backButton = findChild(findChild(dashTempScopeItemHeader, "innerPageHeader"), "customBackButton");
257− mouseClick(backButton);
258−
259− // Check temp scope is gone
260− tryCompare(dashTempScopeItem, "x", dash.width);
261− tryCompare(dashTempScopeItem, "visible", false);
262−
263− // Original list is still on 0
264− var dashContentList = findChild(dash, "dashContentList");
265− compare(dashContentList.currentIndex, 0);
266− }
267−
268215 function test_manage_dash_open_no_favorites() {
269216 // Make it so there are no scopes
270217 scopes.clear();