Merge branch 'develop' into fb_domainAudit

Author: XingY

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);
 
     }