git.iko.soy/unity8
on xenial help sign in
more test fixes
90396d9Nick Dedekind
tests/mocks/Unity/Indicators/fakeindicatorsmodeldata.js+4−4
compare with xenial
unifiedsplit
@@ -510,7 +510,7 @@ var fakeMenuData = {
510 "state": "Stopped"
510 "state": "Stopped"
511 },
511 },
512 "ext": {},
512 "ext": {},
513− "icon": "file:///usr/share/mediaplayer-app/mediaplayer-app.png",
513+ "icon": "image://theme/mediaplayer-app",
514 "isCheck": false,
514 "isCheck": false,
515 "isRadio": false,
515 "isRadio": false,
516 "isSeparator": false,
516 "isSeparator": false,
@@ -772,7 +772,7 @@ var fakeMenuData = {
772 "ext": {
772 "ext": {
773 "xCanonicalUid": 1003
773 "xCanonicalUid": 1003
774 },
774 },
775− "icon": "file:///usr/share/webbrowser-app/webbrowser-app.png",
775+ "icon": "image://theme/webbrowser-app",
776 "isCheck": false,
776 "isCheck": false,
777 "isRadio": false,
777 "isRadio": false,
778 "isSeparator": false,
778 "isSeparator": false,
@@ -821,7 +821,7 @@ var fakeMenuData = {
821 "ext": {
821 "ext": {
822 "xCanonicalUid": 1002
822 "xCanonicalUid": 1002
823 },
823 },
824− "icon": "file:///usr/share/webbrowser-app/webbrowser-app.png",
824+ "icon": "image://theme/webbrowser-app",
825 "isCheck": false,
825 "isCheck": false,
826 "isRadio": false,
826 "isRadio": false,
827 "isSeparator": false,
827 "isSeparator": false,
@@ -838,7 +838,7 @@ var fakeMenuData = {
838 "ext": {
838 "ext": {
839 "xCanonicalUid": 1001
839 "xCanonicalUid": 1001
840 },
840 },
841− "icon": "file:///usr/share/webbrowser-app/webbrowser-app.png",
841+ "icon": "image://theme/webbrowser-app",
842 "isCheck": false,
842 "isCheck": false,
843 "isRadio": false,
843 "isRadio": false,
844 "isSeparator": false,
844 "isSeparator": false,
tests/qmltests/Panel/tst_MenuContent.qml+13−1
@@ -31,8 +31,20 @@ PanelTest {
31
31
32 MenuContent {
32 MenuContent {
33 id: menuContent
33 id: menuContent
34− indicatorsModel: root.indicatorsModel
34+ model: root.indicatorsModel
35 height: parent.height - 50
35 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+ }
36 }
48 }
37
49
38 Rectangle {
50 Rectangle {
tests/qmltests/Panel/tst_Panel.qml+3−2
@@ -28,7 +28,8 @@ import AccountsService 0.1
28import Unity.InputInfo 0.1
28import Unity.InputInfo 0.1
29import "../../../qml/Panel"
29import "../../../qml/Panel"
30import "../../../qml/Components/PanelState"
30import "../../../qml/Components/PanelState"
31−import "../Stages"
31+import "../Stage"
32+import ".."
32
33
33PanelTest {
34PanelTest {
34 id: root
35 id: root
@@ -42,7 +43,7 @@ PanelTest {
42 value: keyboardAttached.checked
43 value: keyboardAttached.checked
43 }
44 }
44
45
45− DesktopMenuData { id: appMenuData }
46+ ApplicationMenuDataLoader { id: appMenuData }
46
47
47 Component.onCompleted: {
48 Component.onCompleted: {
48 theme.name = "Ubuntu.Components.Themes.SuruDark"
49 theme.name = "Ubuntu.Components.Themes.SuruDark"