git.iko.soy/unity8
on xenial help sign in
Fix merge/tests
f4220c9Albert Astals
qml/Dash/DashNavigation.qml+1−1
compare with xenial
unifiedsplit
@@ -39,7 +39,7 @@ AbstractButton {
39 height: visible ? units.gu(5) : 0
39 height: visible ? units.gu(5) : 0
40
40
41 onClicked: {
41 onClicked: {
42− departmentListView.updateMaxHeight();
42+ navigationListView.updateMaxHeight();
43 root.showList = !root.showList;
43 root.showList = !root.showList;
44 }
44 }
45
45
tests/qmltests/Dash/tst_Dash.qml+5−9
@@ -64,10 +64,10 @@ Item {
64
64
65 function get_scope_data() {
65 function get_scope_data() {
66 return [
66 return [
67− { tag: "MockScope1", visualIndex: 0, shouldBeVisible: true },
67+ { tag: "MockScope1", visualIndex: 0 },
68− { tag: "MockScope2", visualIndex: -1, shouldBeVisible: false },
68+ { tag: "MockScope2", visualIndex: 1 },
69− { tag: "clickscope", visualIndex: 1, shouldBeVisible: true },
69+ { tag: "clickscope", visualIndex: 2 },
70− { tag: "MockScope5", visualIndex: 2, shouldBeVisible: true },
70+ { tag: "MockScope5", visualIndex: 3 },
71 ]
71 ]
72 }
72 }
73
73
@@ -76,10 +76,6 @@ Item {
76 }
76 }
77
77
78 function test_show_scope_on_load(data) {
78 function test_show_scope_on_load(data) {
79− if (data.shouldBeVisible == false) {
80− console.log("Not testing " + data.tag + ": not visible");
81− return;
82− }
83 var dashContentList = findChild(dash, "dashContentList");
79 var dashContentList = findChild(dash, "dashContentList");
84
80
85 dash.showScopeOnLoaded = data.tag
81 dash.showScopeOnLoaded = data.tag
@@ -87,7 +83,7 @@ Item {
87 tryCompare(dashContentList, "count", 0);
83 tryCompare(dashContentList, "count", 0);
88 scopes.load();
84 scopes.load();
89 tryCompare(scopes, "loaded", true);
85 tryCompare(scopes, "loaded", true);
90− tryCompare(dashContentList, "count", 4);
86+ tryCompare(dashContentList, "count", 5);
91
87
92 verify(dashContentList != undefined);
88 verify(dashContentList != undefined);
93 tryCompare(dashContentList, "currentIndex", data.visualIndex);
89 tryCompare(dashContentList, "currentIndex", data.visualIndex);