git.iko.soy/unity8
on xenial help sign in
fix tests
b074711Michael Zanetti
qml/Components/Dialogs.qml+3
compare with xenial
unifiedsplit
@@ -54,6 +54,9 @@ Item {
54 while (legacyAppsModel.count > 0) {
54 while (legacyAppsModel.count > 0) {
55 ApplicationManager.stopApplication(legacyAppsModel.get(0).appId);
55 ApplicationManager.stopApplication(legacyAppsModel.get(0).appId);
56 }
56 }
57+ d.modeSwitchWarningPopup.hide();
58+ d.modeSwitchWarningPopup.destroy();
59+ d.modeSwitchWarningPopup = null;
57 })
60 })
58 } else if (usageScenario == "desktop" && d.modeSwitchWarningPopup) {
61 } else if (usageScenario == "desktop" && d.modeSwitchWarningPopup) {
59 d.modeSwitchWarningPopup.hide();
62 d.modeSwitchWarningPopup.hide();
qml/Components/ModeSwitchWarningDialog.qml−1
@@ -89,7 +89,6 @@ ShellDialog {
89 color: UbuntuColors.red
89 color: UbuntuColors.red
90 onClicked: {
90 onClicked: {
91 root.forceClose();
91 root.forceClose();
92− PopupUtils.close(root);
93 }
92 }
94 }
93 }
95 }
94 }
tests/qmltests/tst_Shell.qml+1−1
@@ -1874,7 +1874,7 @@ Rectangle {
1874
1874
1875 // Popup must be gone now
1875 // Popup must be gone now
1876 popup = findChild(root, "modeSwitchWarningDialog");
1876 popup = findChild(root, "modeSwitchWarningDialog");
1877− compare(popup !== null, true);
1877+ compare(popup === null, true);
1878
1878
1879 if (data.replug) {
1879 if (data.replug) {
1880 // Libreoffice must still be running
1880 // Libreoffice must still be running