From 933209c2ccf61965a474249b5607b0475d3d5262 Mon Sep 17 00:00:00 2001 From: Daria Bodiakova <70635654+DariaBod@users.noreply.github.com> Date: Mon, 4 May 2026 10:33:13 -0700 Subject: [PATCH 1/2] change help target xpath --- .../test/components/ui/domainproperties/EntityTypeDesigner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/components/ui/domainproperties/EntityTypeDesigner.java b/src/org/labkey/test/components/ui/domainproperties/EntityTypeDesigner.java index e69e56a5ca..bb21ed9477 100644 --- a/src/org/labkey/test/components/ui/domainproperties/EntityTypeDesigner.java +++ b/src/org/labkey/test/components/ui/domainproperties/EntityTypeDesigner.java @@ -436,7 +436,7 @@ Optional optionalWarningAlert() public final WebElement helpTarget(String divLabelText) { - return Locator.xpath(String.format("//span[text()='%s']//div[@class='overlay-trigger']", divLabelText)).findWhenNeeded(this); + return Locator.xpath(String.format("//div[text()='%s']//div[@class='overlay-trigger']", divLabelText)).findWhenNeeded(this); } // Tool tips exist on the page, outside the scope of the domainDesigner, so scope the search accordingly. From 1f0ebe7ac94756cee588332c616008541d5ed6d4 Mon Sep 17 00:00:00 2001 From: Daria Bodiakova <70635654+DariaBod@users.noreply.github.com> Date: Mon, 4 May 2026 13:27:26 -0700 Subject: [PATCH 2/2] xpath depends on page --- .../components/ui/domainproperties/EntityTypeDesigner.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/labkey/test/components/ui/domainproperties/EntityTypeDesigner.java b/src/org/labkey/test/components/ui/domainproperties/EntityTypeDesigner.java index bb21ed9477..180b73ab91 100644 --- a/src/org/labkey/test/components/ui/domainproperties/EntityTypeDesigner.java +++ b/src/org/labkey/test/components/ui/domainproperties/EntityTypeDesigner.java @@ -436,7 +436,8 @@ Optional optionalWarningAlert() public final WebElement helpTarget(String divLabelText) { - return Locator.xpath(String.format("//div[text()='%s']//div[@class='overlay-trigger']", divLabelText)).findWhenNeeded(this); + String element = getThis().getClass().getSimpleName().contains("SampleType")? "div" : "span"; + return Locator.xpath(String.format("//%s[text()='%s']//div[@class='overlay-trigger']", element, divLabelText)).findWhenNeeded(this); } // Tool tips exist on the page, outside the scope of the domainDesigner, so scope the search accordingly.