From 027ca7cff0a67666eb8c92691db78ef94a333e41 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Tue, 14 Jul 2026 09:39:59 -0700 Subject: [PATCH 1/2] Use the project when removing members for a project group --- src/org/labkey/test/tests/UserPermissionsTest.java | 2 +- src/org/labkey/test/util/ApiPermissionsHelper.java | 8 ++++---- src/org/labkey/test/util/PermissionsHelper.java | 2 +- src/org/labkey/test/util/UIPermissionsHelper.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/org/labkey/test/tests/UserPermissionsTest.java b/src/org/labkey/test/tests/UserPermissionsTest.java index 4ec3da23c6..bd0b3d1cb8 100644 --- a/src/org/labkey/test/tests/UserPermissionsTest.java +++ b/src/org/labkey/test/tests/UserPermissionsTest.java @@ -272,7 +272,7 @@ public void testAuditLogForGroupUpdates() log("Remove user from group and verify logs"); goToProjectHome(); - permissionsHelper.removeUserFromGroup(GAMMA_SUBMITTER_GROUP_NAME, GAMMA_SUBMITTER_USER); + permissionsHelper.removeUserFromGroup(GAMMA_SUBMITTER_GROUP_NAME, GAMMA_SUBMITTER_USER, getProjectName()); verifyAuditLog("User: " + GAMMA_SUBMITTER_USER + " was deleted from Group: " + GAMMA_SUBMITTER_GROUP_NAME); } diff --git a/src/org/labkey/test/util/ApiPermissionsHelper.java b/src/org/labkey/test/util/ApiPermissionsHelper.java index 63e4e6d093..fce05c898e 100644 --- a/src/org/labkey/test/util/ApiPermissionsHelper.java +++ b/src/org/labkey/test/util/ApiPermissionsHelper.java @@ -658,12 +658,12 @@ private List getGroupNames(String project) } @Override - public void removeUserFromGroup(String groupName, String userName) + public void removeUserFromGroup(String groupName, String userName, String projectPath) { Integer groupId = getGroupId(groupName); if (groupId == null) throw new IllegalArgumentException("Attempting to remove members from non-existent site group: " + groupName); - removeMembersFromGroup(groupId, userName); + removeMembersFromGroup(groupId, projectPath, userName); } @Override @@ -675,7 +675,7 @@ public void removeUserFromSiteGroup(String groupName, String userName) removeMembersFromGroup(groupId, userName); } - private void removeMembersFromGroup(Integer groupId, String... members) + private void removeMembersFromGroup(Integer groupId, String projectPath, String... members) { BulkUpdateGroupCommand command = new BulkUpdateGroupCommand(groupId); command.setCreateGroup(false); @@ -685,7 +685,7 @@ private void removeMembersFromGroup(Integer groupId, String... members) try { Connection connection = getConnection(); - command.execute(connection, "/"); + command.execute(connection, projectPath); } catch (IOException | CommandException e) { diff --git a/src/org/labkey/test/util/PermissionsHelper.java b/src/org/labkey/test/util/PermissionsHelper.java index 8a4bc85741..576f405495 100644 --- a/src/org/labkey/test/util/PermissionsHelper.java +++ b/src/org/labkey/test/util/PermissionsHelper.java @@ -175,7 +175,7 @@ public void deleteGroup(String groupName) @LogMethod(quiet = true) public abstract void deleteGroup(@LoggedParam String groupName, boolean failIfNotFound); - public abstract void removeUserFromGroup(String groupName, String userName); + public abstract void removeUserFromGroup(String groupName, String userName, String projectName); public abstract void removeUserFromSiteGroup(String groupName, String userName); public abstract boolean doesGroupExist(String groupName, String projectName); diff --git a/src/org/labkey/test/util/UIPermissionsHelper.java b/src/org/labkey/test/util/UIPermissionsHelper.java index b28dc66512..a59816f158 100644 --- a/src/org/labkey/test/util/UIPermissionsHelper.java +++ b/src/org/labkey/test/util/UIPermissionsHelper.java @@ -316,11 +316,11 @@ public void deleteGroup(@LoggedParam String groupName, boolean failIfNotFound) @Override public void removeUserFromSiteGroup(String groupName, String userEmail) { - removeUserFromGroup(groupName, userEmail); + removeUserFromGroup(groupName, userEmail, "/"); } @Override - public void removeUserFromGroup(String groupName, String userEmail) + public void removeUserFromGroup(String groupName, String userEmail, String projectPath) { if (!_driver.isTextPresent("Group " + groupName)) selectGroup(groupName); From 2ab0e73a01e388fd80c06309647fdfc5c47be6c8 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Tue, 14 Jul 2026 10:04:57 -0700 Subject: [PATCH 2/2] Use root for site groups --- src/org/labkey/test/util/ApiPermissionsHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/util/ApiPermissionsHelper.java b/src/org/labkey/test/util/ApiPermissionsHelper.java index fce05c898e..71752ce49d 100644 --- a/src/org/labkey/test/util/ApiPermissionsHelper.java +++ b/src/org/labkey/test/util/ApiPermissionsHelper.java @@ -672,7 +672,7 @@ public void removeUserFromSiteGroup(String groupName, String userName) Integer groupId = getSiteGroupId(groupName); if (groupId == null) throw new IllegalArgumentException("Attempting to remove members from non-existent group: " + groupName); - removeMembersFromGroup(groupId, userName); + removeMembersFromGroup(groupId, "/", userName); } private void removeMembersFromGroup(Integer groupId, String projectPath, String... members)