add to unit test

Emyrk · Emyrk · commit 9063675f50bd · 2024-08-07T12:20:32.000-05:00
diff --git a/enterprise/coderd/roles.go b/enterprise/coderd/roles.go
@@ -133,9 +133,6 @@ func (api *API) patchOrgRoles(rw http.ResponseWriter, r *http.Request) {
 }
 
 // deleteOrgRole will remove a custom role from an organization
-// TODO: Deleting a custom role will remove permissions from any existing user
-// with the role assigned. TBD if we want to also remove the roles from the
-// user, or request the admin remove all the user roles first.
 //
 // @Summary Delete a custom organization role
 // @ID delete-a-custom-organization-role
diff --git a/enterprise/coderd/roles_test.go b/enterprise/coderd/roles_test.go
@@ -403,10 +403,10 @@ func TestCustomOrganizationRole(t *testing.T) {
 		coderdtest.CreateAnotherUser(t, owner, first.OrganizationID, rbac.ScopedRoleOrgTemplateAdmin(first.OrganizationID), rbac.ScopedRoleOrgAuditor(first.OrganizationID), customRoleIdentifier)
 
 		// Verify members have the custom role
-		members, err := orgAdmin.OrganizationMembers(ctx, first.OrganizationID)
+		originalMembers, err := orgAdmin.OrganizationMembers(ctx, first.OrganizationID)
 		require.NoError(t, err)
-		require.Len(t, members, 5) // 3 members + org admin + owner
-		for _, member := range members {
+		require.Len(t, originalMembers, 5) // 3 members + org admin + owner
+		for _, member := range originalMembers {
 			if member.UserID == orgAdminUser.ID || member.UserID == first.UserID {
 				continue
 			}
@@ -420,13 +420,22 @@ func TestCustomOrganizationRole(t *testing.T) {
 		require.NoError(t, err)
 
 		// Verify the role was removed from all members
-		members, err = orgAdmin.OrganizationMembers(ctx, first.OrganizationID)
+		members, err := orgAdmin.OrganizationMembers(ctx, first.OrganizationID)
 		require.NoError(t, err)
 		require.Len(t, members, 5) // 3 members + org admin + owner
 		for _, member := range members {
 			require.False(t, slices.ContainsFunc(member.Roles, func(role codersdk.SlimRole) bool {
 				return role.Name == customRoleIdentifier.Name
 			}), "role should be removed from all users")
+
+			// Verify the rest of the member's roles are unchanged
+			original := originalMembers[slices.IndexFunc(originalMembers, func(haystack codersdk.OrganizationMemberWithUserData) bool {
+				return haystack.UserID == member.UserID
+			})]
+			originalWithoutCustom := slices.DeleteFunc(original.Roles, func(role codersdk.SlimRole) bool {
+				return role.Name == customRoleIdentifier.Name
+			})
+			require.ElementsMatch(t, originalWithoutCustom, member.Roles, "original roles are unchanged")
 		}
 	})
 }

Original file line number	Diff line number	Diff line change
`@@ -133,9 +133,6 @@ func (api API) patchOrgRoles(rw http.ResponseWriter, r http.Request) {`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`// deleteOrgRole will remove a custom role from an organization`
`136`		`-// TODO: Deleting a custom role will remove permissions from any existing user`
`137`		`-// with the role assigned. TBD if we want to also remove the roles from the`
`138`		`-// user, or request the admin remove all the user roles first.`
`139`	`136`	`//`
`140`	`137`	`// @Summary Delete a custom organization role`
`141`	`138`	`// @ID delete-a-custom-organization-role`