fix tests
commitb074711293fd49fce6bddd8d68af147ac34f88e8
authorMichael Zanetti <michael.zanetti@canonical.com>
dateThu 5 Nov 2015, 14:58 (11 years ago)
parent04889a4
qml/Components/Dialogs.qml+3
@@ -54,6 +54,9 @@ Item {
5454 while (legacyAppsModel.count > 0) {
5555 ApplicationManager.stopApplication(legacyAppsModel.get(0).appId);
5656 }
57+ d.modeSwitchWarningPopup.hide();
58+ d.modeSwitchWarningPopup.destroy();
59+ d.modeSwitchWarningPopup = null;
5760 })
5861 } else if (usageScenario == "desktop" && d.modeSwitchWarningPopup) {
5962 d.modeSwitchWarningPopup.hide();
qml/Components/ModeSwitchWarningDialog.qml−1
@@ -89,7 +89,6 @@ ShellDialog {
8989 color: UbuntuColors.red
9090 onClicked: {
9191 root.forceClose();
92− PopupUtils.close(root);
9392 }
9493 }
9594 }
tests/qmltests/tst_Shell.qml+1−1
@@ -1874,7 +1874,7 @@ Rectangle {
18741874
18751875 // Popup must be gone now
18761876 popup = findChild(root, "modeSwitchWarningDialog");
1877− compare(popup !== null, true);
1877+ compare(popup === null, true);
18781878
18791879 if (data.replug) {
18801880 // Libreoffice must still be running