90a0c16 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Merge lp:~unity-team/unity8/new-scopes-cleanup/

90a0c16Albert Astals13 years ago

data/unity8.conf−2

compare with xenial

unifiedsplit

@@ -42,8 +42,6 @@ pre-start script

42 fi

44 initctl emit scope-ui-starting

45− # FIXME temporarily explicitly start the scope proxy (scope-registry will start after that)

46− initctl start smart-scopes-proxy || true

47end script

45end script

49exec ${BINARY:-unity8} $ARGS

47exec ${BINARY:-unity8} $ARGS

tests/qmltests/Dash/tst_DashContent.qml+9−5

@@ -364,10 +364,13 @@ Item {

364

365 function test_showPreviewCarousel() {

366 tryCompareFunction(function() {

367− var dashCategory1 = findChild(dashContent, "dashCategory1");

367+ var scope = findChild(dashContent, "MockScope1 loader");

368− if (dashCategory1 != null) {

368+ if (scope != null) {

369+ var dashCategory1 = findChild(scope, "dashCategory1");

370+ if (dashCategory1 != null) {

369− var tile = findChild(dashCategory1, "carouselDelegate1");

371+ var tile = findChild(dashCategory1, "carouselDelegate1");

370− return tile != null;

372+ return tile != null;

373+ }

371 }

374 }

372 return false;

375 return false;

373 },

376 },

@@ -378,7 +381,8 @@ Item {

378 var previewListView = findChild(dashContent, "dashContentPreviewList");

381 var previewListView = findChild(dashContent, "dashContentPreviewList");

379 tryCompare(previewListView, "open", false);

382 tryCompare(previewListView, "open", false);

380

383

381− var dashCategory1 = findChild(dashContent, "dashCategory1");

384+ var scope = findChild(dashContent, "MockScope1 loader");

385+ var dashCategory1 = findChild(scope, "dashCategory1");

382 var tile = findChild(dashCategory1, "carouselDelegate1");

386 var tile = findChild(dashCategory1, "carouselDelegate1");

383 mouseClick(tile, tile.width / 2, tile.height / 2);

387 mouseClick(tile, tile.width / 2, tile.height / 2);

384 tryCompare(previewListView, "open", true);

388 tryCompare(previewListView, "open", true);