Skip to content

Commit 704faa2

Browse files
committed
update tests
1 parent 829316b commit 704faa2

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

enterprise/coderd/groups_test.go

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -613,8 +613,8 @@ func TestGroup(t *testing.T) {
613613
AddUsers: []string{user2.ID.String(), user3.ID.String()},
614614
})
615615
require.NoError(t, err)
616-
require.Contains(t, group.Members, user2)
617-
require.Contains(t, group.Members, user3)
616+
require.Contains(t, group.Members, user2.ReducedUser)
617+
require.Contains(t, group.Members, user3.ReducedUser)
618618

619619
ggroup, err := userAdminClient.Group(ctx, group.ID)
620620
require.NoError(t, err)
@@ -665,15 +665,15 @@ func TestGroup(t *testing.T) {
665665
AddUsers: []string{user1.ID.String(), user2.ID.String()},
666666
})
667667
require.NoError(t, err)
668-
require.Contains(t, group.Members, user1)
669-
require.Contains(t, group.Members, user2)
668+
require.Contains(t, group.Members, user1.ReducedUser)
669+
require.Contains(t, group.Members, user2.ReducedUser)
670670

671671
err = userAdminClient.DeleteUser(ctx, user1.ID)
672672
require.NoError(t, err)
673673

674674
group, err = userAdminClient.Group(ctx, group.ID)
675675
require.NoError(t, err)
676-
require.NotContains(t, group.Members, user1)
676+
require.NotContains(t, group.Members, user1.ReducedUser)
677677
})
678678

679679
t.Run("IncludeSuspendedAndDormantUsers", func(t *testing.T) {
@@ -700,17 +700,17 @@ func TestGroup(t *testing.T) {
700700
})
701701
require.NoError(t, err)
702702
require.Len(t, group.Members, 2)
703-
require.Contains(t, group.Members, user1)
704-
require.Contains(t, group.Members, user2)
703+
require.Contains(t, group.Members, user1.ReducedUser)
704+
require.Contains(t, group.Members, user2.ReducedUser)
705705

706706
user1, err = userAdminClient.UpdateUserStatus(ctx, user1.ID.String(), codersdk.UserStatusSuspended)
707707
require.NoError(t, err)
708708

709709
group, err = userAdminClient.Group(ctx, group.ID)
710710
require.NoError(t, err)
711711
require.Len(t, group.Members, 2)
712-
require.Contains(t, group.Members, user1)
713-
require.Contains(t, group.Members, user2)
712+
require.Contains(t, group.Members, user1.ReducedUser)
713+
require.Contains(t, group.Members, user2.ReducedUser)
714714

715715
// cannot explicitly set a dormant user status so must create a new user
716716
anotherUser, err := userAdminClient.CreateUser(ctx, codersdk.CreateUserRequest{
@@ -731,8 +731,8 @@ func TestGroup(t *testing.T) {
731731
group, err = userAdminClient.Group(ctx, group.ID)
732732
require.NoError(t, err)
733733
require.Len(t, group.Members, 3)
734-
require.Contains(t, group.Members, user1)
735-
require.Contains(t, group.Members, user2)
734+
require.Contains(t, group.Members, user1.ReducedUser)
735+
require.Contains(t, group.Members, user2.ReducedUser)
736736
})
737737

738738
t.Run("everyoneGroupReturnsEmpty", func(t *testing.T) {
@@ -754,7 +754,8 @@ func TestGroup(t *testing.T) {
754754
require.Len(t, group.Members, 4)
755755
require.Equal(t, "Everyone", group.Name)
756756
require.Equal(t, user.OrganizationID, group.OrganizationID)
757-
require.Contains(t, group.Members, user1, user2)
757+
require.Contains(t, group.Members, user1.ReducedUser)
758+
require.Contains(t, group.Members, user2.ReducedUser)
758759
})
759760
}
760761

0 commit comments

Comments
 (0)