From f82552b1c44fcff28a33f2c9777219e86ce614b9 Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Fri, 18 Jul 2025 11:12:41 -0700 Subject: [PATCH 1/2] Update DetailTableEdit.clickCancel to wait for the cancel button to go away. --- src/org/labkey/test/components/ui/grids/DetailTableEdit.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org/labkey/test/components/ui/grids/DetailTableEdit.java b/src/org/labkey/test/components/ui/grids/DetailTableEdit.java index f153ac42df..7bf5e6204c 100644 --- a/src/org/labkey/test/components/ui/grids/DetailTableEdit.java +++ b/src/org/labkey/test/components/ui/grids/DetailTableEdit.java @@ -543,6 +543,7 @@ public DetailDataPanel clickCancel() { String title = getSourceTitle(); elementCache().cancelButton.click(); + getWrapper().shortWait().until(ExpectedConditions.stalenessOf(elementCache().cancelButton)); return new DetailDataPanel.DetailDataPanelFinder(getDriver()).withTitle(title).waitFor(); } From 72e97e68fed9ecde0d6bb0577a14fe709994d9e4 Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Fri, 18 Jul 2025 13:41:50 -0700 Subject: [PATCH 2/2] Various other misc fixes. --- .../ui/notifications/ServerNotificationMenu.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/org/labkey/test/components/ui/notifications/ServerNotificationMenu.java b/src/org/labkey/test/components/ui/notifications/ServerNotificationMenu.java index 1ea7e3216d..55b727db29 100644 --- a/src/org/labkey/test/components/ui/notifications/ServerNotificationMenu.java +++ b/src/org/labkey/test/components/ui/notifications/ServerNotificationMenu.java @@ -158,9 +158,9 @@ public void clickMarkAll() public ImportsPage clickViewAll() { expand(); - WebDriverWrapper.waitFor(elementCache().viewAllLink::isDisplayed, + WebDriverWrapper.waitFor(elementCache().viewAllLink()::isDisplayed, "View all link did not become visible.", 2_500); - elementCache().viewAllLink.click(); + elementCache().viewAllLink().click(); return new ImportsPage(getWrapper()); } @@ -278,7 +278,10 @@ public final WebElement markAll() .refindWhenNeeded(elementCache().menuContent); } - public final WebElement viewAllLink = Locator.linkContainingText("View all activity").refindWhenNeeded(this); + public final WebElement viewAllLink() + { + return Locator.linkContainingText("View all activity").refindWhenNeeded(this); + } }