diff --git a/src/org/labkey/test/components/react/BaseReactSelect.java b/src/org/labkey/test/components/react/BaseReactSelect.java index f505fd6136..905d53b5c0 100644 --- a/src/org/labkey/test/components/react/BaseReactSelect.java +++ b/src/org/labkey/test/components/react/BaseReactSelect.java @@ -255,10 +255,15 @@ public T removeSelection(String value) scrollIntoView(); - var removeBtn = Locators.removeMultiSelectValueButton(value).waitForElement(getComponentElement(), 1_500); + WebElement removeBtn = Locators.removeMultiSelectValueButton(value).findWhenNeeded(getComponentElement()); removeBtn.click(); + getWrapper().shortWait().until(ExpectedConditions.stalenessOf(removeBtn)); + // Validate that the selected item really was removed. + WebDriverWrapper.sleep(500); + waitFor(()->!getSelections().contains(value), String.format("Failed to remove selection '%s'.", value), WAIT_FOR_JAVASCRIPT); + return getThis(); }