git.iko.soy/unity8
on xenial help sign in
fixed testShell
commitecfff3a4df39ac771a22b958fe72e8822467eab7 authorNick Dedekind <nick.dedekind@canonical.com> dateFri 6 Jan 2017, 14:07 (10 years ago) parent8c639f1
2 files changed+4−4
compare with xenial
unifiedsplit
tests/qmltests/ApplicationMenuDataLoader.qml+2−2 tests/qmltests/tst_Shell.qml+2−2
tests/qmltests/ApplicationMenuDataLoader.qml+2−2
@@ -6,10 +6,10 @@ import Unity.Indicators 0.1 as Indicators
66
77Object {
88
9− property var surfaceManager: null
9+ property alias surfaceManager: sMgrHandler.target
1010
1111 Connections {
12− target: surfaceManager
12+ id: sMgrHandler
1313 onSurfaceCreated: {
1414 var fakeMenuPath = "/" + surface.persistentId.replace(/\W+/g, "");
1515
tests/qmltests/tst_Shell.qml+2−2
@@ -53,18 +53,18 @@ Rectangle {
5353 shellLoader.active = true;
5454 }
5555
56− SurfaceManager { id: sMgr }
5756 ApplicationMenuDataLoader {
5857 id: appMenuData
59− surfaceManager: sMgr
6058 }
6159
6260 property var shell: shellLoader.item ? shellLoader.item : null
6361 onShellChanged: {
6462 if (shell) {
6563 topLevelSurfaceList = testCase.findInvisibleChild(shell, "topLevelSurfaceList");
64+ appMenuData.surfaceManager = testCase.findInvisibleChild(shell, "surfaceManager");
6665 } else {
6766 topLevelSurfaceList = null;
67+ appMenuData.surfaceManager = null;
6868 }
6969 }
7070