Skip to content

Fix Set Header Values & Consolidate SeleniumExtentions Wait Methods #747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TYLEROL merged 8 commits into from
Feb 6, 2020
Merged

Fix Set Header Values & Consolidate SeleniumExtentions Wait Methods #747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dc842a9
Split Logic for Get & Set Lookup Values in Header or Body by passing …
AngelRodriguez8008 Jan 30, 2020
12c824c
Broke Commit: Refactoring SeleniumExtensions
AngelRodriguez8008 Feb 3, 2020
bf99bf9
Get Field Controls in Context of his Container (ex. Header Flyout), e…
AngelRodriguez8008 Feb 4, 2020
5b95148
Add a Test
AngelRodriguez8008 Feb 4, 2020
50e7223
Fix Bug in Submenu Navigation
AngelRodriguez8008 Feb 6, 2020
659ba0a
Fix XPath for Personal Settings Menu
AngelRodriguez8008 Feb 6, 2020
ee3ba4b
Merge branch 'develop' into users/angel/fixSetHeaderValues
AngelRodriguez8008 Feb 6, 2020
2a45707
Merge branch 'develop' into users/angel/fixSetHeaderValues
AngelRodriguez8008 Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,3 +250,4 @@ paket-files/
# JetBrains Rider
.idea/
*.sln.iml
*.DotSettings
35 changes: 25 additions & 10 deletions Microsoft.Dynamics365.UIAutomation.Api.UCI/DTO/AppElementReference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public static class Entity
public static string LookupFieldResultListItem = "Entity_LookupFieldResultListItem";
public static string LookupFieldHoverExistingValue = "Entity_LookupFieldHoverExistingValue";
public static string LookupResultsDropdown = "Entity_LookupResultsDropdown";
public static string OptionSetFieldContainer = "Entity_OptionSetFieldContainer";
public static string TextFieldLookupFieldContainer = "Entity_TextFieldLookupFieldContainer";
public static string RecordSetNavigator = "Entity_RecordSetNavigator";
public static string RecordSetNavigatorOpen = "Entity_RecordSetNavigatorOpen";
Expand Down Expand Up @@ -116,7 +117,6 @@ public static class Entity
public static string SubGridAddButton = "Entity_SubGridAddButton";
public static string FieldLookupButton = "Entity_FieldLookupButton";
public static string SearchButtonIcon = "Entity_SearchButtonIcon";
public static string EntityHeader = "Entity_Header";
public static string DuplicateDetectionWindowMarker = "Entity_DuplicateDetectionWindowMarker";
public static string DuplicateDetectionGridRows = "Entity_DuplicateDetectionGridRows";
public static string DuplicateDetectionIgnoreAndSaveButton = "Entity_DuplicateDetectionIgnoreAndSaveButton";
Expand All @@ -131,10 +131,18 @@ public static class Entity
public static string EntityOptionsetStatusComboButton = "Entity_OptionsetStatusComboButton";
public static string EntityOptionsetStatusComboList = "Entity_OptionsetStatusComboList";
public static string EntityOptionsetStatusTextValue = "Entity_OptionsetStatusTextValue";
public static string HeaderFlyoutButton = "Entity_HeaderFlyoutButton";


public static class Header
{
public static string Container = "Entity_Header";
public static string Flyout = "Entity_Header_Flyout";
public static string FlyoutButton = "Entity_Header_FlyoutButton";
public static string LookupFieldContainer = "Entity_Header_LookupFieldContainer";
public static string TextFieldContainer = "Entity_Header_TextFieldContainer";
public static string OptionSetFieldContainer = "Entity_Header_OptionSetFieldContainer";
}
}

