git.iko.soy/unity8
on xenial help sign in
some more test fixes
commit84880a7c35c935b21291899853aa2369e0bbb9be authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 30 Mar 2017, 17:37 (10 years ago) parent86a9c75
2 files changed+6−6
compare with xenial
unifiedsplit
qml/Shell.qml+4−4 tests/qmltests/tst_Shell.qml+2−2
qml/Shell.qml+4−4
@@ -189,12 +189,12 @@ StyledItem {
189189 }
190190
191191 function startApp(appId) {
192− if (ApplicationManager.findApplication(appId)) {
193− ApplicationManager.requestFocusApplication(appId);
194− } else {
195− print("calling startApplication. active workspace is", WorkspaceManager.activeWorkspace)
192+ stage.closeSpread();
193+ if (!ApplicationManager.findApplication(appId)) {
196194 ApplicationManager.startApplication(appId);
197195 }
196+ print("focusing", appId)
197+ ApplicationManager.requestFocusApplication(appId);
198198 }
199199
200200 function startLockedApp(app) {
tests/qmltests/tst_Shell.qml+2−2
@@ -1693,9 +1693,9 @@ Rectangle {
16931693 var spreadDelegate2 = appRepeater.itemAt(2);
16941694 var closeMouseArea = findChild(spreadDelegate2, "closeMouseArea");
16951695
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
16971697 var x = 0;
1698− var y = shell.height * .5;
1698+ var y = shell.height * .6;
16991699 mouseMove(shell, x, y)
17001700 while (spreadItem.highlightedIndex !== 2 && x <= 4000) {
17011701 x+=10;