Merge remote-tracking branch 'origin/develop' into fb_appHeaderCleanup

Author: labkey-tchad

src/org/labkey/test/Locator.java

@@ -20,8 +20,8 @@
 import org.apache.commons.lang3.mutable.MutableObject;
 import org.intellij.lang.annotations.Language;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.labkey.test.selenium.LazyWebElement;
 import org.labkey.test.selenium.ReclickingWebElement;
 import org.labkey.test.selenium.RefindingWebElement;
@@ -1019,6 +1019,41 @@ public static String cq(String value)
         return "\"" + value.replace("\\", "\\\\").replace("\"", "\\\"") + "\"";
     }
 
+    public static Locator union(Locator... locators)
+    {
+        if (locators.length < 1)
+            throw new IllegalArgumentException("Specify at least one locator");
+        if (locators.length == 1)
+            return locators[0];
+
+        List<CssLocator> cssLocators = Arrays.stream(locators).map(Locator::asRawCssLocator)
+                .filter(Objects::nonNull).toList();
+        if (cssLocators.size() == locators.length)
+            return CssLocator.union(cssLocators.toArray(new CssLocator[0]));
+
+        List<XPathLocator> xPathLocators = Arrays.stream(locators).map(locator -> {
+            if (locator instanceof XPathLocator)
+                return (XPathLocator) locator;
+            else
+                return null;
+        }).filter(Objects::nonNull).toList();
+        if (xPathLocators.size() == locators.length)
+            return XPathLocator.union(xPathLocators.toArray(new XPathLocator[0]));
+
+        throw new IllegalArgumentException("Locators should be all CSS or all XPath");
+    }
+
+    private static CssLocator asRawCssLocator(Locator locator)
+    {
+        CssLocator cssLocator = null;
+        if (locator instanceof CssLocator cssLoc)
+            cssLocator = cssLoc;
+        else if (locator instanceof XPathCSSLocator xcLoc)
+            cssLocator = xcLoc.getCssLoc();
+
+        return cssLocator != null && cssLocator.isRawCssLocator() ? cssLocator : null;
+    }
+
     private static class XPathCSSLocator extends XPathLocator
     {
         private final XPathLocator _xLoc;
@@ -1670,9 +1705,9 @@ public static Locator union(CssLocator... locators)
             if (locators.length == 0)
                 throw new IllegalArgumentException("Specify one or more locators to union");
 
-            for (Locator loc : locators)
+            for (CssLocator loc : locators)
             {
-                if (loc._contains != null || loc._text != null || loc._index != null)
+                if (!loc.isRawCssLocator())
                     throw new IllegalArgumentException("Only able to union raw CSS selectors");
             }
 
@@ -1687,6 +1722,11 @@ public static Locator union(CssLocator... locators)
             return new WrappedLocator(new CssLocator(unionedLocators.toString()));
         }
 
+        private boolean isRawCssLocator()
+        {
+            return _contains == null && _text == null && _index == null;
+        }
+
         @Override
         public Locator containing(String contains)
         {

src/org/labkey/test/WebTestHelper.java

@@ -75,6 +75,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.URLDecoder;
 import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
 import java.security.KeyManagementException;
@@ -544,6 +545,11 @@ public static Map<String, String> parseUrlQuery(URL url)
     }
 
     public static Map<String, String> parseUrlQueryString(String query)
