Merge 26.3 to develop

Author: labkey-teamcity

snprc_ehr/test/src/org/labkey/test/tests/snprc_ehr/SNPRC_EHRTest.java

@@ -447,7 +447,10 @@ public void testFileRepository()
         waitForElement(Ext4Helper.Locators.ext4Button("Create Folders"));
         click(Ext4Helper.Locators.ext4Button("Create Folders"));
 
-        waitForText("Anesthesia Reports", "Cardiology Docs", "Dental Records", "Images", "Lab Reports", "Misc Docs", "Pathology Reports", "Procurement Docs", "Radiology Reports", "Surgery Sheets");
+        waitForTextToDisappear("No directory found for this animal. To upload files, you must create the folders first.");
+        waitForTextToDisappear("Loading...");
+        waitForText(WAIT_FOR_PAGE * 2, "Anesthesia Reports");
+        assertTextPresent("Anesthesia Reports", "Cardiology Docs", "Dental Records", "Images", "Lab Reports", "Misc Docs", "Pathology Reports", "Procurement Docs", "Radiology Reports", "Surgery Sheets");
 
     }