Merge 25.3 to 25.7

labkey-teamcity · labkey-teamcity · commit 074d8867a8fd · 2025-07-15T19:07:43.000Z
diff --git a/ehr/test/src/org/labkey/test/pages/ehr/NotificationAdminPage.java b/ehr/test/src/org/labkey/test/pages/ehr/NotificationAdminPage.java
@@ -97,7 +97,7 @@ public void clickRunReportInBrowser(String name)
     {
         log("Clicking Run Report in browser for " + name);
         name = name.replace(" ", "");
-        clickAndWait(Locator.tagWithAttributeContaining("a", "href", name).withText("Run Report In Browser"));
+        waitAndClickAndWait(Locator.tagWithAttributeContaining("a", "href", name).withText("Run Report In Browser"));
     }
 
     public void clickManuallyTriggerEmail(String name)

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public void clickRunReportInBrowser(String name)`
`97`	`97`	`{`
`98`	`98`	`log("Clicking Run Report in browser for " + name);`
`99`	`99`	`name = name.replace(" ", "");`
`100`		`- clickAndWait(Locator.tagWithAttributeContaining("a", "href", name).withText("Run Report In Browser"));`
	`100`	`+ waitAndClickAndWait(Locator.tagWithAttributeContaining("a", "href", name).withText("Run Report In Browser"));`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`public void clickManuallyTriggerEmail(String name)`