Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-02-24 04:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename

Browse Source
This commit is contained in:
seraphima
2024-03-12 20:23:14 +01:00
parent d813b63432
commit 80a5d43810
4 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/fancyzones/UITests-FancyZonesEditor/CopyLayoutTests.cs
View File

@@ -207,7 +207,7 @@ namespace Microsoft.FancyZonesEditor.UITests
public void CopyTemplate_FromContextMenu()
{
string copiedLayoutName = Constants.TemplateLayoutNames[Constants.TemplateLayouts.Rows] + " (1)";
_session?.Click_ContextMenuItem(Constants.TemplateLayoutNames[Constants.TemplateLayouts.Rows], "Create custom layout");
_session?.ClickContextMenuItem(Constants.TemplateLayoutNames[Constants.TemplateLayouts.Rows], "Create custom layout");
// verify the layout is copied
_session?.WaitElementDisplayedByName(copiedLayoutName);
@@ -274,7 +274,7 @@ namespace Microsoft.FancyZonesEditor.UITests
public void CopyCustomLayout_FromContextMenu()
{
string copiedLayoutName = CustomLayouts.CustomLayouts[0].Name + " (1)";
_session?.Click_ContextMenuItem(CustomLayouts.CustomLayouts[0].Name, "Duplicate");
_session?.ClickContextMenuItem(CustomLayouts.CustomLayouts[0].Name, "Duplicate");
// verify the layout is copied
_session?.WaitElementDisplayedByName(copiedLayoutName);

18
src/modules/fancyzones/UITests-FancyZonesEditor/DeleteLayoutTests.cs
View File

@@ -233,7 +233,7 @@ namespace Microsoft.FancyZonesEditor.UITests
var deletedLayout = CustomLayouts.CustomLayouts[1].Name;
_session?.ClickEditLayout(deletedLayout);
_session?.ClickDeleteLayout();
_session?.ClickConfirmDeletion();
_session?.ClickConfirmDialog();
_session?.WaitFor(1);
// verify the layout is removed
@@ -252,7 +252,7 @@ namespace Microsoft.FancyZonesEditor.UITests
var deletedLayout = CustomLayouts.CustomLayouts[0].Name;
_session?.ClickEditLayout(deletedLayout);
_session?.ClickDeleteLayout();
_session?.ClickConfirmDeletion();
_session?.ClickConfirmDialog();
_session?.WaitFor(1);
// verify the layout is removed
@@ -278,7 +278,7 @@ namespace Microsoft.FancyZonesEditor.UITests
var deletedLayout = CustomLayouts.CustomLayouts[1].Name;
_session?.ClickEditLayout(deletedLayout);
_session?.ClickDeleteLayout();
_session?.ClickCancelDeletion();
_session?.ClickCancelDialog();
_session?.WaitFor(1);
// verify the layout is not removed
@@ -295,8 +295,8 @@ namespace Microsoft.FancyZonesEditor.UITests
public void DeleteFromContextMenu()
{
var deletedLayout = CustomLayouts.CustomLayouts[1].Name;
_session?.Click_ContextMenuItem(deletedLayout, "Delete");
_session?.ClickConfirmDeletion();
_session?.ClickContextMenuItem(deletedLayout, "Delete");
_session?.ClickConfirmDialog();
_session?.WaitFor(1);
// verify the layout is removed
@@ -313,8 +313,8 @@ namespace Microsoft.FancyZonesEditor.UITests
public void DeleteDefaultLayout()
{
var deletedLayout = CustomLayouts.CustomLayouts[1].Name;
_session?.Click_ContextMenuItem(deletedLayout, "Delete");
_session?.ClickConfirmDeletion();
_session?.ClickContextMenuItem(deletedLayout, "Delete");
_session?.ClickConfirmDialog();
_session?.WaitFor(1);
// verify the default layout is reset to the "default" default
@@ -333,8 +333,8 @@ namespace Microsoft.FancyZonesEditor.UITests
public void DeleteLayoutWithHotkey()
{
var deletedLayout = CustomLayouts.CustomLayouts[1].Name;
_session?.Click_ContextMenuItem(deletedLayout, "Delete");
_session?.ClickConfirmDeletion();
_session?.ClickContextMenuItem(deletedLayout, "Delete");
_session?.ClickConfirmDialog();
_session?.WaitFor(1);
// verify the hotkey is available

4
src/modules/fancyzones/UITests-FancyZonesEditor/RunFancyZonesEditorTest.cs
View File

@@ -201,7 +201,7 @@ namespace Microsoft.FancyZonesEditor.UITests
[TestMethod]
public void OpenEditLayoutDialog_ByContextMenu_TemplateLayout() // verify the edit layout dialog is opened
{
_session?.Click_ContextMenuItem(Constants.TemplateLayoutNames[Constants.TemplateLayouts.Grid], "Edit");
_session?.ClickContextMenuItem(Constants.TemplateLayoutNames[Constants.TemplateLayouts.Grid], "Edit");
Assert.IsNotNull(_session?.Session?.FindElementByAccessibilityId("EditLayoutDialogTitle")); // check the pane header
Assert.IsNotNull(_session?.Session?.FindElementsByName("Edit 'Grid'")); // verify it's opened for the correct layout
}
@@ -209,7 +209,7 @@ namespace Microsoft.FancyZonesEditor.UITests
[TestMethod]
public void OpenEditLayoutDialog_ByContextMenu_CustomLayout() // verify the edit layout dialog is opened
{
_session?.Click_ContextMenuItem("Custom layout", "Edit");
_session?.ClickContextMenuItem("Custom layout", "Edit");
Assert.IsNotNull(_session?.Session?.FindElementByAccessibilityId("EditLayoutDialogTitle")); // check the pane header
Assert.IsNotNull(_session?.Session?.FindElementsByName("Edit 'Grid'")); // verify it's opened for the correct layout
}

35
src/modules/fancyzones/UITests-FancyZonesEditor/Utils/FancyZonesEditorSession.cs
View File

@@ -345,31 +345,50 @@ namespace Microsoft.FancyZonesEditor.UnitTests.Utils
button?.Click();
}
public void ClickConfirmDeletion()
public void ClickConfirm()
{
WaitElementDisplayedById(AccessibilityId.PrimaryButton);
WindowsElement? button = Session?.FindElementByAccessibilityId(AccessibilityId.PrimaryButton);
button?.Click();
WaitUntilHidden(button!);
}
public void ClickConfirmDialog()
{
// WaitElementDisplayedById(AccessibilityId.PrimaryButton);
// WindowsElement? button = Session?.FindElementByAccessibilityId(AccessibilityId.PrimaryButton);
// button?.Click(); - doesn't work
Actions actions = new Actions(Session);
actions.SendKeys(Keys.Tab).SendKeys(Keys.Enter);
actions.Build().Perform();
// WaitUntilHidden(button!);
}
public void ClickCancelDeletion()
public void ClickCancelDialog()
{
Actions actions = new Actions(Session);
actions.SendKeys(Keys.Tab).SendKeys(Keys.Tab).SendKeys(Keys.Enter);
actions.Build().Perform();
}
public void Click_ContextMenuItem(string layoutName, string menuItem)
public void ClickContextMenuItem(string layoutName, string menuItem)
{
WindowsElement menu = OpenContextMenu(layoutName);
Click(menu.FindElementByName(menuItem));
}
public void SelectNewLayoutType(Constants.CustomLayoutType type)
{
WindowsElement? button = null;
switch (type)
{
case Constants.CustomLayoutType.Canvas:
button = FindByAccessibilityId(AccessibilityId.CanvasRadioButton);
break;
case Constants.CustomLayoutType.Grid:
button = FindByAccessibilityId(AccessibilityId.GridRadioButton);
break;
}
Click(button!);
}
private WindowsElement? FindByAccessibilityId(string name)
{
try