@@ -2737,14 +2737,14 @@ Rectangle {
27372737 GSettingsController.setEnableIndicatorMenu(true);
27382738 }
27392739
2740− function test_spreadDisabled_data() {
2740+ function test_spreadDisabled_WithSwipe_data() {
27412741 return [
27422742 { tag: "enabled", spreadEnabled: true },
27432743 { tag: "disabled", spreadEnabled: false }
27442744 ];
27452745 }
27462746
2747− function test_spreadDisabled(data) {
2747+ function test_spreadDisabled_WithSwipe(data) {
27482748 loadShell("phone");
27492749 swipeAwayGreeter();
27502750 var stage = findChild(shell, "stage");
@@ -2753,9 +2753,20 @@ Rectangle {
27532753 // Try swiping
27542754 touchFlick(shell, shell.width - 2, shell.height / 2, units.gu(1), shell.height / 2);
27552755 tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2756+ }
27562757
2757− stage.closeSpread();
2758− tryCompare(stage, "state", "staged");
2758+ function test_spreadDisabled_WithEdgePush_data() {
2759+ return [
2760+ { tag: "enabled", spreadEnabled: true },
2761+ { tag: "disabled", spreadEnabled: false }
2762+ ];
2763+ }
2764+
2765+ function test_spreadDisabled_WithEdgePush(data) {
2766+ loadShell("phone");
2767+ swipeAwayGreeter();
2768+ var stage = findChild(shell, "stage");
2769+ stage.spreadEnabled = data.spreadEnabled;
27592770
27602771 // Try by edge push
27612772 var cursor = findChild(shell, "cursor");
@@ -2765,18 +2776,40 @@ Rectangle {
27652776 }
27662777 mouseMove(stage, stage.width - units.gu(5), units.gu(10));
27672778 tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2779+ }
27682780
2769− stage.closeSpread();
2770− tryCompare(stage, "state", "staged");
2781+ function test_spreadDisabled_WithAltTab_data() {
2782+ return [
2783+ { tag: "enabled", spreadEnabled: true },
2784+ { tag: "disabled", spreadEnabled: false }
2785+ ];
2786+ }
2787+
2788+ function test_spreadDisabled_WithAltTab(data) {
2789+ loadShell("phone");
2790+ swipeAwayGreeter();
2791+ var stage = findChild(shell, "stage");
2792+ stage.spreadEnabled = data.spreadEnabled;
27712793
27722794 // Try by alt+tab
27732795 keyPress(Qt.Key_Alt);
27742796 keyClick(Qt.Key_Tab);
27752797 tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
27762798 keyRelease(Qt.Key_Alt);
2799+ }
2800+
2801+ function test_spreadDisabled_WithSuperW_data() {
2802+ return [
2803+ { tag: "enabled", spreadEnabled: true },
2804+ { tag: "disabled", spreadEnabled: false }
2805+ ];
2806+ }
27772807
2778− stage.closeSpread();
2779− tryCompare(stage, "state", "staged");
2808+ function test_spreadDisabled_WithSuperW(data) {
2809+ loadShell("phone");
2810+ swipeAwayGreeter();
2811+ var stage = findChild(shell, "stage");
2812+ stage.spreadEnabled = data.spreadEnabled;
27802813
27812814 // Try by Super+W
27822815 keyPress(Qt.Key_W, Qt.MetaModifier)