Merge branch 'release25.11-SNAPSHOT' into 25.11_fb_schedulingPermissions

Author: labkey-danield

test/src/org/labkey/test/tests/targetedms/TargetedMSQCConfigureMetricTest.java

@@ -203,6 +203,7 @@ private void verifyOutlierCount(String replicate, QCPlotsWebPart.MetricType metr
         QCSummaryWebPart qcSummaryWebPart = new PanoramaDashboard(this).getQcSummaryWebPart();
         qcSummaryWebPart.gotoUtilizationCalendar();
         qcSummaryWebPart = new QCSummaryWebPart(getDriver());
+        waitForElement(Locator.tagContainingText("div", replicate));
         scrollIntoView(Locator.tagContainingText("div", replicate));
         mouseOver(Locator.tagContainingText("div", replicate));
         mouseOver(Locator.tagContainingText("div", replicate));

test/src/org/labkey/test/tests/targetedms/TargetedMSQCGuideSetTest.java

@@ -355,6 +355,9 @@ public void testSmallMoleculePareto() throws IOException, CommandException
         verifyGuideSetSmallMoleculeStats(gsSmallMolecule);
 
         clickAndWait(Locator.linkWithText("Pareto Plot")); //go to Pareto Plot tab
+        Locator.tagWithClass("div", "x4-mask-msg-text")
+                .withText("Loading...").waitForElementToDisappear(getDriver(), 15_000);
+
         ParetoPlotPage paretoPage = new ParetoPlotPage(getDriver());
         ParetoPlotsWebPart paretoPlotsWebPart = paretoPage.getParetoPlotsWebPart();
 

test/src/org/labkey/test/tests/targetedms/TargetedMSTest.java

@@ -341,6 +341,10 @@ protected void ensureComparisonPlots(String title)
 
     protected void verifyQcSummary(int sampleFileCount, int precursorCount)
     {
+        Locator.tagWithClass("div", "x4-panel")
+                .withDescendant(Locator.tagWithText("label", "Loading..."))
+                .waitForElementToDisappear(getDriver(), 15_000);
+
         QCSummaryWebPart qcSummaryWebPart = new PanoramaDashboard(this).getQcSummaryWebPart();
         verifyQcSummary(qcSummaryWebPart.getQcSummaryTiles().get(0), null, sampleFileCount, precursorCount);
     }