From 879085634a026db3628bda33d5bca49f9f2415fe Mon Sep 17 00:00:00 2001
From: Daria Bodiakova <70635654+DariaBod@users.noreply.github.com>
Date: Tue, 12 May 2026 16:10:12 -0700
Subject: [PATCH 1/2] tests fixed to catch something like issue 1146

---
 .../components/ui/navigation/ProductMenu.java | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/org/labkey/test/components/ui/navigation/ProductMenu.java b/src/org/labkey/test/components/ui/navigation/ProductMenu.java
index 060f0111b5..af37409e51 100644
--- a/src/org/labkey/test/components/ui/navigation/ProductMenu.java
+++ b/src/org/labkey/test/components/ui/navigation/ProductMenu.java
@@ -9,6 +9,7 @@
 import org.labkey.test.components.Component;
 import org.labkey.test.components.WebDriverComponent;
 import org.labkey.test.util.TestLogger;
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedConditions;
@@ -174,23 +175,39 @@ public ProductMenu clickFolderItem(String folderName)
     public void goToFolderDashboard(String folderName)
     {
         clickFolderItem(folderName);
+        getWrapper().mouseOver(elementCache().activeDashboardIcon);
         clickNavLink(elementCache().activeDashboardIcon);
     }
 
+    // Interactions with icon elements on the page to catch GitHub Issue 1146.
     public int getDashboardIconCount()
     {
-        return elementCache().dashboardIconLoc.findElements(elementCache().menuContent).size();
+        List<WebElement> dashboardIcons = elementCache().dashboardIconLoc.findElements(elementCache().menuContent);
+        for (WebElement dashboardIcon : dashboardIcons)
+        {
+            getWrapper().mouseOver(dashboardIcon.findElement(By.xpath("./ancestor::li[1]")));
+            getWrapper().mouseOver(dashboardIcon);
+        }
+        return dashboardIcons.size();
     }
 
     public void goToFolderAdministration(String folderName)
     {
         clickFolderItem(folderName);
+        getWrapper().mouseOver(elementCache().activeAdministrationIcon);
         clickNavLink(elementCache().activeAdministrationIcon);
     }
 
+    // Interactions with icon elements on the page to catch GitHub Issue 1146.
     public int getAdministrationIconCount()
     {
-        return elementCache().administrationIconLoc.findElements(elementCache().menuContent).size();
+        List<WebElement> adminIcons = elementCache().administrationIconLoc.findElements(elementCache().menuContent);
+        for (WebElement adminIcon : adminIcons)
+        {
+            getWrapper().mouseOver(adminIcon.findElement(By.xpath("./ancestor::li[1]")));
+            getWrapper().mouseOver(adminIcon);
+        }
+        return adminIcons.size();
     }
 
     public String getButtonTitle()

From 9037cc06737ea86003a171355f571742c5f2b439 Mon Sep 17 00:00:00 2001
From: Daria Bodiakova <70635654+DariaBod@users.noreply.github.com>
Date: Wed, 13 May 2026 09:14:51 -0700
Subject: [PATCH 2/2] fix comment

---
 .../labkey/test/components/ui/navigation/ProductMenu.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/org/labkey/test/components/ui/navigation/ProductMenu.java b/src/org/labkey/test/components/ui/navigation/ProductMenu.java
index af37409e51..22eabff706 100644
--- a/src/org/labkey/test/components/ui/navigation/ProductMenu.java
+++ b/src/org/labkey/test/components/ui/navigation/ProductMenu.java
@@ -179,13 +179,13 @@ public void goToFolderDashboard(String folderName)
         clickNavLink(elementCache().activeDashboardIcon);
     }
 
-    // Interactions with icon elements on the page to catch GitHub Issue 1146.
     public int getDashboardIconCount()
     {
         List<WebElement> dashboardIcons = elementCache().dashboardIconLoc.findElements(elementCache().menuContent);
         for (WebElement dashboardIcon : dashboardIcons)
         {
-            getWrapper().mouseOver(dashboardIcon.findElement(By.xpath("./ancestor::li[1]")));
+            // Interactions with icon elements on the page to catch GitHub Issue 1146.
+            getWrapper().mouseOver(Locator.xpath("./ancestor::li[1]").findElement(dashboardIcon));
             getWrapper().mouseOver(dashboardIcon);
         }
         return dashboardIcons.size();
@@ -198,13 +198,13 @@ public void goToFolderAdministration(String folderName)
         clickNavLink(elementCache().activeAdministrationIcon);
     }
 
-    // Interactions with icon elements on the page to catch GitHub Issue 1146.
     public int getAdministrationIconCount()
     {
         List<WebElement> adminIcons = elementCache().administrationIconLoc.findElements(elementCache().menuContent);
         for (WebElement adminIcon : adminIcons)
         {
-            getWrapper().mouseOver(adminIcon.findElement(By.xpath("./ancestor::li[1]")));
+            // Interactions with icon elements on the page to catch GitHub Issue 1146.
+            getWrapper().mouseOver(Locator.xpath("./ancestor::li[1]").findElement(adminIcon));
             getWrapper().mouseOver(adminIcon);
         }
         return adminIcons.size();