Merge branch 'develop' into fb_chris_misc_issues

Author: labkey-chrisj

modules/simpletest/module.properties

@@ -1,4 +1,4 @@
 Name: simpletest
-SchemaVersion: 25.000
+SchemaVersion: 25.001
 SupportedDatabases: mssql, pgsql
 ManageVersion: true

modules/simpletest/resources/schemas/dbscripts/postgresql/vehicle-25.000-25.001.sql

@@ -0,0 +1 @@
+CREATE UNIQUE INDEX AK_Name ON vehicle.Manufacturers (Name);

modules/simpletest/resources/schemas/dbscripts/sqlserver/vehicle-25.000-25.001.sql

@@ -0,0 +1 @@
+CREATE UNIQUE INDEX AK_Name ON vehicle.Manufacturers (Name);

src/org/labkey/test/components/ui/domainproperties/EntityTypeDesigner.java

@@ -255,6 +255,21 @@ public Optional<WebElement> optionalWarningAlert()
         return elementCache().optionalWarningAlert();
     }
 
+    public void setActionComment(String comment)
+    {
+        elementCache().commentInput.sendKeys(comment);
+    }
+
+    public void clearActionComment()
+    {
+        elementCache().commentInput.clear();
+    }
+
+    public boolean isCommentInputPresent()
+    {
+        return elementCache().commentInputLocator.findOptionalElement(getDriver()).isPresent();
+    }
+
 
     /**
      * Dialog that allows the user to set the genId value.
@@ -419,6 +434,9 @@ public final WebElement helpTarget(String divLabelText)
 
         final Locator uniqueIdMsgLoc = Locator.tagWithClass("div", "uniqueid-msg");
 
+        public Locator.XPathLocator commentInputLocator = Locator.tagWithId("textarea", "actionComments");
+        public WebElement commentInput = commentInputLocator.refindWhenNeeded(getDriver());
+
         public List<Input> parentAliases()
         {
             return Input.Input(Locator.name("alias"), getDriver()).findAll(propertiesPanel);

src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java

@@ -4,6 +4,7 @@
 import org.labkey.test.BootstrapLocators;
 import org.labkey.test.Locator;
 import org.labkey.test.WebDriverWrapper;
+import org.labkey.test.WebTestHelper;
 import org.labkey.test.components.Component;
 import org.labkey.test.components.UpdatingComponent;
 import org.labkey.test.components.bootstrap.ModalDialog;
@@ -262,11 +263,6 @@ public Integer getCountFromTitle()
 
     // dismiss the dialog
 
-    public void clickEditWithGrid()
-    {
-        dismiss("Edit with Grid");
-    }
-
     public String clickUpdateExpectingError()
     {
         elementCache().updateButton.click();
@@ -279,7 +275,7 @@ public void clickUpdate()
         clickUpdate(false);
     }
 
-    public void clickUpdate(boolean skipChangeCounterCheck)
+    public void clickUpdate(boolean skipAuditEventCheck)
     {
         Integer rowCount = getCountFromTitle();
 
@@ -290,14 +286,14 @@ public void clickUpdate(boolean skipChangeCounterCheck)
         });
 
         // check for the expected number of Data Changes in the latest audit event records
-        AuditLogHelper auditLogHelper = new AuditLogHelper(getWrapper());
+        AuditLogHelper auditLogHelper = new AuditLogHelper(getWrapper(), () -> WebTestHelper.getRemoteApiConnection(false));
         String auditEventName = auditLogHelper.getAuditEventNameFromURL();
-        if (!skipChangeCounterCheck && auditEventName != null)
+        if (!skipAuditEventCheck && auditEventName != null)
         {
             try
             {
                 int changeCounter = auditLogHelper.isSourcesRoute() ? _changeCounter + 1 : _changeCounter; // Source updates include the name value in the diff (even when not changed)
-                auditLogHelper.checkTimelineAuditEventDiffCountForLastTransaction(getWrapper().getCurrentContainerPath(), auditEventName, changeCounter, rowCount);
+                auditLogHelper.checkAuditEventDiffCountForLastTransaction(getWrapper().getCurrentContainerPath(), auditEventName, changeCounter, rowCount);
             }
             catch (CommandException | IOException e)
             {

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

@@ -5,6 +5,7 @@
 import org.labkey.test.BootstrapLocators;
 import org.labkey.test.Locator;
 import org.labkey.test.WebDriverWrapper;
+import org.labkey.test.WebTestHelper;
 import org.labkey.test.components.Component;
 import org.labkey.test.components.WebDriverComponent;
 import org.labkey.test.components.html.Checkbox;
@@ -503,7 +504,7 @@ public DetailDataPanel clickSave()
         return clickSave(false);
     }
 
-    public DetailDataPanel clickSave(boolean skipChangeCounterCheck)
+    public DetailDataPanel clickSave(boolean skipAuditEventCheck)
     {
         String title = getSourceTitle();
         var componentEl = getComponentElement();
@@ -515,14 +516,14 @@ public DetailDataPanel clickSave(boolean skipChangeCounterCheck)
                 .until(ExpectedConditions.stalenessOf(elementCache().saveButton));
 
         // check for the expected number of Data Changes in the latest audit event records
-        AuditLogHelper auditLogHelper = new AuditLogHelper(getWrapper());
+        AuditLogHelper auditLogHelper = new AuditLogHelper(getWrapper(), () -> WebTestHelper.getRemoteApiConnection(false));
         String auditEventName = auditLogHelper.getAuditEventNameFromURL();
-        if (!skipChangeCounterCheck && auditEventName != null)
+        if (!skipAuditEventCheck && auditEventName != null)
         {
             try
             {
                 int changeCounter = auditLogHelper.isSourcesRoute() ? _changeCounter + 1 : _changeCounter; // Source updates include the name value in the diff (even when not changed)
-                auditLogHelper.checkTimelineAuditEventDiffCountForLastTransaction(getWrapper().getCurrentContainerPath(), auditEventName, changeCounter, 1);
+                auditLogHelper.checkAuditEventDiffCountForLastTransaction(getWrapper().getCurrentContainerPath(), auditEventName, changeCounter, 1);
             }
             catch (CommandException | IOException e)
             {

src/org/labkey/test/components/ui/notifications/ServerNotificationItem.java

@@ -193,11 +193,11 @@ protected ElementCache newElementCache()
 
     protected class ElementCache extends Component<?>.ElementCache
     {
-        private final WebElement status = Locator.tagWithClass("i", "fa").refindWhenNeeded(this);
+        private final WebElement status = Locator.byClass("fa").refindWhenNeeded(this);
         private final WebElement message = Locator.tagWithClass("span", "server-notification-message").refindWhenNeeded(this);
         private final WebElement date = Locator.tagWithClass("div", "server-notification-data").refindWhenNeeded(this);
         private final WebElement userName = Locator.tagWithClass("span", "server-notification-data").refindWhenNeeded(this);
-        private final WebElement link = Locator.tagWithClass("span", "server-notifications-link").childTag("a").refindWhenNeeded(this);
+        private final WebElement link = Locator.tag("a").refindWhenNeeded(this);
     }
 
 

src/org/labkey/test/components/ui/notifications/ServerNotificationMenu.java

@@ -274,11 +274,11 @@ public final WebElement noNotificationsElement()
         public final WebElement markAll()
         {
             return Locator.tagWithClass("h3", "navbar-menu-header")
-                    .child(Locator.tagWithClass("div", "server-notifications-link"))
+                    .child(Locator.byClass("clickable-text"))
                     .refindWhenNeeded(elementCache().menuContent);
         }
 
-        public final WebElement viewAllLink = Locator.tagWithText("div", "View all activity").refindWhenNeeded(this);
+        public final WebElement viewAllLink = Locator.linkContainingText("View all activity").refindWhenNeeded(this);
 
     }
 

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

@@ -71,7 +71,6 @@ public class AdvancedImportOptionsTest extends BaseWebDriverTest implements Post
     private static final boolean EXPECTED_IMPORT_ERRORS = false;
     private static final int EXPECTED_COMPLETED_IMPORT_JOBS = 1;
     private static final int EXPECTED_COMPLETED_MULTI_FOLDER_JOBS = 2;
-    private Boolean _studyDesignPreviouslyEnabled;
     private Boolean _advancedImportOptionsEnabled;
 
     @Override
@@ -96,7 +95,6 @@ protected BrowserType bestBrowser()
     public static void doSetup()
     {
         AdvancedImportOptionsTest test = getCurrentTest();
-        test._studyDesignPreviouslyEnabled = OptionalFeatureHelper.enableOptionalFeature(test.createDefaultConnection(), "studyDesignFlag");
         test._advancedImportOptionsEnabled = OptionalFeatureHelper.enableOptionalFeature(test.createDefaultConnection(), "advancedImportFlag");
     }
 
@@ -108,8 +106,6 @@ public void doCleanup(boolean afterTest) throws TestTimeoutException
         _containerHelper.deleteProject(IMPORT_PROJECT_FILE02, false);
         _containerHelper.deleteProject(IMPORT_PROJECT_FILE03, false);
         _containerHelper.deleteProject(IMPORT_PROJECT_MULTI, false);
-        if (_studyDesignPreviouslyEnabled != null)
-            OptionalFeatureHelper.setOptionalFeature(createDefaultConnection(), "studyDesignFlag", _studyDesignPreviouslyEnabled);
 
         if (_advancedImportOptionsEnabled != null)
             OptionalFeatureHelper.setOptionalFeature(createDefaultConnection(), "advancedImportFlag", _advancedImportOptionsEnabled);