Skip to content

Helper to create dataset categories with retry #2626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-tchad merged 3 commits into from
Aug 15, 2025
Merged

Helper to create dataset categories with retry #2626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11f3de4
Helper to create dataset categories with retry
labkey-tchad Aug 12, 2025
b76f918
Actually retry
labkey-tchad Aug 15, 2025
1b1d5a7
Merge remote-tracking branch 'origin/release25.7-SNAPSHOT' into 25.7_…
labkey-tchad Aug 15, 2025
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
46 changes: 45 additions & 1 deletion src/org/labkey/test/pages/reports/ManageViewsPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,17 @@

import org.labkey.test.Locator;
import org.labkey.test.components.ChartQueryDialog;
import org.labkey.test.components.ext4.Window;
import org.labkey.test.components.html.BootstrapMenu;
import org.labkey.test.pages.LabKeyPage;
import org.labkey.test.util.LogMethod;
import org.openqa.selenium.NoSuchElementException;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;

import java.time.Duration;

import static org.labkey.test.components.ext4.Window.Window;

Expand All @@ -34,7 +40,7 @@ public ManageViewsPage(WebDriver driver)

public void clickAddReport(String reportType)
{
BootstrapMenu.find(getDriver(),"Add Report").clickSubMenu(true,reportType);
new BootstrapMenu.BootstrapMenuFinder(getDriver()).withButtonTextContaining("Add Report").find().clickSubMenu(true,reportType);
}

public ChartQueryDialog clickAddChart()
Expand Down Expand Up @@ -89,4 +95,42 @@ public void viewReport(String reportName)
mouseOver(reportLink);
clickAndWait(reportLink);
}

public void createCategory(String categoryName)
{
createCategories(categoryName);
}

public void createCategories(String... categoryNames)
{
Locator.linkWithText("Manage Categories").findElement(getDriver()).click();
Window<?> categoryWindow = new Window.WindowFinder(getDriver()).withTitle("Manage Categories").waitFor();
for (String categoryName : categoryNames)
addCategory(categoryName, categoryWindow);
clickButton("Done", 0);
categoryWindow.waitForClose();
}

private void addCategory(String categoryName, Window<?> categoryWindow)
{
int attempt = 0;
while (true)
{
categoryWindow.clickButton("New Category", 0);
WebElement newCategoryField = Locator.input("label").withAttributeContaining("id", "textfield").notHidden().waitForElement(categoryWindow, WAIT_FOR_JAVASCRIPT);
setFormElementJS(newCategoryField, categoryName);
fireEvent(newCategoryField, SeleniumEvent.blur);
new WebDriverWait(getDriver(), Duration.ofSeconds(2)).until(ExpectedConditions.invisibilityOf(newCategoryField));
try
{
Locator.tagWithText("div", categoryName).waitForElement(categoryWindow, 2_000);
break;
}
catch (NoSuchElementException e)
{
if (++attempt >= 3)
throw e;
}
}
}
}
14 changes: 1 addition & 13 deletions src/org/labkey/test/tests/SampleTypeLinkToStudyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@
import org.labkey.test.params.FieldDefinition;
import org.labkey.test.params.experiment.SampleTypeDefinition;
import org.labkey.test.util.DataRegionTable;
import org.labkey.test.util.Ext4Helper;
import org.labkey.test.util.PortalHelper;
import org.labkey.test.util.SampleTypeHelper;
import org.labkey.test.util.StudyHelper;
import org.labkey.test.util.TestDataGenerator;
import org.openqa.selenium.WebElement;

import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -773,17 +771,7 @@ private void createNewVisits(String label, String startRange, String endRange)
private void createDatasetCategory(String projectName, String name)
{
goToProjectHome(projectName);
goToManageViews();
Locator.linkWithText("Manage Categories").findElement(getDriver()).click();
_extHelper.waitForExtDialog("Manage Categories");
Window<?> categoryWindow = new Window.WindowFinder(getDriver()).withTitle("Manage Categories").waitFor();
categoryWindow.clickButton("New Category", 0);
WebElement newCategoryField = Locator.input("label").withAttributeContaining("id", "textfield").notHidden().waitForElement(getDriver(), WAIT_FOR_JAVASCRIPT);
setFormElementJS(newCategoryField, name);
fireEvent(newCategoryField, SeleniumEvent.blur);
waitForElement(Ext4Helper.Locators.window("Manage Categories").append("//div").withText(name));
clickButton("Done", 0);
_extHelper.waitForExtDialogToDisappear("Manage Categories");
goToManageViews().createCategory(name);
}

private String getCategory(String projectName, String datasetName)
Expand Down