c785353 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

drop another skipped test and related code. This feature won't come back

c785353Michael Zanetti11 years ago

qml/Dash/ScopesList.qml+1−13

compare with xenial

unifiedsplit

@@ -49,18 +49,6 @@ Item {

49 anchors.fill: parent

50 }

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−

64 DashPageHeader {

52 DashPageHeader {

65 id: header

53 id: header

66 objectName: "pageHeader"

54 objectName: "pageHeader"

@@ -70,7 +58,7 @@ Item {

70 showBackButton: true

58 showBackButton: true

71 backIsClose: root.state == "edit"

59 backIsClose: root.state == "edit"

72 storeEntryEnabled: root.state == "browse"

60 storeEntryEnabled: root.state == "browse"

73− searchEntryEnabled: false // Disable search for now

61+ searchEntryEnabled: false

74 scopeStyle: root.scopeStyle

62 scopeStyle: root.scopeStyle

75 onBackClicked: {

63 onBackClicked: {

76 if (backIsClose) {

64 if (backIsClose) {

tests/qmltests/Dash/tst_Dash.qml−53

@@ -212,59 +212,6 @@ Item {

212 compare(dashContentList.currentIndex, 0);

213 }

214

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−

268 function test_manage_dash_open_no_favorites() {

215 function test_manage_dash_open_no_favorites() {

269 // Make it so there are no scopes

216 // Make it so there are no scopes

270 scopes.clear();

217 scopes.clear();