Merge branch 'develop' into fb_allowFileExtensionAutoTest

Author: labkey-danield

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/LinkedSchemaTest.java

@@ -895,7 +895,7 @@ public void testCoreLinkedSchemaFilters()
                 .isGreaterThan(-1));
 
         // clean up after ourselves
-        _schemaHelper.deleteSchema(sourceContainerPath, A_PEOPLE_SCHEMA_NAME);
+        _schemaHelper.deleteSchema(sourceContainerPath, linkedSchemaName);
     }
 
     /*

src/org/labkey/test/tests/core/admin/ShortUrlTest.java

@@ -186,10 +186,15 @@ public void testShortUrlPermissions()
             log("As app admin, update shortUrl created by another user");
             adminPage.submitShortUrl(shortUrl_a, targetUrl2);
 
-            // Issue #52485 "App admins can create and edit shorturls but can't view them"
-            assertElementPresent(BootstrapLocators.errorBanner.withText("Table or query not found: ShortURL"));
+            // Issue #52485 "App admins can create and edit shorturls but can't view them" (but now they can!)
+            verifyShortUrlsInGrid(shortUrl_a, targetUrl2, shortUrl_b);
         });
 
+        verifyShortUrlsInGrid(shortUrl_a, targetUrl2, shortUrl_b);
+    }
+
+    private void verifyShortUrlsInGrid(String shortUrl_a, String targetUrl2, String shortUrl_b)
+    {
         Assertions.assertThat(ShortUrlAdminPage.beginAt(this).getUrlsFromGrid())
                 .as("short URLs")
                 .containsAllEntriesOf(Map.of(