From 83918e3719216501f1cc75153f16a2f8dde3509a Mon Sep 17 00:00:00 2001 From: Dan Duffek Date: Thu, 2 Apr 2026 07:58:08 -0700 Subject: [PATCH 1/2] Fix PortTab helper. (#2929) --- src/org/labkey/test/components/labkey/PortalTab.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/components/labkey/PortalTab.java b/src/org/labkey/test/components/labkey/PortalTab.java index 8a66c9dcc0..50ec8fd682 100644 --- a/src/org/labkey/test/components/labkey/PortalTab.java +++ b/src/org/labkey/test/components/labkey/PortalTab.java @@ -222,7 +222,7 @@ static public Locator.XPathLocator tabIdLoc(String tabText) } static public Locator.XPathLocator container = Locator.tagWithClass("ul", "lk-nav-tabs"); - static public Locator.XPathLocator tabItem = Locator.xpath("//li[@role='presentation']"); + static public Locator.XPathLocator tabItem = Locator.xpath("//li"); static public Locator.XPathLocator subContainerTabSelect = Locator.tagWithAttribute("select", "title", "subContainerTabs"); static public Locator.XPathLocator tabList = container.append(tabItem); From 6e1d80dbb36c9fc1d9211f5fc2661e07b2e10375 Mon Sep 17 00:00:00 2001 From: Dan Duffek Date: Fri, 3 Apr 2026 10:37:40 -0700 Subject: [PATCH 2/2] Change the xpath used to find tabs. (#2932) --- src/org/labkey/test/components/labkey/PortalTab.java | 2 +- src/org/labkey/test/util/PortalHelper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/labkey/test/components/labkey/PortalTab.java b/src/org/labkey/test/components/labkey/PortalTab.java index 50ec8fd682..ef5a78760f 100644 --- a/src/org/labkey/test/components/labkey/PortalTab.java +++ b/src/org/labkey/test/components/labkey/PortalTab.java @@ -222,7 +222,7 @@ static public Locator.XPathLocator tabIdLoc(String tabText) } static public Locator.XPathLocator container = Locator.tagWithClass("ul", "lk-nav-tabs"); - static public Locator.XPathLocator tabItem = Locator.xpath("//li"); + static public Locator.XPathLocator tabItem = Locator.xpath("/li"); static public Locator.XPathLocator subContainerTabSelect = Locator.tagWithAttribute("select", "title", "subContainerTabs"); static public Locator.XPathLocator tabList = container.append(tabItem); diff --git a/src/org/labkey/test/util/PortalHelper.java b/src/org/labkey/test/util/PortalHelper.java index e974dcb346..43bb628f0e 100644 --- a/src/org/labkey/test/util/PortalHelper.java +++ b/src/org/labkey/test/util/PortalHelper.java @@ -87,7 +87,7 @@ public void moveTab(@LoggedParam String tabText, @LoggedParam Direction directio throw new IllegalArgumentException("Can't move folder tabs vertically."); String tabId = tabText.replace(" ", "") + "Tab"; - Locator.XPathLocator tabList = Locator.xpath("//ul[contains(@class, 'lk-nav-tabs-admin')]//li[@role='presentation']"); + Locator.XPathLocator tabList = Locator.xpath("//ul[contains(@class, 'lk-nav-tabs-admin')]/li"); Locator.XPathLocator tabLink = Locator.xpath("//a[@id=" + Locator.xq(tabId) + "]"); int tabCount = getElementCount(tabList) - 1;