Skip to content

Commit 8b39d7e

Browse files
EmyrkEmyrk
committed
Fix most users
1 parent 90a9d87 commit 8b39d7e

File tree

2 files changed

+23
-15
lines changed

2 files changed

+23
-15
lines changed

‎coderd/authzquery/methods_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ MethodLoop:
152152
// Assert the required outputs
153153
require.Equal(t, len(testCase.ExpectedOutputs), len(outputs), "method %q returned unexpected number of outputs", testName)
154154
for i := range outputs {
155-
require.Equal(t, testCase.ExpectedOutputs[i].Interface(), outputs[i].Interface(), "method %q returned unexpected output %d", testName, i)
155+
a, b := testCase.ExpectedOutputs[i].Interface(), outputs[i].Interface()
156+
require.Equal(t, a, b, "method %q returned unexpected output %d", testName, i)
156157
}
157158
}
158159

‎coderd/authzquery/user_test.go

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ func (s *MethodTestSuite) TestUser() {
2020
s.Run("GetQuotaAllowanceForUser", func() {
2121
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
2222
u := dbgen.User(t, db, database.User{})
23-
return methodCase(values(u.ID), asserts(u, rbac.ActionRead), values(0))
23+
return methodCase(values(u.ID), asserts(u, rbac.ActionRead), values(int64(0)))
2424
})
2525
})
2626
s.Run("GetQuotaConsumedForUser", func() {
2727
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
2828
u := dbgen.User(t, db, database.User{})
29-
return methodCase(values(u.ID), asserts(u, rbac.ActionRead), values(0))
29+
return methodCase(values(u.ID), asserts(u, rbac.ActionRead), values(int64(0)))
3030
})
3131
})
3232
s.Run("GetUserByEmailOrUsername", func() {
@@ -47,13 +47,13 @@ func (s *MethodTestSuite) TestUser() {
4747
s.Run("GetAuthorizedUserCount", func() {
4848
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
4949
_ = dbgen.User(t, db, database.User{})
50-
return methodCase(values(database.GetFilteredUserCountParams{}, emptyPreparedAuthorized{}), asserts(), values(1))
50+
return methodCase(values(database.GetFilteredUserCountParams{}, emptyPreparedAuthorized{}), asserts(), values(int64(1)))
5151
})
5252
})
5353
s.Run("GetFilteredUserCount", func() {
5454
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
5555
_ = dbgen.User(t, db, database.User{})
56-
return methodCase(values(database.GetFilteredUserCountParams{}), asserts(), values(1))
56+
return methodCase(values(database.GetFilteredUserCountParams{}), asserts(), values(int64(1)))
5757
})
5858
})
5959
s.Run("GetUsers", func() {
@@ -62,7 +62,7 @@ func (s *MethodTestSuite) TestUser() {
6262
b := dbgen.User(t, db, database.User{})
6363
return methodCase(values(database.GetUsersParams{}),
6464
asserts(a, rbac.ActionRead, b, rbac.ActionRead),
65-
values([]database.User{a, b}))
65+
nil)
6666
})
6767
})
6868
s.Run("GetUsersWithCount", func() {
@@ -110,39 +110,43 @@ func (s *MethodTestSuite) TestUser() {
110110
return methodCase(values(database.UpdateUserDeletedByIDParams{
111111
ID: u.ID,
112112
Deleted: true,
113-
}), asserts(u, rbac.ActionDelete), values(u))
113+
}), asserts(u, rbac.ActionDelete), values())
114114
})
115115
})
116116
s.Run("UpdateUserHashedPassword", func() {
117117
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
118118
u := dbgen.User(t, db, database.User{})
119119
return methodCase(values(database.UpdateUserHashedPasswordParams{
120120
ID: u.ID,
121-
}), asserts(u.UserDataRBACObject(), rbac.ActionUpdate), values(u))
121+
}), asserts(u.UserDataRBACObject(), rbac.ActionUpdate), values())
122122
})
123123
})
124124
s.Run("UpdateUserLastSeenAt", func() {
125125
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
126126
u := dbgen.User(t, db, database.User{})
127127
return methodCase(values(database.UpdateUserLastSeenAtParams{
128-
ID: u.ID,
128+
ID: u.ID,
129+
UpdatedAt: u.UpdatedAt,
130+
LastSeenAt: u.LastSeenAt,
129131
}), asserts(u, rbac.ActionUpdate), values(u))
130132
})
131133
})
132134
s.Run("UpdateUserProfile", func() {
133135
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
134136
u := dbgen.User(t, db, database.User{})
135137
return methodCase(values(database.UpdateUserProfileParams{
136-
ID: u.ID,
137-
}), asserts(u.UserDataRBACObject(), rbac.ActionUpdate), values(u))
138+
ID: u.ID,
139+
UpdatedAt: u.UpdatedAt,
140+
}), asserts(u.UserDataRBACObject(), rbac.ActionUpdate), values())
138141
})
139142
})
140143
s.Run("UpdateUserStatus", func() {
141144
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
142145
u := dbgen.User(t, db, database.User{})
143146
return methodCase(values(database.UpdateUserStatusParams{
144-
ID: u.ID,
145-
Status: database.UserStatusActive,
147+
ID: u.ID,
148+
Status: u.Status,
149+
UpdatedAt: u.UpdatedAt,
146150
}), asserts(u, rbac.ActionUpdate), values(u))
147151
})
148152
})
@@ -169,7 +173,10 @@ func (s *MethodTestSuite) TestUser() {
169173
s.Run("UpdateGitSSHKey", func() {
170174
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
171175
key := dbgen.GitSSHKey(t, db, database.GitSSHKey{})
172-
return methodCase(values(database.UpdateGitSSHKeyParams{}), asserts(key, rbac.ActionUpdate), values(key))
176+
return methodCase(values(database.UpdateGitSSHKeyParams{
177+
UserID: key.UserID,
178+
UpdatedAt: key.UpdatedAt,
179+
}), asserts(key, rbac.ActionUpdate), values(key))
173180
})
174181
})
175182
s.Run("GetGitAuthLink", func() {
@@ -196,7 +203,7 @@ func (s *MethodTestSuite) TestUser() {
196203
return methodCase(values(database.UpdateGitAuthLinkParams{
197204
ProviderID: link.ProviderID,
198205
UserID: link.UserID,
199-
}), asserts(link, rbac.ActionUpdate), values(link))
206+
}), asserts(link, rbac.ActionUpdate), values())
200207
})
201208
})
202209
s.Run("UpdateUserLink", func() {

0 commit comments

Comments
 (0)