Skip to content

Commit 0923780

Browse files
EmyrkEmyrk
committed
Fix user tests to expect outputs
1 parent 1336e28 commit 0923780

File tree

1 file changed

+23
-21
lines changed

1 file changed

+23
-21
lines changed

‎coderd/authzquery/user_test.go

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,17 @@ func (s *MethodTestSuite) TestUser() {
7676
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
7777
a := dbgen.User(t, db, database.User{})
7878
b := dbgen.User(t, db, database.User{})
79-
return methodCase(values([]uuid.UUID{a.ID, b.ID}), asserts(a, rbac.ActionRead, b, rbac.ActionRead))
79+
return methodCase(values([]uuid.UUID{a.ID, b.ID}),
80+
asserts(a, rbac.ActionRead, b, rbac.ActionRead),
81+
values([]database.User{a, b}))
8082
})
8183
})
8284
s.Run("InsertUser", func() {
8385
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
8486
return methodCase(values(database.InsertUserParams{
8587
ID: uuid.New(),
8688
LoginType: database.LoginTypePassword,
87-
}), asserts(rbac.ResourceRoleAssignment, rbac.ActionCreate, rbac.ResourceUser, rbac.ActionCreate))
89+
}), asserts(rbac.ResourceRoleAssignment, rbac.ActionCreate, rbac.ResourceUser, rbac.ActionCreate), nil)
8890
})
8991
})
9092
s.Run("InsertUserLink", func() {
@@ -93,46 +95,46 @@ func (s *MethodTestSuite) TestUser() {
9395
return methodCase(values(database.InsertUserLinkParams{
9496
UserID: u.ID,
9597
LoginType: database.LoginTypeOIDC,
96-
}), asserts(u, rbac.ActionUpdate))
98+
}), asserts(u, rbac.ActionUpdate), nil)
9799
})
98100
})
99101
s.Run("SoftDeleteUserByID", func() {
100102
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
101103
u := dbgen.User(t, db, database.User{})
102-
return methodCase(values(u.ID), asserts(u, rbac.ActionDelete))
104+
return methodCase(values(u.ID), asserts(u, rbac.ActionDelete), values())
103105
})
104106
})
105107
s.Run("UpdateUserDeletedByID", func() {
106108
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
107-
u := dbgen.User(t, db, database.User{})
109+
u := dbgen.User(t, db, database.User{Deleted: true})
108110
return methodCase(values(database.UpdateUserDeletedByIDParams{
109111
ID: u.ID,
110112
Deleted: true,
111-
}), asserts(u, rbac.ActionDelete))
113+
}), asserts(u, rbac.ActionDelete), values(u))
112114
})
113115
})
114116
s.Run("UpdateUserHashedPassword", func() {
115117
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
116118
u := dbgen.User(t, db, database.User{})
117119
return methodCase(values(database.UpdateUserHashedPasswordParams{
118120
ID: u.ID,
119-
}), asserts(u.UserDataRBACObject(), rbac.ActionUpdate))
121+
}), asserts(u.UserDataRBACObject(), rbac.ActionUpdate), values(u))
120122
})
121123
})
122124
s.Run("UpdateUserLastSeenAt", func() {
123125
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
124126
u := dbgen.User(t, db, database.User{})
125127
return methodCase(values(database.UpdateUserLastSeenAtParams{
126128
ID: u.ID,
127-
}), asserts(u, rbac.ActionUpdate))
129+
}), asserts(u, rbac.ActionUpdate), values(u))
128130
})
129131
})
130132
s.Run("UpdateUserProfile", func() {
131133
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
132134
u := dbgen.User(t, db, database.User{})
133135
return methodCase(values(database.UpdateUserProfileParams{
134136
ID: u.ID,
135-
}), asserts(u.UserDataRBACObject(), rbac.ActionUpdate))
137+
}), asserts(u.UserDataRBACObject(), rbac.ActionUpdate), values(u))
136138
})
137139
})
138140
s.Run("UpdateUserStatus", func() {
@@ -141,35 +143,33 @@ func (s *MethodTestSuite) TestUser() {
141143
return methodCase(values(database.UpdateUserStatusParams{
142144
ID: u.ID,
143145
Status: database.UserStatusActive,
144-
}), asserts(u, rbac.ActionUpdate))
146+
}), asserts(u, rbac.ActionUpdate), values(u))
145147
})
146148
})
147149
s.Run("DeleteGitSSHKey", func() {
148150
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
149151
key := dbgen.GitSSHKey(t, db, database.GitSSHKey{})
150-
return methodCase(values(key.UserID), asserts(key, rbac.ActionDelete))
152+
return methodCase(values(key.UserID), asserts(key, rbac.ActionDelete), values())
151153
})
152154
})
153155
s.Run("GetGitSSHKey", func() {
154156
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
155157
key := dbgen.GitSSHKey(t, db, database.GitSSHKey{})
156-
return methodCase(values(key.UserID), asserts(key, rbac.ActionRead))
158+
return methodCase(values(key.UserID), asserts(key, rbac.ActionRead), values(key))
157159
})
158160
})
159161
s.Run("InsertGitSSHKey", func() {
160162
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
161163
u := dbgen.User(t, db, database.User{})
162164
return methodCase(values(database.InsertGitSSHKeyParams{
163165
UserID: u.ID,
164-
}), asserts(rbac.ResourceUserData.WithID(u.ID).WithOwner(u.ID.String()), rbac.ActionCreate))
166+
}), asserts(rbac.ResourceUserData.WithID(u.ID).WithOwner(u.ID.String()), rbac.ActionCreate), nil)
165167
})
166168
})
167169
s.Run("UpdateGitSSHKey", func() {
168170
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
169171
key := dbgen.GitSSHKey(t, db, database.GitSSHKey{})
170-
return methodCase(values(database.UpdateGitSSHKeyParams{
171-
UserID: key.UserID,
172-
}), asserts(key, rbac.ActionUpdate))
172+
return methodCase(values(database.UpdateGitSSHKeyParams{}), asserts(key, rbac.ActionUpdate), values(key))
173173
})
174174
})
175175
s.Run("GetGitAuthLink", func() {
@@ -178,7 +178,7 @@ func (s *MethodTestSuite) TestUser() {
178178
return methodCase(values(database.GetGitAuthLinkParams{
179179
ProviderID: link.ProviderID,
180180
UserID: link.UserID,
181-
}), asserts(link, rbac.ActionRead))
181+
}), asserts(link, rbac.ActionRead), values(link))
182182
})
183183
})
184184
s.Run("InsertGitAuthLink", func() {
@@ -187,7 +187,7 @@ func (s *MethodTestSuite) TestUser() {
187187
return methodCase(values(database.InsertGitAuthLinkParams{
188188
ProviderID: uuid.NewString(),
189189
UserID: u.ID,
190-
}), asserts(rbac.ResourceUserData.WithOwner(u.ID.String()).WithID(u.ID), rbac.ActionCreate))
190+
}), asserts(rbac.ResourceUserData.WithOwner(u.ID.String()).WithID(u.ID), rbac.ActionCreate), nil)
191191
})
192192
})
193193
s.Run("UpdateGitAuthLink", func() {
@@ -196,7 +196,7 @@ func (s *MethodTestSuite) TestUser() {
196196
return methodCase(values(database.UpdateGitAuthLinkParams{
197197
ProviderID: link.ProviderID,
198198
UserID: link.UserID,
199-
}), asserts(link, rbac.ActionUpdate))
199+
}), asserts(link, rbac.ActionUpdate), values(link))
200200
})
201201
})
202202
s.Run("UpdateUserLink", func() {
@@ -205,20 +205,22 @@ func (s *MethodTestSuite) TestUser() {
205205
return methodCase(values(database.UpdateUserLinkParams{
206206
UserID: link.UserID,
207207
LoginType: link.LoginType,
208-
}), asserts(link, rbac.ActionUpdate))
208+
}), asserts(link, rbac.ActionUpdate), values(link))
209209
})
210210
})
211211
s.Run("UpdateUserRoles", func() {
212212
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
213213
u := dbgen.User(t, db, database.User{RBACRoles: []string{rbac.RoleTemplateAdmin()}})
214+
o := u
215+
o.RBACRoles = []string{rbac.RoleUserAdmin()}
214216
return methodCase(values(database.UpdateUserRolesParams{
215217
GrantedRoles: []string{rbac.RoleUserAdmin()},
216218
ID: u.ID,
217219
}), asserts(
218220
u, rbac.ActionRead,
219221
rbac.ResourceRoleAssignment, rbac.ActionCreate,
220222
rbac.ResourceRoleAssignment, rbac.ActionDelete,
221-
))
223+
), values(o))
222224
})
223225
})
224226
}

0 commit comments

Comments
 (0)