From f3d156f6a6fb46c78a38fd6493bd3ac084a7cdeb Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Fri, 6 Feb 2026 17:30:45 -0800 Subject: [PATCH 1/2] submit final fix --- .../test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java b/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java index 03d6f463..aacebb70 100644 --- a/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java +++ b/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java @@ -1307,7 +1307,8 @@ private void verifyOrchardFileGenerated(String animalId) private void submitForm(String buttonText, String windowTitle) { //Give time for errors to disappear after validation - longWait().until(ExpectedConditions.invisibilityOfElementWithText(Locator.tag("div"), "The form has the following errors and warnings:")); + Locator.tagContainingText("div", "The form has the following errors and warnings:") + .waitForElementToDisappear(longWait()); Locator submitFinalBtn = Locator.linkWithText(buttonText); shortWait().until(ExpectedConditions.elementToBeClickable(submitFinalBtn)); Window msgWindow; From 66d83d66c77241ec31a8525da00bbc9f471ed718 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Sat, 7 Feb 2026 06:10:34 -0800 Subject: [PATCH 2/2] birth form cleanup --- .../test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java b/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java index aacebb70..00e81d9b 100644 --- a/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java +++ b/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java @@ -582,6 +582,8 @@ public void testBirthForm() births.setGridCellJS(1, "date", now.minusDays(1).format(DateTimeFormatter.ofPattern(DATE_TIME_FORMAT_STRING))); births.setGridCell(1, "Id", bornAnimal); births.setGridCell(1, "cage", "C3"); + births.setGridCell(1, "Id/demographics/species", "Cebus apella CAP"); + births.setGridCell(1, "Id/demographics/gender", "female"); births.setGridCell(1, "project", "795644"); births.setGridCell(1, "birthProtocol", "protocol101"); submitForm("Submit Final", "Finalize");