git.iko.soy/unity8
on xenial help sign in
more test fixes
commit90396d968e6815af12d952d5cb147016bff323e4 authorNick Dedekind <nick.dedekind@canonical.com> dateWed 5 Oct 2016, 14:43 (10 years ago) parent4a079b9
3 files changed+20−7
compare with xenial
unifiedsplit
tests/mocks/Unity/Indicators/fakeindicatorsmodeldata.js+4−4 tests/qmltests/Panel/tst_MenuContent.qml+13−1 tests/qmltests/Panel/tst_Panel.qml+3−2
tests/mocks/Unity/Indicators/fakeindicatorsmodeldata.js+4−4
@@ -510,7 +510,7 @@ var fakeMenuData = {
510510 "state": "Stopped"
511511 },
512512 "ext": {},
513− "icon": "file:///usr/share/mediaplayer-app/mediaplayer-app.png",
513+ "icon": "image://theme/mediaplayer-app",
514514 "isCheck": false,
515515 "isRadio": false,
516516 "isSeparator": false,
@@ -772,7 +772,7 @@ var fakeMenuData = {
772772 "ext": {
773773 "xCanonicalUid": 1003
774774 },
775− "icon": "file:///usr/share/webbrowser-app/webbrowser-app.png",
775+ "icon": "image://theme/webbrowser-app",
776776 "isCheck": false,
777777 "isRadio": false,
778778 "isSeparator": false,
@@ -821,7 +821,7 @@ var fakeMenuData = {
821821 "ext": {
822822 "xCanonicalUid": 1002
823823 },
824− "icon": "file:///usr/share/webbrowser-app/webbrowser-app.png",
824+ "icon": "image://theme/webbrowser-app",
825825 "isCheck": false,
826826 "isRadio": false,
827827 "isSeparator": false,
@@ -838,7 +838,7 @@ var fakeMenuData = {
838838 "ext": {
839839 "xCanonicalUid": 1001
840840 },
841− "icon": "file:///usr/share/webbrowser-app/webbrowser-app.png",
841+ "icon": "image://theme/webbrowser-app",
842842 "isCheck": false,
843843 "isRadio": false,
844844 "isSeparator": false,
tests/qmltests/Panel/tst_MenuContent.qml+13−1
@@ -31,8 +31,20 @@ PanelTest {
3131
3232 MenuContent {
3333 id: menuContent
34− indicatorsModel: root.indicatorsModel
34+ model: root.indicatorsModel
3535 height: parent.height - 50
36+
37+ pageDelegate: Rectangle {
38+
39+ function reset() {
40+ }
41+
42+ Binding {
43+ target: parent
44+ property: "objectName"
45+ value: modelData ? modelData.identifier : ""
46+ }
47+ }
3648 }
3749
3850 Rectangle {
tests/qmltests/Panel/tst_Panel.qml+3−2
@@ -28,7 +28,8 @@ import AccountsService 0.1
2828import Unity.InputInfo 0.1
2929import "../../../qml/Panel"
3030import "../../../qml/Components/PanelState"
31−import "../Stages"
31+import "../Stage"
32+import ".."
3233
3334PanelTest {
3435 id: root
@@ -42,7 +43,7 @@ PanelTest {
4243 value: keyboardAttached.checked
4344 }
4445
45− DesktopMenuData { id: appMenuData }
46+ ApplicationMenuDataLoader { id: appMenuData }
4647
4748 Component.onCompleted: {
4849 theme.name = "Ubuntu.Components.Themes.SuruDark"