Skip to content

[bot] Merge 25.7 to develop (Conflicts) #2753

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
github-actions merged 3 commits into from
Oct 21, 2025
Merged

[bot] Merge 25.7 to develop (Conflicts) #2753

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
34f786d
Permission validation for related issues (#2739)
labkey-klum Oct 14, 2025
99e7488
Fix some typos in BaseUpgradeTest (#2745)
labkey-tchad Oct 15, 2025
49f570b
Merge 25.7 to develop
labkey-klum Oct 21, 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
42 changes: 40 additions & 2 deletions src/org/labkey/test/tests/issues/IssuesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,14 @@ public class IssuesTest extends BaseWebDriverTest
private static final String USER2 = "user2_issuetest@issues.test";
private static final String USER3 = "user3_issuetest@issues.test";
private static final String USER4 = "user4_issuetest@issues.test";
private static final String CLIENT_USER1 = "clientuser1_issuetest@issues.test";
private static final String user = "reader@issues.test";
private static final Map<String, String> ISSUE_0 = new HashMap<>(Maps.of("title", ISSUE_TITLE_0, "Priority", "2", "comment", "a bright flash of light"));
private static final Map<String, String> ISSUE_1 = new HashMap<>(Maps.of("title", ISSUE_TITLE_1, "Priority", "1", "comment", "alien autopsy"));
private static final String ISSUE_SUMMARY_WEBPART_NAME = "Issues Summary";
private static final String ISSUE_LIST_REGION_NAME = "issues-issues";
private static final String TEST_GROUP = "testers";
private static final String CLIENT_GROUP = "clients";
private static final String TEST_EMAIL_TEMPLATE =
"You can review this issue here: ^detailsURL^\n" +
"Modified by: ^user^\n" +
Expand All @@ -105,6 +107,7 @@ public class IssuesTest extends BaseWebDriverTest
private static String NAME;
protected IssuesHelper _issuesHelper;
private final ApiPermissionsHelper _permissionsHelper = new ApiPermissionsHelper(this);
private static String CLIENT_PORTAL = "Client Issues";

public IssuesTest()
{
Expand Down Expand Up @@ -158,8 +161,9 @@ protected String getProjectName()
@Override
protected void doCleanup(boolean afterTest) throws TestTimeoutException
{
_userHelper.deleteUsers(false, USER1, USER2, USER3, USER4);
_userHelper.deleteUsers(false, USER1, USER2, USER3, CLIENT_USER1);
_containerHelper.deleteProject(getProjectName(), afterTest);
_containerHelper.deleteProject(CLIENT_PORTAL, afterTest);
}

public void doInit()
Expand Down Expand Up @@ -193,6 +197,15 @@ public void doInit()
waitAndClickAndWait(Locator.linkContainingText(ISSUE_SUMMARY_WEBPART_NAME));
_issuesHelper.addIssue(ISSUE_0);
_issuesHelper.addIssue(ISSUE_1);

// Create a second project with different permissions
_containerHelper.createProject(CLIENT_PORTAL);
goToProjectHome(CLIENT_PORTAL);
_userHelper.createUser(CLIENT_USER1);
_permissionsHelper.createPermissionsGroup(CLIENT_GROUP);
_permissionsHelper.setPermissions(CLIENT_GROUP, "Editor");
_permissionsHelper.addUserToProjGroup(CLIENT_USER1, CLIENT_PORTAL, CLIENT_GROUP);
_issuesHelper.createNewIssuesList("tickets", _containerHelper);
}

@Before
Expand Down Expand Up @@ -834,7 +847,32 @@ public void relatedIssueTest()
.clickSubMenu(false, "Hide related comments");
assertElementNotVisible(related);

// NOTE: still need to test for case where user doesn't have permission to related issue...
// related issue permission tests
Locator commentLocator = Locator.name("related");
goToProjectHome(CLIENT_PORTAL);
waitAndClickAndWait(Locator.linkContainingText(ISSUE_SUMMARY_WEBPART_NAME));
String clientIssueId = _issuesHelper.addIssue(Maps.of("assignedTo", NAME, "title", "Client ticket", "priority", "3", "related", issueIdA)).getIssueId();

// impersonate a user without permissions to the related issues
impersonate(CLIENT_USER1);
clickAndWait(Locator.linkWithText("Issues List"));
clickAndWait(Locator.linkWithText(clientIssueId));
updateIssue();
setFormElement(Locator.name("comment"), "This should work");
clickButton("Save");

// try to add related issue they don't have permission to see
updateIssue();
setFormElement(relatedLocator, String.format("%s,%s", issueIdA, issueIdB));
clickButton("Save");
assertTextPresent("User does not have Read Permission for related issue");

// Issue 53820 try to remove a related issue they don't have permission to see
setFormElement(relatedLocator, "");
clickButton("Save");
assertTextPresent(String.format("User does not have Read Permission for related issue '%s'", issueIdA));
clickButton("Cancel");
stopImpersonating();
}

@Test
Expand Down
17 changes: 9 additions & 8 deletions src/org/labkey/test/tests/upgrade/BaseUpgradeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
import static org.apache.commons.lang3.StringUtils.trimToNull;

/**
* Base test class for tests that setup data and configure a server then verify the persistence or modification of those
* data and configurations after upgrading to a newer version of LabKey.<br>
* The {@code EariestVersion} and {@code LatestVersion} annotations can be used to skip particular tests when they are
* Base test class for tests that set up data and configure a server, then verify the persistence or modification of
* those data and configurations after upgrading to a newer version of LabKey.<br>
* The {@link EarliestVersion} and {@link LatestVersion} annotations can be used to skip particular tests when they are
* not relevant to the version of LabKey being upgraded from (specified in the {@code webtest.upgradePreviousVersion}
* system property).<br>
* The setup steps will be skipped if the {@code webtest.upgradeSetup} system property is set to {@code false}.
Expand Down Expand Up @@ -77,7 +77,8 @@ public List<String> getAssociatedModules()
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD})
protected @interface EariestVersion {
protected @interface EarliestVersion
{
String value();
}

Expand All @@ -98,12 +99,12 @@ private static class UpgradeVersionCheck implements TestRule
@Override
public @NotNull Statement apply(Statement base, Description description)
{
String eariestVersion = Optional.ofNullable(description.getAnnotation(EariestVersion.class))
.map(EariestVersion::value).orElse(null);
String earliestVersion = Optional.ofNullable(description.getAnnotation(EarliestVersion.class))
.map(EarliestVersion::value).orElse(null);
String latestVersion = Optional.ofNullable(description.getAnnotation(LatestVersion.class))
.map(LatestVersion::value).orElse(null);

if (isUpgradeSetupPhase || previousVersion == null || (eariestVersion == null && latestVersion == null))
if (isUpgradeSetupPhase || previousVersion == null || (earliestVersion == null && latestVersion == null))
{
return base; // Run the test normally
}
Expand All @@ -114,7 +115,7 @@ private static class UpgradeVersionCheck implements TestRule
public void evaluate() throws Throwable
{
Assume.assumeTrue("Test doesn't support upgrading from version: " + previousVersion,
VersionRange.versionRange(eariestVersion, latestVersion).contains(previousVersion)
VersionRange.versionRange(earliestVersion, latestVersion).contains(previousVersion)
);
base.evaluate();
}
Expand Down