90a0c16 · unity8 · git.iko.soy

git.iko.soy/unity8

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

commit90a0c160702815e821d9f29c1220fd7a178cc157 authorAlbert Astals <albert.astals@canonical.com> dateThu 13 Mar 2014, 13:18 (13 years ago) parentdf0cd23 12668a6

2 files changed+9−7

compare with xenial

unifiedsplit

data/unity8.conf−2 tests/qmltests/Dash/tst_DashContent.qml+9−5

data/unity8.conf−2

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

4242 fi

4343

4444 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

4745end script

4846

4947exec ${BINARY:-unity8} $ARGS

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

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

364364

365365 function test_showPreviewCarousel() {

366366 tryCompareFunction(function() {

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

368− if (dashCategory1 != null) {

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

370− return tile != null;

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

368+ if (scope != null) {

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

370+ if (dashCategory1 != null) {

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

372+ return tile != null;

373+ }

371374 }

372375 return false;

373376 },

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

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

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

380383

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

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

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

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

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

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