Merge 25.3 to 25.7

labkey-teamcity · labkey-teamcity · commit 04455f17eecc · 2025-08-11T01:51:02.000Z
diff --git a/ehr/test/src/org/labkey/test/pages/ehr/ParticipantViewPage.java b/ehr/test/src/org/labkey/test/pages/ehr/ParticipantViewPage.java
@@ -115,7 +115,7 @@ public ParticipantViewPage clickReportTab(String reportLabel)
 
     public WebElement getActiveReportPanel()
     {
-        return activeReportPanel.findElementOrNull(getDriver());
+        return activeReportPanel.waitForElement(getDriver(), 2_000);
     }
 
     public DataRegionTable getActiveReportDataRegion()

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public ParticipantViewPage clickReportTab(String reportLabel)`
`115`	`115`
`116`	`116`	`public WebElement getActiveReportPanel()`
`117`	`117`	`{`
`118`		`- return activeReportPanel.findElementOrNull(getDriver());`
	`118`	`+ return activeReportPanel.waitForElement(getDriver(), 2_000);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`public DataRegionTable getActiveReportDataRegion()`