Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions src/org/labkey/test/components/ui/navigation/ProductMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -174,23 +175,39 @@ public ProductMenu clickFolderItem(String folderName)
public void goToFolderDashboard(String folderName)
{
clickFolderItem(folderName);
getWrapper().mouseOver(elementCache().activeDashboardIcon);
clickNavLink(elementCache().activeDashboardIcon);
}

public int getDashboardIconCount()
{
return elementCache().dashboardIconLoc.findElements(elementCache().menuContent).size();
List<WebElement> dashboardIcons = elementCache().dashboardIconLoc.findElements(elementCache().menuContent);
for (WebElement dashboardIcon : dashboardIcons)
{
// 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();
}

public void goToFolderAdministration(String folderName)
{
clickFolderItem(folderName);
getWrapper().mouseOver(elementCache().activeAdministrationIcon);
clickNavLink(elementCache().activeAdministrationIcon);
}

public int getAdministrationIconCount()
{
return elementCache().administrationIconLoc.findElements(elementCache().menuContent).size();
List<WebElement> adminIcons = elementCache().administrationIconLoc.findElements(elementCache().menuContent);
for (WebElement adminIcon : adminIcons)
{
// 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();
}

public String getButtonTitle()
Expand Down