on xenial help sign in
Fixed failing tests
aeabf2cBrian Douglass
tests/qmltests/tst_Shell.qml+7−5
@@ -2715,14 +2715,16 @@ Rectangle {
2715 tryCompareFunction(function() { return ApplicationManager.focusedApplicationId; }, "calendar-app");
2715 tryCompareFunction(function() { return ApplicationManager.focusedApplicationId; }, "calendar-app");
2716 }
2716 }
2717
2717
2718− function test_enableLauncher_data() {
2718+ function test_launcherEnabledSetting_data() {
2719 return [
2719 return [
2720− {tag: "enabled", enabled: true},
2720+ {tag: "launcher enabled", enabled: true},
2721− {tag: "disabled", enabled: false}
2721+ {tag: "launcher disabled", enabled: false}
2722− ];
2722+ ]
2723 }
2723 }
2724
2724
2725− function test_enableLauncher(data) {
2725+ function test_launcherEnabledSetting(data) {
2726+ loadShell("phone");
2727+
2726 GSettingsController.setEnableLauncher(data.enabled);
2728 GSettingsController.setEnableLauncher(data.enabled);
2727
2729
2728 var launcher = findChild(shell, "launcher");
2730 var launcher = findChild(shell, "launcher");