Merge 25.7 to develop

Author: labkey-teamcity

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

@@ -47,7 +47,7 @@ public void testIntensity()
         clickTab("Proteins");
         DataRegionTable table = new DataRegionTable("PeptideGroup", getDriver());
         table.setFilter("Label", "Equals", "gi|324021745|ref|NP_001191236.1|");
-        clickAndWait(reproducibilityReportLink());
+        waitAndClickAndWait(reproducibilityReportLink());
 
         log("Verifying the default checks for Intensity");
         PrecursorsWebPart precursorsWebPart = new PrecursorsWebPart(getDriver());
@@ -87,7 +87,7 @@ public void testLightHeavyRatio()
         clickTab("Proteins");
         DataRegionTable table = new DataRegionTable("PeptideGroup", getDriver());
         table.setFilter("Label", "Equals", "gi|324021745|ref|NP_001191236.1|");
-        clickAndWait(reproducibilityReportLink());
+        waitAndClickAndWait(reproducibilityReportLink());
 
         log("Verifying values for light/heavy ratio");
         PrecursorsWebPart precursorsWebPart = new PrecursorsWebPart(getDriver());

test/src/org/labkey/test/tests/targetedms/passport/PassportTest.java

@@ -77,6 +77,7 @@ private void testNormalStuff()
             assertElementContains(Locator.xpath("//ul[@id='livepeptidelist']//li["+index+"]"), peptidesOrderLocation[i]);
         }
         click(Locator.xpath("//button[@id='formreset']")); // reset form check reset works
+        waitForElement(Locator.tagWithId("ul", "livepeptidelist"));
         for(int i = 0; i < peptidesOrderIntensity.length; i++) {
             int index = i+1;
             assertElementContains(Locator.xpath("//ul[@id='livepeptidelist']//li["+index+"]"), peptidesOrderIntensity[i]);
@@ -86,13 +87,15 @@ private void testNormalStuff()
         dragAndDrop(Locator.xpath("//div[@id='rangesliderdeg']//span[1]"), 50, 0);
         assertElementContains(Locator.xpath("//span[@id='filteredPeptideCount']//green"), "15");
         click(Locator.xpath("//button[@id='formreset']")); // reset form check reset works
+
+        waitForElement(Locator.tagWithId("span", "filteredPeptideCount").childTag("green"));
         assertElementContains(Locator.xpath("//span[@id='filteredPeptideCount']//green"), "19");
 
         //features
-        assertElementPresent(Locator.xpath("//td[contains(@class, 'feature-sequencevariant')]"), 5);
-        assertElementPresent(Locator.xpath("//td[contains(@class, 'feature-glycosylationsite')]"), 4);
-        assertElementPresent(Locator.xpath("//td[contains(@class, 'feature-helix')]"), 7);
-        assertElementPresent(Locator.xpath("//td[contains(@class, 'feature-turn')]"), 6);
+        waitForElements(Locator.tagWithClass("td", "feature-sequencevariant"), 5);
+        waitForElements(Locator.tagWithClass("td", "feature-glycosylationsite"), 4);
+        waitForElements(Locator.tagWithClass("td", "feature-helix"), 7);
+        waitForElements(Locator.tagWithClass("td", "feature-turn"), 6);
     }
 
     @LogMethod