Skip to content

Commit cc3f578

Browse files
committed
publish with selenium fixes
1 parent d4dcfc2 commit cc3f578

5 files changed

Lines changed: 36 additions & 11 deletions

File tree

EHR_App/test/src/org/labkey/test/pages/ReactAnimalHistoryPage.java

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.labkey.test.util.DataRegionTable;
88
import org.openqa.selenium.WebDriver;
99
import org.openqa.selenium.WebElement;
10+
import org.openqa.selenium.TimeoutException;
1011
import org.openqa.selenium.support.ui.ExpectedConditions;
1112

1213
import java.util.Optional;
@@ -298,15 +299,31 @@ public boolean isAliveAtCenterButtonPresent()
298299
*/
299300
public boolean isNotFoundSectionPresent()
300301
{
301-
return isElementPresent(Locators.NOT_FOUND_SECTION_TITLE);
302+
try
303+
{
304+
waitForElement(Locators.NOT_FOUND_SECTION_TITLE, 2000);
305+
return true;
306+
}
307+
catch (TimeoutException ignored)
308+
{
309+
return false;
310+
}
302311
}
303312

304313
/**
305314
* Check if a specific item is in the not-found list.
306315
*/
307316
public boolean hasNotFoundItem(String item)
308317
{
309-
return isElementPresent(Locators.NOT_FOUND_ITEMS.withText(item));
318+
try
319+
{
320+
waitForElement(Locators.NOT_FOUND_ITEMS.withText(item), 2000);
321+
return true;
322+
}
323+
catch (TimeoutException ignored)
324+
{
325+
return false;
326+
}
310327
}
311328

312329
/**
@@ -346,7 +363,15 @@ public boolean isAliveAtCenterEnabled()
346363
*/
347364
public boolean isIdResolutionFeedbackVisible()
348365
{
349-
return isElementPresent(Locators.ID_RESOLUTION_FEEDBACK);
366+
try
367+
{
368+
waitForElement(Locators.ID_RESOLUTION_FEEDBACK, 2000);
369+
return true;
370+
}
371+
catch (TimeoutException ignored)
372+
{
373+
return false;
374+
}
350375
}
351376

352377
/**

ehr/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ehr/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"dependencies": {
1818
"@labkey/api": "1.45.0",
1919
"@labkey/components": "7.13.1",
20-
"@labkey/ehr": "0.0.4-fb-ehr-hist-id-search.15"
20+
"@labkey/ehr": "0.0.4-fb-ehr-hist-id-search.16"
2121
},
2222
"devDependencies": {
2323
"@labkey/build": "8.7.0",

labkey-ui-ehr/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

labkey-ui-ehr/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@labkey/ehr",
3-
"version": "0.0.4-fb-ehr-hist-id-search.15",
3+
"version": "0.0.4-fb-ehr-hist-id-search.16",
44
"description": "Components, models, actions, and utility functions for LabKey EHR applications and pages",
55
"sideEffects": false,
66
"files": [

0 commit comments

Comments
 (0)