Skip to content
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.

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

Support testing restricted issue lists #2264

Merged
merged 1 commit into from
Feb 14, 2025
Merged
Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions src/org/labkey/test/pages/issues/DetailsPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ public InsertPage clickCreateRelatedIssue(String projectName, String issueName)
return new InsertPage(getDriver());
}

public InsertPage clickCreateNewIssue()
{
elementCache().getMoreMenu().clickSubMenu(false, "New issue");
return new InsertPage(getDriver());
}

public DetailsPage clickShowRelatedIssueComment()
{
elementCache().getMoreMenu().clickSubMenu(false, "Show related comments");
Expand Down
12 changes: 12 additions & 0 deletions src/org/labkey/test/pages/issues/IssuesAdminPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.labkey.test.WebDriverWrapper;
import org.labkey.test.WebTestHelper;
import org.labkey.test.components.domain.DomainDesigner;
import org.labkey.test.components.html.Checkbox;
import org.labkey.test.components.html.Input;
import org.labkey.test.components.html.OptionSelect;
import org.labkey.test.components.react.ReactSelect;
Expand Down Expand Up @@ -128,6 +129,16 @@ public IssuesAdminPage setDefaultUser(String value)
return this;
}

public IssuesAdminPage setRestrictedList(boolean check)
{
expandPropertiesPanel();
if (check)
elementCache().restrictedList.check();
else
elementCache().restrictedList.uncheck();
return this;
}

@Override
public ListPage clickSave()
{
Expand Down Expand Up @@ -185,5 +196,6 @@ protected class ElementCache extends DomainDesigner<?>.ElementCache
ReactSelect assignedToSelect = ReactSelect.finder(getDriver()).findWhenNeeded(assignedToRow);
WebElement defaultUserRow = Locator.tagWithClass("div", "row").containingIgnoreCase("Default User").findWhenNeeded(this);
ReactSelect defaultUserSelect = ReactSelect.finder(getDriver()).findWhenNeeded(defaultUserRow);
Checkbox restrictedList = new Checkbox(Locator.checkboxByName("restrictedIssueList").findWhenNeeded(propertiesPanel));
}
}
35 changes: 29 additions & 6 deletions src/org/labkey/test/util/IssuesHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -100,20 +100,37 @@ public ListPage goToIssueList(String container, String name)

@LogMethod
public void createNewIssuesList(String name, AbstractContainerHelper containerHelper)
{
createNewIssuesList(name, containerHelper, true, true, true);
}

@LogMethod
public void createNewIssuesList(
String name,
AbstractContainerHelper containerHelper,
boolean includeIssueDefinitionWebPart,
boolean includeIssueSummaryWebPart,
boolean includeSearchWebPart
)
{
pushLocation();
containerHelper.enableModule("Issues");
PortalHelper portalHelper = new PortalHelper(getDriver());
portalHelper.addWebPart("Issue Definitions");
if (includeIssueDefinitionWebPart)
portalHelper.addWebPart("Issue Definitions");
IssueListDefDataRegion.fromWebPart(getDriver()).createIssuesListDefinition(name);
popLocation();

portalHelper.addWebPart("Issues Summary");
selectOptionByValue(Locator.name("issueDefName"), name.toLowerCase().replaceAll("[ -]+", ""));
clickAndWait(Locator.linkWithText("Submit"));
portalHelper.addWebPart("Search");
if (includeIssueSummaryWebPart)
{
portalHelper.addWebPart("Issues Summary");
selectOptionByValue(Locator.name("issueDefName"), name.toLowerCase().replaceAll("[ -]+", ""));
clickAndWait(Locator.linkWithText("Submit"));
assertElementPresent(Locator.tagWithText("div", "There are no issues in this list."));
}

assertElementPresent(Locator.tagWithText("div", "There are no issues in this list."));
if (includeSearchWebPart)
portalHelper.addWebPart("Search");
}

public void deleteIssueLists(String projectName, LabKeySiteWrapper test)
Expand Down Expand Up @@ -215,6 +232,12 @@ public void setIssueAssignmentUser(@Nullable @LoggedParam String user)
new IssuesAdminPage(getDriver()).setDefaultUser(user);
}

@LogMethod
public void setRestrictedIssueList(boolean restricted)
{
new IssuesAdminPage(getDriver()).setRestrictedList(restricted);
}

public IssuesAdminPage goToAdmin()
{
clickButton("Admin");
Expand Down