Merge branch 'develop' into fb_issue_51695

Author: labkey-klum

src/org/labkey/test/TestProperties.java

@@ -18,6 +18,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.labkey.serverapi.reader.Readers;
+import org.labkey.test.util.CspLogUtil;
 import org.labkey.test.util.TestLogger;
 import org.openqa.selenium.Dimension;
 
@@ -30,6 +31,7 @@
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -78,6 +80,7 @@ public abstract class TestProperties
     public static void load()
     {
         /* Force static block to run */
+        CspLogUtil.init();
     }
 
     public static boolean isTestCleanupSkipped()
@@ -129,7 +132,7 @@ public static boolean isQueryCheckSkipped()
 
     public static boolean isCspCheckSkipped()
     {
-        return !getBooleanProperty("webtest.cspCheck", false);
+        return !getBooleanProperty("webtest.cspCheck", true);
     }
 
     public static boolean isNewWebDriverForEachTest()
@@ -264,6 +267,10 @@ public static boolean isAssayProductFeatureAvailable()
         return isProductFeatureAvailable("assay");
     }
 
+    /**
+     * Product features are assumed to be available unless the test environment (usually TeamCity) explicitly specifies
+     * that it is not.
+     */
     public static boolean isProductFeatureAvailable(String feature)
     {
         return "true".equals(System.getProperty("webtest.productFeature." + feature.toLowerCase(), "true"));
@@ -276,7 +283,7 @@ public static boolean ignoreDatabaseNotSupportedException()
 
     /**
      * Parses system property 'webtest.server.startup.timeout' to determine maximum allowed server startup time.
-     * If property is not defined or is not an integer, it defaults to 60 seconds.
+     * If property is not defined or is not an integer, it defaults to 120 seconds.
      * @return Maximum number of seconds to wait for server startup
      */
     public static int getServerStartupTimeout()
@@ -289,34 +296,48 @@ public static String getAdditionalPipelineTools()
         return System.getProperty("additional.pipeline.tools");
     }
 
+    private static Map<String, Boolean> _optionalFeatures = null;
     public static Map<String, Boolean> getOptionalFeatures()
     {
-        Map<String, Boolean> features = new HashMap<>();
-
-        Properties props = System.getProperties();
-        for (Map.Entry<Object, Object> entry : props.entrySet())
+        if (_optionalFeatures == null)
         {
-            String key = String.valueOf(entry.getKey());
-            Boolean value = (entry.getValue() instanceof Boolean)
-                    ? (Boolean)entry.getValue()
-                    : Boolean.valueOf(String.valueOf(entry.getValue()));
+            Map<String, Boolean> features = new HashMap<>();
 
-            String prefix = "webtest.experimental."; // Can be used with any optional feature flags; "experimental" is used for backward-compatibility purposes.
-            if (key.startsWith(prefix))
+            Properties props = System.getProperties();
+            for (Map.Entry<Object, Object> entry : props.entrySet())
             {
-                String feature = key.substring(prefix.length());
-                features.put(feature, value);
+                String key = String.valueOf(entry.getKey());
+
+                String expPrefix = "webtest.experimental."; // "experimental" is accepted for backward-compatibility purposes.
+                String optPrefix = "webtest.optional."; // Preferred prefix
+                for (String prefix : List.of(expPrefix, optPrefix))
+                {
+                    if (key.startsWith(prefix))
+                    {
+                        Boolean value = (entry.getValue() instanceof Boolean)
+                            ? (Boolean) entry.getValue()
+                            : Boolean.valueOf(String.valueOf(entry.getValue()));
+                        String feature = key.substring(prefix.length());
+                        features.put(feature, value);
+                    }
+                }
             }
-        }
 
-        return features;
+            _optionalFeatures = Collections.unmodifiableMap(features);
+        }
+        return _optionalFeatures;
     }
 
+    private static List<String> debugLoggingPackages = null;
     public static List<String> getDebugLoggingPackages()
     {
-        String prop = System.getProperty("webtest.debug.server.packages", "");
-        String[] packages = prop.split("\\s*,\\s*");
-        return Arrays.stream(packages).map(String::trim).filter(s -> !s.isEmpty()).collect(Collectors.toList());
+        if (debugLoggingPackages == null)
+        {
+            String prop = System.getProperty("webtest.debug.server.packages", "");
+            String[] packages = prop.split(",");
+            debugLoggingPackages = Arrays.stream(packages).map(String::trim).filter(s -> !s.isEmpty()).collect(Collectors.toList());
+        }
+        return debugLoggingPackages;
     }
 
     private static File dumpDir = null;

src/org/labkey/test/WebDriverWrapper.java

