git.iko.soy/unity8
on xenial help sign in
fix panel tests
1897f10Michael Zanetti
tests/qmltests/Panel/tst_Panel.qml+6−3
compare with xenial
unifiedsplit
@@ -42,7 +42,9 @@ PanelTest {
42 value: keyboardAttached.checked
42 value: keyboardAttached.checked
43 }
43 }
44
44
45− readonly property alias panelState: panel.panelState
45+ readonly property var panelState: PanelState {
46+
47+ }
46
48
47 ApplicationMenuDataLoader {
49 ApplicationMenuDataLoader {
48 id: appMenuData
50 id: appMenuData
@@ -86,6 +88,7 @@ PanelTest {
86
88
87 indicatorMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
89 indicatorMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
88 applicationMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
90 applicationMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
91+ panelState: root.panelState
89
92
90 applicationMenus {
93 applicationMenus {
91 model: UnityMenuModel {
94 model: UnityMenuModel {
@@ -855,7 +858,7 @@ PanelTest {
855
858
856 var indicatorsBar = findChild(panel.applicationMenus, "indicatorsBar");
859 var indicatorsBar = findChild(panel.applicationMenus, "indicatorsBar");
857
860
858− PanelState.title = "Fake Title"
861+ root.panelState.title = "Fake Title"
859 pullDownApplicationsMenu(0 /*xPos*/);
862 pullDownApplicationsMenu(0 /*xPos*/);
860 compare(aboutToShowCalledSpy.count, 1);
863 compare(aboutToShowCalledSpy.count, 1);
861
864
@@ -888,7 +891,7 @@ PanelTest {
888
891
889 var indicatorsBar = findChild(panel.applicationMenus, "indicatorsBar");
892 var indicatorsBar = findChild(panel.applicationMenus, "indicatorsBar");
890
893
891− PanelState.title = "Fake Title"
894+ panelState.title = "Fake Title"
892 pullDownApplicationsMenu(0 /*xPos*/);
895 pullDownApplicationsMenu(0 /*xPos*/);
893
896
894 tryCompare(indicatorsBar, "currentItemIndex", 0);
897 tryCompare(indicatorsBar, "currentItemIndex", 0);