LKSM Folder Archives Test Automation

src/org/labkey/test/BaseWebDriverTest.java

@@ -220,6 +220,8 @@ public abstract class BaseWebDriverTest extends LabKeySiteWrapper implements Cle
     public static final String ALL_ILLEGAL_QUERY_KEY_CHARACTERS = StringUtils.join(FieldKey.getIllegalChars(), "");
     // See TSVWriter.shouldQuote. Generally we are not able to use the tab and new line characters when creating field names in the UI, but including here for completeness
     public static final String[] TRICKY_IMPORT_FIELD_CHARACTERS = {"\\", "\"", "\\t", ",", "\\n", "\\r"};
+    // Sample type names cannot contain: <>[]{};,`"~!@#$%^*=|?\
+    public static final String[] TRICKY_DOMAIN_NAME_CHARACTERS = {"&", "()", "-", "_", ":", "'", ".", "/"};
 
     public static final String TRICKY_CHARACTERS = "><&/%\\' \"1\u00E4\u00F6\u00FC\u00C5";
     public static final String TRICKY_CHARACTERS_NO_QUOTES = "></% 1\u00E4\u00F6\u00FC\u00C5";

src/org/labkey/test/components/ui/DeleteConfirmationDialog.java

@@ -71,7 +71,7 @@ protected void waitForReady()
         WebDriverWrapper.waitFor(()-> elementCache().body.isDisplayed() &&
                         !elementCache().title.getText().isEmpty() &&
                         !BootstrapLocators.loadingSpinner.existsIn(this),
-                "The delete confirmation dialog did not become ready.", 1_000);
+                "The delete / archive confirmation dialog did not become ready.", 1_000);
     }
 
     public DeleteConfirmationDialog<ConfirmPage> setSkipAuditEventCheck(boolean skipAuditEventCheck)
@@ -91,11 +91,16 @@ public ConfirmPage confirmDelete()
     }
 
     public ConfirmPage confirmDelete(Integer waitSeconds)
+    {
+        return clickConfirmButton(waitSeconds, "Yes, Delete");
+    }
+
+    protected ConfirmPage clickConfirmButton(Integer waitSeconds, String buttonText)
     {
         Integer count = getCountFromTitle();
         AuditLogHelper.AuditEvent auditEventName = getAuditEvent();
 
-        var confirmPage = _confirmationSynchronizationFunction.apply(() -> this.dismiss("Yes, Delete", waitSeconds));
+        var confirmPage = _confirmationSynchronizationFunction.apply(() -> this.dismiss(buttonText, waitSeconds));
 
         if (!skipAuditEventCheck && count != null && auditEventName != null && !TestProperties.isTrialServer())
             verifyAuditEvents(getWrapper(), getWrapper().getCurrentProject(), auditEventName, count);

src/org/labkey/test/components/ui/FolderArchiveDialog.java

@@ -0,0 +1,39 @@
+package org.labkey.test.components.ui;
+
+import org.jetbrains.annotations.NotNull;
+import org.labkey.test.WebDriverWrapper;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+
+import java.util.function.Supplier;
+
+public class FolderArchiveDialog <ConfirmPage extends WebDriverWrapper> extends DeleteConfirmationDialog<ConfirmPage>
+{
+
+    public FolderArchiveDialog(String dialogTitle, @NotNull WebDriverWrapper sourcePage, WebElement staleOnConfirmElement, Supplier<ConfirmPage> confirmPageSupplier)
+    {
+        super(dialogTitle, sourcePage, runnable -> {
+                    runnable.run();
+                    sourcePage.longWait().until(ExpectedConditions.stalenessOf(staleOnConfirmElement));
+                    return confirmPageSupplier.get();
+                }
+        );
+
+    }
+
+    public ConfirmPage clickYesArchive()
+    {
+        return clickYesArchive(10);
+    }
+
+    public ConfirmPage clickYesArchive(Integer waitSeconds)
+    {
+        return super.clickConfirmButton(waitSeconds, "Yes, Archive Folder");
+    }
+
+    public void clickCancel()
+    {
+        this.dismiss("Cancel");
+    }
+
+}

src/org/labkey/test/components/ui/navigation/NavBar.java

@@ -23,7 +23,7 @@ public abstract class NavBar extends WebDriverComponent<NavBar.ElementCache>
 
     protected NavBar(WebDriver driver)
     {
-        this(Locator.tagWithClass("nav", "navbar-container").findElement(driver), driver);
+        this(Locator.tagWithClass("nav", "navbar").findElement(driver), driver);
     }
 
     protected NavBar(WebElement element, WebDriver driver)