@@ -542,7 +542,7 @@ public <T> T executeScript(@Language("JavaScript") String script, Class<T> expec
      * Wrapper for synchronous execution of asynchronous JavaScript. This wrapper extracts the 'callback' from the argument list
      * See {@link JavascriptExecutor#executeAsyncScript(java.lang.String, java.lang.Object...)} for details
      */
-    public Object executeAsyncScript(@Language("XPath") String script, Object... arguments)
+    public Object executeAsyncScript(@Language("JavaScript") String script, Object... arguments)
     {
         script = "var callback = arguments[arguments.length - 1];\n" + // See WebDriver documentation for details on injected callback
                 "try {" +
@@ -551,7 +551,7 @@ public Object executeAsyncScript(@Language("XPath") String script, Object... arg
         return ((JavascriptExecutor) getDriver()).executeAsyncScript(script, arguments);
     }
 
-    public <T> T executeAsyncScript(String script, Class<T> expectedResultType, Object... arguments)
+    public <T> T executeAsyncScript(@Language("JavaScript") String script, Class<T> expectedResultType, Object... arguments)
     {
         Object o = executeAsyncScript(script, arguments);
         if (o != null && !expectedResultType.isAssignableFrom(o.getClass()))
@@ -2738,6 +2738,12 @@ public String getSelectedOptionText(WebElement el)
         return select.getFirstSelectedOption().getText();
     }
 
+    public List<String> getSelectedOptionTexts(Locator loc)
+    {
+        Select select = new Select(loc.findElement(getDriver()));
+        return select.getAllSelectedOptions().stream().map(WebElement::getText).collect(Collectors.toList());
+    }
+
     public String getSelectedOptionValue(Locator loc)
     {
         return getSelectedOptionValue(loc.findElement(getDriver()));

src/org/labkey/test/components/domain/DomainFormPanel.java

@@ -27,6 +27,7 @@
 import java.util.stream.Collectors;
 
 import static org.labkey.test.WebDriverWrapper.WAIT_FOR_JAVASCRIPT;
+import static org.labkey.test.WebDriverWrapper.waitFor;
 
 /**
  * Automates the LabKey ui component defined in: packages/components/src/components/domainproperties/DomainForm.tsx
@@ -43,6 +44,12 @@ private DomainFormPanel(WebElement element, WebDriver driver)
         super(element, driver);
     }
 
+    @Override
+    protected void waitForReady()
+    {
+        waitFor(() -> !BootstrapLocators.loadingSpinner.existsIn(this), "Loading spinner still present", 2_000);
+    }
+
     public static List<AdvancedFieldSetting> advancedSettingsFromFieldDefinition(FieldDefinition def)
     {
         List<AdvancedFieldSetting> advancedSettings = new ArrayList<>();
@@ -256,8 +263,8 @@ else if (validator instanceof FieldDefinition.TextChoiceValidator textChoiceVali
      */
     public DomainFormPanel clickManuallyDefineFields()
     {
-        getWrapper().scrollIntoView(elementCache().manuallyDefineButton, true);
         getWrapper().shortWait().until(ExpectedConditions.elementToBeClickable(elementCache().manuallyDefineButton)); // give modal dialogs time to disappear
+        getWrapper().scrollIntoView(elementCache().manuallyDefineButton, true);
         elementCache().manuallyDefineButton.click();
 
         return this;

src/org/labkey/test/components/html/Table.java

@@ -88,6 +88,11 @@ public int getRowCount()
         return elementCache().getRows().size();
     }
 
+    public List<WebElement> getRows()
+    {
+        return elementCache().getRows();
+    }
+
     /**
      * For a well formed html table get the text from the th elements in the thead.
      *

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

@@ -642,6 +642,24 @@ public List<String> getColumnLabels()
         return elementCache().getColumnLabels();
     }
 
+    /**
+     *
+     * @return a List&#60;String&#62; containing the names of the fields for each column header
+     */
+    public List<String> getColumnNames()
+    {
+        return elementCache().getColumnNames();
+    }
+
+    /**
+     *
+     * @return a List&#60;FieldKey&#62; containing the fieldKeys for each column header
+     */
+    public List<FieldKey> getColumnFieldKeys()
+    {
+        return elementCache().getColumnFieldKeys();
+    }
+
     /**
      * Get data from a row
      * @param rowIndex  the index of the desired row
@@ -773,7 +791,7 @@ public Optional<String> getGridEmptyMessage()
         return msg;
     }
 
-    List<FieldReference> getHeaders()
+    public List<FieldReference> getHeaders()
     {
         return Collections.unmodifiableList(elementCache().findHeaders());
     }
@@ -861,6 +879,16 @@ protected List<String> getColumnLabels()
             return findHeaders().stream().map(FieldReferenceManager.FieldReference::getLabel).collect(Collectors.toList());
         }
 
+        protected List<String> getColumnNames()
+        {
+            return findHeaders().stream().map(FieldReferenceManager.FieldReference::getName).collect(Collectors.toList());
+        }
+
+        protected List<FieldKey> getColumnFieldKeys()
+        {
+            return findHeaders().stream().map(FieldReferenceManager.FieldReference::getFieldKey).collect(Collectors.toList());
+        }
+
         protected GridRow getRow(int index)
         {
             return getRows().get(index);