Skip to content

Commit 9bcb88e

Browse files
authored
Make LabModuleHelper.getExampleData wait for page to load (#92)
1 parent b6612d2 commit 9bcb88e

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

LDK/test/src/org/labkey/test/util/external/labModules/LabModuleHelper.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -274,11 +274,6 @@ public String clickAndGetExampleData()
274274
return getExampleData(currentWindow);
275275
}
276276

277-
public String getExampleData()
278-
{
279-
return getExampleData(_test.getDriver().getWindowHandle());
280-
}
281-
282277
private String getExampleData(String currentWindow)
283278
{
284279
String ret = null;
@@ -290,9 +285,8 @@ private String getExampleData(String currentWindow)
290285
if (!currentWindow.equals(handle))
291286
{
292287
_test.getDriver().switchTo().window(handle);
293-
String text = getPageText();
294-
ret = StringUtils.trimToNull(text);
295-
Assert.assertNotNull("Unable to retrieve example data", StringUtils.trimToNull(ret));
288+
ret = _test.shortWait().withMessage("Unable to retrieve example data")
289+
.until(wd -> StringUtils.trimToNull(getPageText()));
296290

297291
_test.getDriver().close();
298292
_test.getDriver().switchTo().window(currentWindow);

0 commit comments

Comments
 (0)