Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/org/labkey/test/components/ui/grids/EditableGrid.java
Original file line number Diff line number Diff line change
Expand Up @@ -1032,13 +1032,15 @@ public void dragFill(WebElement selectStart, WebElement selectEnd, WebElement dr
{
Locator.XPathLocator selectionHandleLoc = Locator.byClass("cell-selection-handle");
selectCellRange(selectStart, selectEnd);
selectEnd.click();
String fillValue = getCellValue(selectEnd);
WebElement selectionHandle = selectionHandleLoc.waitForElement(getComponentElement(), 2_000);
dragToCell(selectionHandle, dragEnd);
if (!WebDriverWrapper.waitFor(() -> fillValue.equals(getCellValue(dragEnd)), 3_000))
{
// Fill didn't complete — the drag likely extended the selection without triggering the fill.
selectCellRange(selectStart, selectEnd);
selectEnd.click();
selectionHandle = selectionHandleLoc.waitForElement(getComponentElement(), 2_000);
dragToCell(selectionHandle, dragEnd);
WebDriverWrapper.waitFor(() -> fillValue.equals(getCellValue(dragEnd)),
Expand Down
4 changes: 2 additions & 2 deletions src/org/labkey/test/pages/study/DatasetDesignerPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,8 @@ protected Locator dataRowRadioBtn(Integer index)

protected FilteringReactSelect columnMapSelect(String labelText)
{ // find the row with the specified label span, then get the select in it
WebElement container = Locator.tag("div").withChild(Locator.tag("div")
.withChild(Locator.tagWithClass("span", "domain-no-wrap").withText(labelText)))
WebElement container = Locator.tag("div").withChild(Locator.tag("div").withChild(Locator.tag("span")
.withChild(Locator.tagWithClass("span", "domain-no-wrap").withText(labelText))))
.waitForElement(fieldsPanel, 2000);
return FilteringReactSelect.finder(getDriver()).find(container);
}
Expand Down