git.iko.soy/unity8
on xenial help sign in
some more test fixes
84880a7Michael Zanetti
qml/Shell.qml+4−4
compare with xenial
unifiedsplit
@@ -189,12 +189,12 @@ StyledItem {
189 }
189 }
190
190
191 function startApp(appId) {
191 function startApp(appId) {
192+ stage.closeSpread();
192− if (ApplicationManager.findApplication(appId)) {
193+ if (!ApplicationManager.findApplication(appId)) {
193− ApplicationManager.requestFocusApplication(appId);
194− } else {
195− print("calling startApplication. active workspace is", WorkspaceManager.activeWorkspace)
196 ApplicationManager.startApplication(appId);
194 ApplicationManager.startApplication(appId);
197 }
195 }
196+ print("focusing", appId)
197+ ApplicationManager.requestFocusApplication(appId);
198 }
198 }
199
199
200 function startLockedApp(app) {
200 function startLockedApp(app) {
tests/qmltests/tst_Shell.qml+2−2
@@ -1693,9 +1693,9 @@ Rectangle {
1693 var spreadDelegate2 = appRepeater.itemAt(2);
1693 var spreadDelegate2 = appRepeater.itemAt(2);
1694 var closeMouseArea = findChild(spreadDelegate2, "closeMouseArea");
1694 var closeMouseArea = findChild(spreadDelegate2, "closeMouseArea");
1695
1695
1696− // Move the mosue over tile 2 and verify the close button becomes visible
1696+ // Move the mouse over tile 2 and verify the close button becomes visible
1697 var x = 0;
1697 var x = 0;
1698− var y = shell.height * .5;
1698+ var y = shell.height * .6;
1699 mouseMove(shell, x, y)
1699 mouseMove(shell, x, y)
1700 while (spreadItem.highlightedIndex !== 2 && x <= 4000) {
1700 while (spreadItem.highlightedIndex !== 2 && x <= 4000) {
1701 x+=10;
1701 x+=10;