From 6151e8aaa5feb374b021908af3493c62cbc59704 Mon Sep 17 00:00:00 2001 From: cnathe Date: Mon, 4 Apr 2022 13:13:57 -0500 Subject: [PATCH 1/3] App grid change from "Grid Views" to "Views" button text --- src/org/labkey/test/components/ui/grids/GridBar.java | 4 ++-- src/org/labkey/test/components/ui/grids/QueryGrid.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/labkey/test/components/ui/grids/GridBar.java b/src/org/labkey/test/components/ui/grids/GridBar.java index c842c73907..ce8b92bc79 100644 --- a/src/org/labkey/test/components/ui/grids/GridBar.java +++ b/src/org/labkey/test/components/ui/grids/GridBar.java @@ -435,8 +435,8 @@ static public Locator.XPathLocator gridBar() } static final Locator.XPathLocator viewSelectorButtonGroup = Locator.tagWithClass("div", "dropdown") - .withChild(Locator.button("Grid Views")); - static final Locator.XPathLocator viewSelectorToggleButton = Locator.button("Grid Views"); + .withChild(Locator.button("Views")); + static final Locator.XPathLocator viewSelectorToggleButton = Locator.button("Views"); static final Locator viewSelectorMenu = Locator.tagWithAttributeContaining("ul", "aria-labelledby", "viewselector"); } diff --git a/src/org/labkey/test/components/ui/grids/QueryGrid.java b/src/org/labkey/test/components/ui/grids/QueryGrid.java index 4bd3deba04..bfa2073cd7 100644 --- a/src/org/labkey/test/components/ui/grids/QueryGrid.java +++ b/src/org/labkey/test/components/ui/grids/QueryGrid.java @@ -299,7 +299,7 @@ public QueryGrid clearAllSelections() public QueryGrid selectView(String viewName) { doAndWaitForUpdate(()-> - getGridBar().doMenuAction("Grid Views", Arrays.asList(viewName))); + getGridBar().doMenuAction("Views", Arrays.asList(viewName))); return this; } From 5afdb4ee9e8ec2b322a809329a6ac2884e77b2d9 Mon Sep 17 00:00:00 2001 From: cnathe Date: Wed, 6 Apr 2022 15:13:09 -0500 Subject: [PATCH 2/3] Test changes for app grid views button changes to icon only --- src/org/labkey/test/components/ui/grids/GridBar.java | 5 ----- src/org/labkey/test/components/ui/grids/QueryGrid.java | 10 +++++++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/org/labkey/test/components/ui/grids/GridBar.java b/src/org/labkey/test/components/ui/grids/GridBar.java index ce8b92bc79..a03048b4c7 100644 --- a/src/org/labkey/test/components/ui/grids/GridBar.java +++ b/src/org/labkey/test/components/ui/grids/GridBar.java @@ -433,11 +433,6 @@ static public Locator.XPathLocator gridBar() return Locator.XPathLocator.union(Locator.tagWithClassContaining("div", "query-grid-bar"), Locator.tagWithClassContaining("div", "grid-panel__button-bar")); } - - static final Locator.XPathLocator viewSelectorButtonGroup = Locator.tagWithClass("div", "dropdown") - .withChild(Locator.button("Views")); - static final Locator.XPathLocator viewSelectorToggleButton = Locator.button("Views"); - static final Locator viewSelectorMenu = Locator.tagWithAttributeContaining("ul", "aria-labelledby", "viewselector"); } public static class GridBarFinder extends ComponentFinder diff --git a/src/org/labkey/test/components/ui/grids/QueryGrid.java b/src/org/labkey/test/components/ui/grids/QueryGrid.java index bfa2073cd7..05e7a88c42 100644 --- a/src/org/labkey/test/components/ui/grids/QueryGrid.java +++ b/src/org/labkey/test/components/ui/grids/QueryGrid.java @@ -15,7 +15,6 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.ExpectedConditions; -import java.util.Arrays; import java.util.Map; import java.util.Optional; @@ -298,8 +297,13 @@ public QueryGrid clearAllSelections() // select view public QueryGrid selectView(String viewName) { - doAndWaitForUpdate(()-> - getGridBar().doMenuAction("Views", Arrays.asList(viewName))); + WebElement viewBtn = Locator.tagWithClass("span", "fa-table").findElement(this); + viewBtn.click(); + + WebElement viewMenuItem = Locator.tagWithClass("ul", "dropdown-menu") + .child(Locator.tagWithText("li", viewName)) + .findElement(this); + doAndWaitForUpdate(viewMenuItem::click); return this; } From bb4f112d11d856cd23bbd45000d56eaa9c653300 Mon Sep 17 00:00:00 2001 From: cnathe Date: Thu, 7 Apr 2022 08:30:58 -0500 Subject: [PATCH 3/3] Chart button fixes to use cls instead of button text --- src/org/labkey/test/components/react/MultiMenu.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/org/labkey/test/components/react/MultiMenu.java b/src/org/labkey/test/components/react/MultiMenu.java index 11a366d20e..e625ee12b7 100644 --- a/src/org/labkey/test/components/react/MultiMenu.java +++ b/src/org/labkey/test/components/react/MultiMenu.java @@ -215,6 +215,12 @@ public MultiMenuFinder withButtonId(String id) return this; } + public MultiMenuFinder withButtonClass(String cls) + { + _locator = Locators.menuContainer().withChild(Locator.tagWithClass("button", cls)); + return this; + } + /** * Looks for the export button using the fa-download class * @return export menu utility