From 23c253f4ecc79b7d55596572b75210efa65ac699 Mon Sep 17 00:00:00 2001 From: XingY Date: Wed, 17 Sep 2025 16:24:54 -0700 Subject: [PATCH 1/3] Code review changes --- .../test/components/ui/edit/EditInlineField.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/org/labkey/test/components/ui/edit/EditInlineField.java b/src/org/labkey/test/components/ui/edit/EditInlineField.java index 13478d97b5..def1efb178 100644 --- a/src/org/labkey/test/components/ui/edit/EditInlineField.java +++ b/src/org/labkey/test/components/ui/edit/EditInlineField.java @@ -33,14 +33,23 @@ public WebDriver getDriver() return _driver; } - public void setValue(String value) + public void setValue(String value, boolean skipEnter) { open(); WebElement input = elementCache().input; // 'setFormElement' calls 'WebElement.clear()' which can close the edit-in-place input getWrapper().actionClear(input); - input.sendKeys(value, Keys.ENTER); - getWrapper().shortWait().until(ExpectedConditions.stalenessOf(input)); + + if (!skipEnter) + { + input.sendKeys(value, Keys.ENTER); + getWrapper().shortWait().until(ExpectedConditions.stalenessOf(input)); + } + } + + public void setValue(String value) + { + setValue(value, false); } public String getLabel() From d4bed00080ef01182242d9f43f3aa989dce679a7 Mon Sep 17 00:00:00 2001 From: XingY Date: Wed, 17 Sep 2025 16:49:48 -0700 Subject: [PATCH 2/3] set values --- src/org/labkey/test/components/ui/edit/EditInlineField.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/org/labkey/test/components/ui/edit/EditInlineField.java b/src/org/labkey/test/components/ui/edit/EditInlineField.java index def1efb178..b671437b2a 100644 --- a/src/org/labkey/test/components/ui/edit/EditInlineField.java +++ b/src/org/labkey/test/components/ui/edit/EditInlineField.java @@ -40,7 +40,9 @@ public void setValue(String value, boolean skipEnter) // 'setFormElement' calls 'WebElement.clear()' which can close the edit-in-place input getWrapper().actionClear(input); - if (!skipEnter) + if (skipEnter) + input.sendKeys(value); + else { input.sendKeys(value, Keys.ENTER); getWrapper().shortWait().until(ExpectedConditions.stalenessOf(input)); From 9032d0bfdd1a1c97dcd05a4abba3f7843dc50936 Mon Sep 17 00:00:00 2001 From: XingY Date: Wed, 17 Sep 2025 21:59:50 -0700 Subject: [PATCH 3/3] More selenium tests --- src/org/labkey/test/components/react/BaseReactSelect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/components/react/BaseReactSelect.java b/src/org/labkey/test/components/react/BaseReactSelect.java index cc35b0acc6..43aec6e465 100644 --- a/src/org/labkey/test/components/react/BaseReactSelect.java +++ b/src/org/labkey/test/components/react/BaseReactSelect.java @@ -649,7 +649,7 @@ public BaseReactSelectFinder withinFormGroupSkipSelect(String labelText) { _locator = Locator.tagWithClass("div", "form-group") - .withChild(Locator.tag("label").withPredicate("text() = " + Locator.xq(labelText))); + .withChild(Locator.tag("label").withChild(Locator.tagWithText("span", labelText))); return this; }