@@ -2734,14 +2734,14 @@ Rectangle {
27342734 GSettingsController.setEnableIndicatorMenu(true);
27352735 }
27362736
2737− function test_spreadDisabled_data() {
2737+ function test_spreadDisabled_WithSwipe_data() {
27382738 return [
27392739 { tag: "enabled", spreadEnabled: true },
27402740 { tag: "disabled", spreadEnabled: false }
27412741 ];
27422742 }
27432743
2744− function test_spreadDisabled(data) {
2744+ function test_spreadDisabled_WithSwipe(data) {
27452745 loadShell("phone");
27462746 swipeAwayGreeter();
27472747 var stage = findChild(shell, "stage");
@@ -2750,9 +2750,20 @@ Rectangle {
27502750 // Try swiping
27512751 touchFlick(shell, shell.width - 2, shell.height / 2, units.gu(1), shell.height / 2);
27522752 tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2753+ }
27532754
2754− stage.closeSpread();
2755− tryCompare(stage, "state", "staged");
2755+ function test_spreadDisabled_WithEdgePush_data() {
2756+ return [
2757+ { tag: "enabled", spreadEnabled: true },
2758+ { tag: "disabled", spreadEnabled: false }
2759+ ];
2760+ }
2761+
2762+ function test_spreadDisabled_WithEdgePush(data) {
2763+ loadShell("phone");
2764+ swipeAwayGreeter();
2765+ var stage = findChild(shell, "stage");
2766+ stage.spreadEnabled = data.spreadEnabled;
27562767
27572768 // Try by edge push
27582769 var cursor = findChild(shell, "cursor");
@@ -2762,18 +2773,40 @@ Rectangle {
27622773 }
27632774 mouseMove(stage, stage.width - units.gu(5), units.gu(10));
27642775 tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2776+ }
27652777
2766− stage.closeSpread();
2767− tryCompare(stage, "state", "staged");
2778+ function test_spreadDisabled_WithAltTab_data() {
2779+ return [
2780+ { tag: "enabled", spreadEnabled: true },
2781+ { tag: "disabled", spreadEnabled: false }
2782+ ];
2783+ }
2784+
2785+ function test_spreadDisabled_WithAltTab(data) {
2786+ loadShell("phone");
2787+ swipeAwayGreeter();
2788+ var stage = findChild(shell, "stage");
2789+ stage.spreadEnabled = data.spreadEnabled;
27682790
27692791 // Try by alt+tab
27702792 keyPress(Qt.Key_Alt);
27712793 keyClick(Qt.Key_Tab);
27722794 tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
27732795 keyRelease(Qt.Key_Alt);
2796+ }
2797+
2798+ function test_spreadDisabled_WithSuperW_data() {
2799+ return [
2800+ { tag: "enabled", spreadEnabled: true },
2801+ { tag: "disabled", spreadEnabled: false }
2802+ ];
2803+ }
27742804
2775− stage.closeSpread();
2776− tryCompare(stage, "state", "staged");
2805+ function test_spreadDisabled_WithSuperW(data) {
2806+ loadShell("phone");
2807+ swipeAwayGreeter();
2808+ var stage = findChild(shell, "stage");
2809+ stage.spreadEnabled = data.spreadEnabled;
27772810
27782811 // Try by Super+W
27792812 keyPress(Qt.Key_W, Qt.MetaModifier, 200);