git.iko.soy/unity8
on xenial help sign in
Fix tests with refactor
88cdf92Andrea Cimitan
qml/Dash/GenericScopeView.qml+3−7
compare with xenial
unifiedsplit
@@ -474,14 +474,13 @@ FocusScope {
474
474
475 function openSubPage(page) {
475 function openSubPage(page) {
476 subPage = page;
476 subPage = page;
477− open = true;
478 }
477 }
479
478
480 function closeSubPage() {
479 function closeSubPage() {
481 open = false;
480 open = false;
482 }
481 }
483
482
484− source: visible && subPage && (subPage == "preview" ? "PreviewListView.qml" : "ScopeSettingsPage.qml") || ""
483+ source: subPage && (subPage == "preview" ? "PreviewListView.qml" : "ScopeSettingsPage.qml") || ""
485
484
486 onLoaded: {
485 onLoaded: {
487 if (status === Loader.Ready) {
486 if (status === Loader.Ready) {
@@ -492,16 +491,13 @@ FocusScope {
492 item.initialIndex = Qt.binding(function() { return subPageLoader.initialIndex } )
491 item.initialIndex = Qt.binding(function() { return subPageLoader.initialIndex } )
493 item.model = Qt.binding(function() { return subPageLoader.model } )
492 item.model = Qt.binding(function() { return subPageLoader.model } )
494 }
493 }
494+ open = true;
495 }
495 }
496 }
496 }
497
497
498 onOpenChanged: pageHeaderLoader.item.unfocus();
498 onOpenChanged: pageHeaderLoader.item.unfocus();
499
499
500− onVisibleChanged: {
500+ onVisibleChanged: if (!visible) subPage = "";
501− if (!visible) {
502− subPage = "";
503− }
504− }
505
501
506 Connections {
502 Connections {
507 target: subPageLoader.item
503 target: subPageLoader.item
qml/Dash/PreviewListView.qml+2−2
@@ -82,9 +82,9 @@ Item {
82 }
82 }
83
83
84 onCountChanged: {
84 onCountChanged: {
85− if (count > 0) {
85+ if (count > 0 && initialIndex >= 0) {
86 currentIndex = initialIndex;
86 currentIndex = initialIndex;
87− if (initialIndex >= 0) initialIndex = -1;
87+ initialIndex = -1;
88 }
88 }
89 }
89 }
90
90
tests/qmltests/Dash/tst_GenericScopeView.qml+5−1
@@ -283,10 +283,12 @@ Item {
283 mouseClick(closePreviewMouseArea, units.gu(2), units.gu(2));
283 mouseClick(closePreviewMouseArea, units.gu(2), units.gu(2));
284
284
285 tryCompare(testCase.subPageLoader, "open", false);
285 tryCompare(testCase.subPageLoader, "open", false);
286+ tryCompare(testCase.subPageLoader, "visible", false);
286 }
287 }
287
288
288 function test_previewOpenClose() {
289 function test_previewOpenClose() {
289 tryCompare(testCase.subPageLoader, "open", false);
290 tryCompare(testCase.subPageLoader, "open", false);
291+ tryCompare(testCase.subPageLoader, "visible", false);
290
292
291 var categoryListView = findChild(genericScopeView, "categoryListView");
293 var categoryListView = findChild(genericScopeView, "categoryListView");
292 categoryListView.positionAtBeginning();
294 categoryListView.positionAtBeginning();
@@ -371,11 +373,12 @@ Item {
371
373
372 // open
374 // open
373 tryCompare(testCase.subPageLoader, "open", false);
375 tryCompare(testCase.subPageLoader, "open", false);
376+ tryCompare(testCase.subPageLoader, "visible", false);
374 var settings = findChild(innerHeader, "settings_header_button");
377 var settings = findChild(innerHeader, "settings_header_button");
375 mouseClick(settings, settings.width / 2, settings.height / 2);
378 mouseClick(settings, settings.width / 2, settings.height / 2);
376 tryCompare(testCase.subPageLoader, "open", true);
379 tryCompare(testCase.subPageLoader, "open", true);
377 tryCompareFunction(function() { return ("" + subPageLoader.source).indexOf("ScopeSettingsPage.qml") != -1; }, true);
380 tryCompareFunction(function() { return ("" + subPageLoader.source).indexOf("ScopeSettingsPage.qml") != -1; }, true);
378− compare(genericScopeView.subPageShown, true);
381+ tryCompare(genericScopeView, "subPageShown", true);
379 compare(testCase.subPageLoader.subPage, "settings");
382 compare(testCase.subPageLoader.subPage, "settings");
380 tryCompare(testCase.subPageLoader, "x", 0);
383 tryCompare(testCase.subPageLoader, "x", 0);
381
384
@@ -386,6 +389,7 @@ Item {
386 tryCompare(genericScopeView, "subPageShown", false);
389 tryCompare(genericScopeView, "subPageShown", false);
387 var categoryListView = findChild(genericScopeView, "categoryListView");
390 var categoryListView = findChild(genericScopeView, "categoryListView");
388 tryCompare(categoryListView, "x", 0);
391 tryCompare(categoryListView, "x", 0);
392+ tryCompare(testCase.subPageLoader, "visible", false);
389 }
393 }
390
394
391 function test_header_style_data() {
395 function test_header_style_data() {