Merge 23.7 to develop

LabKey · Jul 19, 2023 · ea2fad4 · ea2fad4
2 parents 319acb9 + 06472e3
commit ea2fad4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/test/src/org/labkey/test/util/cds/CDSHelper.java b/test/src/org/labkey/test/util/cds/CDSHelper.java
@@ -1305,14 +1305,14 @@ public void viewLearnAboutPage(@LoggedParam String learnAxis)
     {
         NavigationLink.LEARN.makeNavigationSelection(_test);
 
-        WebElement axisTab = _test.shortWait().until(ExpectedConditions.visibilityOfElementLocated(
-                Locator.tag("div").withClass("learn-dim-selector")
-                        .append(Locator.tag("h1").withClass("lhdv").withText(learnAxis))));
-
         Locator.XPathLocator rowLoc = Locator.xpath("//table[@role='presentation']//tr[@role='row']").withDescendant(Locator.byClass("detail-description")).notHidden();
         WebElement initialRow = rowLoc.waitForElement(_test.getDriver(), BaseWebDriverTest.WAIT_FOR_JAVASCRIPT);
         _test._ext4Helper.waitForMaskToDisappear();
 
+        WebElement axisTab = _test.shortWait().until(ExpectedConditions.visibilityOfElementLocated(
+                Locator.tag("div").withClass("learn-dim-selector")
+                        .append(Locator.tag("h1").withClass("lhdv").withText(learnAxis))));
+
         if (!axisTab.getAttribute("class").contains("active") &&
                 !Locator.tagWithAttribute("input", "placeholder", "Search " + learnAxis.toLowerCase()).existsIn(_test.getDriver()))
         {