on xenial help sign in
Fix merge/tests
commitf4220c91997744bbb9c5f9c92fbc3d57c6d68fd2 authorAlbert Astals <albert.astals@canonical.com> dateWed 6 Aug 2014, 12:41 (12 years ago) parentaeeab82
2 files changed+6−10
qml/Dash/DashNavigation.qml+1−1 tests/qmltests/Dash/tst_Dash.qml+5−9
qml/Dash/DashNavigation.qml+1−1
@@ -39,7 +39,7 @@ AbstractButton {
3939 height: visible ? units.gu(5) : 0
4040
4141 onClicked: {
42− departmentListView.updateMaxHeight();
42+ navigationListView.updateMaxHeight();
4343 root.showList = !root.showList;
4444 }
4545
tests/qmltests/Dash/tst_Dash.qml+5−9
@@ -64,10 +64,10 @@ Item {
6464
6565 function get_scope_data() {
6666 return [
67− { tag: "MockScope1", visualIndex: 0, shouldBeVisible: true },
68− { tag: "MockScope2", visualIndex: -1, shouldBeVisible: false },
69− { tag: "clickscope", visualIndex: 1, shouldBeVisible: true },
70− { tag: "MockScope5", visualIndex: 2, shouldBeVisible: true },
67+ { tag: "MockScope1", visualIndex: 0 },
68+ { tag: "MockScope2", visualIndex: 1 },
69+ { tag: "clickscope", visualIndex: 2 },
70+ { tag: "MockScope5", visualIndex: 3 },
7171 ]
7272 }
7373
@@ -76,10 +76,6 @@ Item {
7676 }
7777
7878 function test_show_scope_on_load(data) {
79− if (data.shouldBeVisible == false) {
80− console.log("Not testing " + data.tag + ": not visible");
81− return;
82− }
8379 var dashContentList = findChild(dash, "dashContentList");
8480
8581 dash.showScopeOnLoaded = data.tag
@@ -87,7 +83,7 @@ Item {
8783 tryCompare(dashContentList, "count", 0);
8884 scopes.load();
8985 tryCompare(scopes, "loaded", true);
90− tryCompare(dashContentList, "count", 4);
86+ tryCompare(dashContentList, "count", 5);
9187
9288 verify(dashContentList != undefined);
9389 tryCompare(dashContentList, "currentIndex", data.visualIndex);