diff --git a/src/modules/fancyzones/FancyZones.UITests/DragWindowTests.cs b/src/modules/fancyzones/FancyZones.UITests/DragWindowTests.cs index 8e277094fc..3fd5921942 100644 --- a/src/modules/fancyzones/FancyZones.UITests/DragWindowTests.cs +++ b/src/modules/fancyzones/FancyZones.UITests/DragWindowTests.cs @@ -46,14 +46,11 @@ namespace UITests_FancyZones { } - static DragWindowTests() - { - SettingsConfigHelper.ConfigureGlobalModuleSettings("Hosts"); - } - [TestInitialize] public void TestInitialize() { + SettingsConfigHelper.ConfigureGlobalModuleSettings("Hosts"); + // ClearOpenWindows ClearOpenWindows(); @@ -257,7 +254,7 @@ namespace UITests_FancyZones { // press Shift Key to deactivate zones Session.PressKey(Key.Shift); - Task.Delay(500).Wait(); + Task.Delay(1000).Wait(); }, releaseAction: () => { diff --git a/src/modules/fancyzones/FancyZones.UITests/LayoutApplyHotKeyTests.cs b/src/modules/fancyzones/FancyZones.UITests/LayoutApplyHotKeyTests.cs index 8d1dd10c8c..67d9f00290 100644 --- a/src/modules/fancyzones/FancyZones.UITests/LayoutApplyHotKeyTests.cs +++ b/src/modules/fancyzones/FancyZones.UITests/LayoutApplyHotKeyTests.cs @@ -26,11 +26,6 @@ namespace UITests_FancyZones { } - static LayoutApplyHotKeyTests() - { - SettingsConfigHelper.ConfigureGlobalModuleSettings("Hosts"); - } - private static readonly EditorParameters.ParamsWrapper Parameters = new EditorParameters.ParamsWrapper { ProcessId = 1, @@ -222,6 +217,8 @@ namespace UITests_FancyZones [TestInitialize] public void TestInitialize() { + SettingsConfigHelper.ConfigureGlobalModuleSettings("Hosts"); + FancyZonesEditorHelper.Files.Restore(); EditorParameters editorParameters = new EditorParameters(); FancyZonesEditorHelper.Files.ParamsIOHelper.WriteData(editorParameters.Serialize(Parameters)); diff --git a/src/modules/fancyzones/FancyZones.UITests/OneZoneSwitchTests.cs b/src/modules/fancyzones/FancyZones.UITests/OneZoneSwitchTests.cs index b6b0ea9cab..ede38d86d3 100644 --- a/src/modules/fancyzones/FancyZones.UITests/OneZoneSwitchTests.cs +++ b/src/modules/fancyzones/FancyZones.UITests/OneZoneSwitchTests.cs @@ -27,14 +27,11 @@ namespace UITests_FancyZones { } - static OneZoneSwitchTests() - { - SettingsConfigHelper.ConfigureGlobalModuleSettings("Hosts"); - } - [TestInitialize] public void TestInitialize() { + SettingsConfigHelper.ConfigureGlobalModuleSettings("Hosts"); + // kill all processes related to FancyZones Editor to ensure a clean state Session.KillAllProcessesByName("PowerToys.FancyZonesEditor"); AppZoneHistory.DeleteFile();