Skip to content

Commit 3eb40a0

Browse files
committed
Merge remote-tracking branch 'origin/develop' into fb_csp_issues
2 parents 18e1720 + abecd65 commit 3eb40a0

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

src/org/labkey/test/WebDriverWrapper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2962,10 +2962,11 @@ public void mouseOut()
29622962
catch (WebDriverException ignore) { }
29632963
}
29642964

2965-
public void mouseOver(Locator l)
2965+
public WebElement mouseOver(Locator l)
29662966
{
29672967
WebElement el = l.findElement(getDriver());
29682968
mouseOver(el);
2969+
return el;
29692970
}
29702971

29712972
public void mouseOver(WebElement el)

src/org/labkey/test/tests/SimpleModuleTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import org.labkey.test.params.list.IntListDefinition;
5757
import org.labkey.test.params.list.ListDefinition;
5858
import org.labkey.test.util.DataRegionTable;
59+
import org.labkey.test.util.LabKeyExpectedConditions;
5960
import org.labkey.test.util.LogMethod;
6061
import org.labkey.test.util.LoggedParam;
6162
import org.labkey.test.util.Maps;
@@ -1215,7 +1216,8 @@ private void doTestReportIcon()
12151216
private void doTestReportCreatedDate()
12161217
{
12171218
log("Verify module report \"created\" date");
1218-
click(Locator.tag("span").withClass("fa-list-ul").notHidden());
1219+
WebElement detailsLink = Locator.tag("span").withClass("fa-list-ul").notHidden().findElement(getDriver());
1220+
doAndWaitForPageToLoad(() -> shortWait().until(LabKeyExpectedConditions.clickUntilStale(detailsLink)));
12191221
waitForText("August 01 2015");
12201222
}
12211223

0 commit comments

Comments
 (0)