public static class CommandBar
{
public static string Container = "Cmd_Container";
Expand Down Expand Up @@ -261,8 +269,8 @@ public static class AppElements
{ "App_Shell" , "//*[@id=\"ApplicationShell\"]"},

//Navigation
{ "Nav_AreaButton" , "//button[contains(@data-lp-id,'sitemap-areaBar-more-btn')]"},
{ "Nav_AreaMenu" , "//*[@data-lp-id=\"sitemap-areabar-overflow-flyout\"]"},
{ "Nav_AreaButton" , "//button[@id='areaSwitcherId']"},
{ "Nav_AreaMenu" , "//*[@data-lp-id='sitemap-area-switcher-flyout']"},
{ "Nav_AreaMoreMenu" , "//ul[@role=\"menubar\"]"},
{ "Nav_SubAreaContainer" , "//*[@data-id=\"navbar-container\"]/div/ul"},
{ "Nav_WebAppMenuButton" , "//*[@id=\"TabArrowDivider\"]/a"},
Expand All @@ -272,8 +280,8 @@ public static class AppElements
{ "Nav_SiteMapAreaMoreButton", "//button[@data-lp-id=\"sitemap-areaBar-more-btn\"]" },
{ "Nav_SiteMapSingleArea", "//li[translate(@data-text,'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz') = '[NAME]']" },
{ "Nav_AppMenuContainer" , "//*[@id=\"taskpane-scroll-container\"]"},
{ "Nav_SettingsLauncherBar" , "//*[@id=\"[NAME]Launcher_buttonaction-bar\"]"},
{ "Nav_SettingsLauncher" , "//*[@id=\"[NAME]Launcher\"]"},
{ "Nav_SettingsLauncherBar" , "//*[@data-id='[NAME]Launcher']"},
{ "Nav_SettingsLauncher" , "//*[@data-id='[NAME]']"},
{ "Nav_GuidedHelp" , "//*[@id=\"helpLauncher\"]/button"},
//{ "Nav_AdminPortal" , "//*[@id=(\"id-5\")]"},
{ "Nav_AdminPortal" , "//*[contains(@data-id,'officewaffle')]"},
Expand Down Expand Up @@ -361,7 +369,6 @@ public static class AppElements
{ "Entity_SubGridAddButton", "//button[contains(@data-id,'[NAME].AddNewStandard')]/parent::li/parent::ul[contains(@data-lp-id, 'commandbar-SubGridStandard:[NAME]')]" },
{ "Entity_FieldLookupButton","//button[contains(@data-id,'[NAME]_search')]" },
{ "Entity_SearchButtonIcon", "//span[contains(@data-id,'microsoftIcon_searchButton')]" },
{ "Entity_Header", "//div[contains(@data-id,'form-header')]"},
{ "Entity_DuplicateDetectionWindowMarker","//div[contains(@data-id,'ManageDuplicates')]"},
{ "Entity_DuplicateDetectionGridRows", "//div[contains(@class,'data-selectable')]" },
{ "Entity_DuplicateDetectionIgnoreAndSaveButton", "//button[contains(@data-id,'ignore_save')]"},
Expand All @@ -372,11 +379,19 @@ public static class AppElements
{ "Entity_BooleanFieldCheckboxContainer", "//div[contains(@data-id, '[NAME].fieldControl-checkbox-container')]"},
{ "Entity_BooleanFieldCheckbox", "//input[contains(@data-id, '[NAME].fieldControl-checkbox-toggle')]"},
{ "Entity_BooleanFieldList", "//select[contains(@data-id, '[NAME].fieldControl-checkbox-select')]"},
{ "Entity_OptionSetFieldContainer", "//div[@data-id='[NAME].fieldControl-option-set-container']" },
{ "Entity_OptionsetStatusCombo", "//div[contains(@data-id, '[NAME].fieldControl-pickliststatus-comboBox')]"},
{ "Entity_OptionsetStatusComboButton", "//div[contains(@id, '[NAME].fieldControl-pickliststatus-comboBox_button')]"},
{ "Entity_OptionsetStatusComboList", "//ul[contains(@id, '[NAME].fieldControl-pickliststatus-comboBox_list')]"},
{ "Entity_OptionsetStatusTextValue", "//span[contains(@id, '[NAME].fieldControl-pickliststatus-comboBox_text-value')]"},
{ "Entity_HeaderFlyoutButton","//button[contains(@id,'headerFieldsExpandButton')]" },

//Entity Header
{ "Entity_Header", "//div[contains(@data-id,'form-header')]"},
{ "Entity_Header_Flyout","//div[@data-id='headerFieldsFlyout']" },
{ "Entity_Header_FlyoutButton","//button[contains(@id,'headerFieldsExpandButton')]" },
{ "Entity_Header_LookupFieldContainer", "//div[@data-id='header_[NAME].fieldControl-Lookup_[NAME]']" },
{ "Entity_Header_TextFieldContainer", "//div[@data-id='header_[NAME].fieldControl-text-box-container']" },
{ "Entity_Header_OptionSetFieldContainer", "//div[@data-id='header_[NAME].fieldControl-option-set-container']" },

//CommandBar
{ "Cmd_Container" , "//ul[contains(@data-lp-id,\"commandbar-Form\")]"},
Expand Down
18 changes: 18 additions & 0 deletions Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Navigation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,24 @@ public void OpenGroupSubArea(string group, string subarea)
{
_client.OpenGroupSubArea(group, subarea);
}

/// <summary>
/// Opens a area in the unified client
/// </summary>
/// <param name="area">Name of the area</param>
public void OpenArea(string area)
{
_client.OpenArea(area);
}

/// <summary>
/// Opens a sub area in the unified client
/// </summary>
/// <param name="area">Name of the area</param>
public void OpenSubArea(string area)
{
_client.OpenSubArea(area);
}

/// <summary>
/// Opens a sub area in the unified client
Expand Down
Loading