+    {
+        return parseUrlQueryString(query, true);
+    }
+
+    public static Map<String, String> parseUrlQueryString(String query, boolean decode)
     {
         if (query != null)
         {
@@ -556,7 +562,7 @@ public static Map<String, String> parseUrlQueryString(String query)
             for (String arg : queryArgs)
             {
                 String[] split = arg.split("=", 2);
-                parsedQuery.put(split[0], split.length > 1 ? split[1] : null);
+                parsedQuery.put(maybeDecode(split[0], decode), split.length > 1 ? maybeDecode(split[1], decode) : null);
             }
 
             return parsedQuery;
@@ -565,6 +571,30 @@ public static Map<String, String> parseUrlQueryString(String query)
         return Collections.emptyMap();
     }
 
+    private static String maybeDecode(String value, boolean decode)
+    {
+        return decode
+                ? URLDecoder.decode(value, StandardCharsets.UTF_8)
+                : value;
+    }
+
+    public static Map<String, String> parseAppQuery(URL url)
+    {
+        String ref = url.getRef();
+
+        if (ref != null)
+        {
+            int queryIndex = ref.indexOf("?");
+
+            if (queryIndex > -1)
+            {
+                return parseUrlQueryString(ref.substring(queryIndex), true);
+            }
+        }
+
+        return Collections.emptyMap();
+    }
+
     public static Connection getRemoteApiConnection()
     {
         return getRemoteApiConnection(true);

src/org/labkey/test/components/ui/grids/EditableGrid.java

@@ -1034,39 +1034,9 @@ public String copyCurrentSelection() throws IOException, UnsupportedFlavorExcept
         return getWrapper().getClipboardContent();
     }
 
-    /**
-     * Select a cell range and drag-fill from the end of that selection to {@code dragEnd}.
-     * Because this overload owns the {@link #selectCellRange} step, it can fully restore state
-     * and retry if the first drag extended the selection without applying the fill.
-     *
-     * @param selectStart first cell of the selection (passed to {@link #selectCellRange})
-     * @param selectEnd   last cell of the selection; also the source of the fill value
-     * @param dragEnd     destination cell for the fill drag
-     */
-    public void dragFill(WebElement selectStart, WebElement selectEnd, WebElement dragEnd)
-    {
-        Locator.XPathLocator selectionHandleLoc = Locator.byClass("cell-selection-handle");
-        selectCellRange(selectStart, selectEnd);
-        selectEnd.click();
-        String fillValue = getCellValue(selectEnd);
-        WebElement selectionHandle = selectionHandleLoc.waitForElement(getComponentElement(), 2_000);
-        dragToCell(selectionHandle, dragEnd);
-        if (!WebDriverWrapper.waitFor(() -> fillValue.equals(getCellValue(dragEnd)), 3_000))
-        {
-            // Fill didn't complete — the drag likely extended the selection without triggering the fill.
-            selectCellRange(selectStart, selectEnd);
-            selectEnd.click();
-            selectionHandle = selectionHandleLoc.waitForElement(getComponentElement(), 2_000);
-            dragToCell(selectionHandle, dragEnd);
-            WebDriverWrapper.waitFor(() -> fillValue.equals(getCellValue(dragEnd)),
-                    "Drag fill did not populate end cell with value: " + fillValue, 5_000);
-        }
-    }
-
     /**
      * Drag-fill from {@code startCell} (which must already be selected / part of the current
-     * selection) to {@code endCell}.  Prefer {@link #dragFill(WebElement, WebElement, WebElement)}
-     * when the selection range is known — that overload can retry reliably.
+     * selection) to {@code endCell}.
      */
     public void dragFill(WebElement startCell, WebElement endCell)
     {
@@ -1077,6 +1047,21 @@ public void dragFill(WebElement startCell, WebElement endCell)
         selectionHandleLoc.waitForElement(endCell, 5_000);
     }
 
+    /**
+     * Select {@code selectStart} through {@code dragEnd} and fill down from {@code selectEnd}'s row using Ctrl/Cmd+D.
+     * @param selectStart top-left cell of the range to select
+     * @param selectEnd   cell whose value will be filled down (must be in {@code selectStart}'s row)
+     * @param dragEnd     bottom-right cell of the range to select and fill down to
+     */
+    public void fillDown(WebElement selectStart, WebElement selectEnd, WebElement dragEnd)
+    {
+        selectCellRange(selectStart, dragEnd);
+        String fillValue = getCellValue(selectEnd);
+        new Actions(getDriver()).keyDown(MODIFIER_KEY).sendKeys("d").keyUp(MODIFIER_KEY).build().perform();
+        WebDriverWrapper.waitFor(() -> fillValue.equals(getCellValue(dragEnd)),
+                "Fill-down did not populate end cell with value: " + fillValue, 3_000);
+    }
+
     public void selectCellRange(WebElement startCell, WebElement endCell)
     {
         dragToCell(startCell, endCell);
@@ -1195,8 +1180,9 @@ private boolean isInSelection(WebElement cell)  // 'in selection' shows as blue
     {
         // Should not need to add code for a reactSelect here. A selection involves clicking/dragging, which closes the reactSelect.
         return Locator.tagWithClass("div", "cellular-display")
-                .findElement(cell)
-                .getDomAttribute("class").contains("cell-selection");
+                .findOptionalElement(cell)
+                .map(el -> el.getDomAttribute("class").contains("cell-selection"))
+                .orElse(false);
     }
 
     /**

src/org/labkey/test/components/ui/grids/ManageViewsDialog.java

@@ -25,6 +25,7 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
+import org.openqa.selenium.support.ui.ExpectedConditions;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -158,7 +159,9 @@ public String getDeleteConfirmationText()
      */
     public ManageViewsDialog confirmDelete()
     {
-        elementCache().deleteYesButton.click();
+        WebElement deleteYesButton = elementCache().deleteYesButton;
+        deleteYesButton.click();
+        getWrapper().quickWait().until(ExpectedConditions.stalenessOf(deleteYesButton));
         return this;
     }
 
@@ -169,7 +172,9 @@ public ManageViewsDialog confirmDelete()
      */
     public ManageViewsDialog cancelDelete()
     {
-        elementCache().deleteNoButton.click();
+        WebElement deleteNoButton = elementCache().deleteNoButton;
+        deleteNoButton.click();
+        getWrapper().quickWait().until(ExpectedConditions.stalenessOf(deleteNoButton));
         return this;
     }
 

src/org/labkey/test/tests/BaseAppTest.java

@@ -0,0 +1,8 @@
+package org.labkey.test.tests;
+
+import org.labkey.test.BaseWebDriverTest;
+
+public abstract class BaseAppTest extends BaseWebDriverTest
+{
+    public abstract String getAppControllerName();
+}