Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.labkey.test.Locator;
import org.labkey.test.components.Component;
import org.labkey.test.components.WebDriverComponent;
import org.labkey.test.util.selenium.ScrollUtils;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;

Expand Down Expand Up @@ -66,7 +67,8 @@ public boolean isSaveButtonEnabled()
*/
public Object clickSave()
{
getWrapper().clickAndWait(elementCache().saveButton);
// Selenium sometimes doesn't think the save button needs to be scrolled into view but the click does nothing.
getWrapper().clickAndWait(ScrollUtils.scrollIntoView(elementCache().saveButton));
return null;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,12 @@ public T setNameExpression(String nameExpression)
{
expandPropertiesPanel();
elementCache().nameExpressionInput.set(nameExpression);
if (nameExpression.contains("${genId}"))
{
// Wait for genId banner to avoid interfering with subsequent steps by shifting the page layout
// Non-fatal to let specific tests check for this
var _ = WebDriverWrapper.waitFor(this::isGenIdVisible, 1_000);
}
return getThis();
}

Expand Down