Skip to content

Commit 69d1aa3

Browse files
EmyrkEmyrk
committed
rename MethodCase to expects
1 parent 03d42d3 commit 69d1aa3

13 files changed

+207
-207
lines changed

‎coderd/authzquery/apikey_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,39 @@ import (
1010
)
1111

1212
func (s *MethodTestSuite) TestAPIKey() {
13-
s.Run("DeleteAPIKeyByID", s.Subtest(func(db database.Store, check *MethodCase) {
13+
s.Run("DeleteAPIKeyByID", s.Subtest(func(db database.Store, check *expects) {
1414
key, _ := dbgen.APIKey(s.T(), db, database.APIKey{})
1515
check.Args(key.ID).Asserts(key, rbac.ActionDelete).Returns()
1616
}))
17-
s.Run("GetAPIKeyByID", s.Subtest(func(db database.Store, check *MethodCase) {
17+
s.Run("GetAPIKeyByID", s.Subtest(func(db database.Store, check *expects) {
1818
key, _ := dbgen.APIKey(s.T(), db, database.APIKey{})
1919
check.Args(key.ID).Asserts(key, rbac.ActionRead).Returns(key)
2020
}))
21-
s.Run("GetAPIKeysByLoginType", s.Subtest(func(db database.Store, check *MethodCase) {
21+
s.Run("GetAPIKeysByLoginType", s.Subtest(func(db database.Store, check *expects) {
2222
a, _ := dbgen.APIKey(s.T(), db, database.APIKey{LoginType: database.LoginTypePassword})
2323
b, _ := dbgen.APIKey(s.T(), db, database.APIKey{LoginType: database.LoginTypePassword})
2424
_, _ = dbgen.APIKey(s.T(), db, database.APIKey{LoginType: database.LoginTypeGithub})
2525
check.Args(database.LoginTypePassword).
2626
Asserts(a, rbac.ActionRead, b, rbac.ActionRead).
2727
Returns(slice.New(a, b))
2828
}))
29-
s.Run("GetAPIKeysLastUsedAfter", s.Subtest(func(db database.Store, check *MethodCase) {
29+
s.Run("GetAPIKeysLastUsedAfter", s.Subtest(func(db database.Store, check *expects) {
3030
a, _ := dbgen.APIKey(s.T(), db, database.APIKey{LastUsed: time.Now().Add(time.Hour)})
3131
b, _ := dbgen.APIKey(s.T(), db, database.APIKey{LastUsed: time.Now().Add(time.Hour)})
3232
_, _ = dbgen.APIKey(s.T(), db, database.APIKey{LastUsed: time.Now().Add(-time.Hour)})
3333
check.Args(time.Now()).
3434
Asserts(a, rbac.ActionRead, b, rbac.ActionRead).
3535
Returns(slice.New(a, b))
3636
}))
37-
s.Run("InsertAPIKey", s.Subtest(func(db database.Store, check *MethodCase) {
37+
s.Run("InsertAPIKey", s.Subtest(func(db database.Store, check *expects) {
3838
u := dbgen.User(s.T(), db, database.User{})
3939
check.Args(database.InsertAPIKeyParams{
4040
UserID: u.ID,
4141
LoginType: database.LoginTypePassword,
4242
Scope: database.APIKeyScopeAll,
4343
}).Asserts(rbac.ResourceAPIKey.WithOwner(u.ID.String()), rbac.ActionCreate)
4444
}))
45-
s.Run("UpdateAPIKeyByID", s.Subtest(func(db database.Store, check *MethodCase) {
45+
s.Run("UpdateAPIKeyByID", s.Subtest(func(db database.Store, check *expects) {
4646
a, _ := dbgen.APIKey(s.T(), db, database.APIKey{})
4747
check.Args(database.UpdateAPIKeyByIDParams{
4848
ID: a.ID,

‎coderd/authzquery/audit_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88
)
99

1010
func (s *MethodTestSuite) TestAuditLogs() {
11-
s.Run("InsertAuditLog", s.Subtest(func(db database.Store, check *MethodCase) {
11+
s.Run("InsertAuditLog", s.Subtest(func(db database.Store, check *expects) {
1212
check.Args(database.InsertAuditLogParams{
1313
ResourceType: database.ResourceTypeOrganization,
1414
Action: database.AuditActionCreate,
1515
}).Asserts(rbac.ResourceAuditLog, rbac.ActionCreate)
1616
}))
17-
s.Run("GetAuditLogsOffset", s.Subtest(func(db database.Store, check *MethodCase) {
17+
s.Run("GetAuditLogsOffset", s.Subtest(func(db database.Store, check *expects) {
1818
_ = dbgen.AuditLog(s.T(), db, database.AuditLog{})
1919
_ = dbgen.AuditLog(s.T(), db, database.AuditLog{})
2020
check.Args(database.GetAuditLogsOffsetParams{

‎coderd/authzquery/file_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ import (
77
)
88

99
func (s *MethodTestSuite) TestFile() {
10-
s.Run("GetFileByHashAndCreator", s.Subtest(func(db database.Store, check *MethodCase) {
10+
s.Run("GetFileByHashAndCreator", s.Subtest(func(db database.Store, check *expects) {
1111
f := dbgen.File(s.T(), db, database.File{})
1212
check.Args(database.GetFileByHashAndCreatorParams{
1313
Hash: f.Hash,
1414
CreatedBy: f.CreatedBy,
1515
}).Asserts(f, rbac.ActionRead).Returns(f)
1616
}))
17-
s.Run("GetFileByID", s.Subtest(func(db database.Store, check *MethodCase) {
17+
s.Run("GetFileByID", s.Subtest(func(db database.Store, check *expects) {
1818
f := dbgen.File(s.T(), db, database.File{})
1919
check.Args(f.ID).Asserts(f, rbac.ActionRead).Returns(f)
2020
}))
21-
s.Run("InsertFile", s.Subtest(func(db database.Store, check *MethodCase) {
21+
s.Run("InsertFile", s.Subtest(func(db database.Store, check *expects) {
2222
u := dbgen.User(s.T(), db, database.User{})
2323
check.Args(database.InsertFileParams{
2424
CreatedBy: u.ID,

‎coderd/authzquery/group_test.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
)
1111

1212
func (s *MethodTestSuite) TestGroup() {
13-
s.Run("DeleteGroupByID", s.Subtest(func(db database.Store, check *MethodCase) {
13+
s.Run("DeleteGroupByID", s.Subtest(func(db database.Store, check *expects) {
1414
g := dbgen.Group(s.T(), db, database.Group{})
1515
check.Args(g.ID).Asserts(g, rbac.ActionDelete).Returns()
1616
}))
17-
s.Run("DeleteGroupMemberFromGroup", s.Subtest(func(db database.Store, check *MethodCase) {
17+
s.Run("DeleteGroupMemberFromGroup", s.Subtest(func(db database.Store, check *expects) {
1818
g := dbgen.Group(s.T(), db, database.Group{})
1919
m := dbgen.GroupMember(s.T(), db, database.GroupMember{
2020
GroupID: g.ID,
@@ -24,41 +24,41 @@ func (s *MethodTestSuite) TestGroup() {
2424
GroupID: g.ID,
2525
}).Asserts(g, rbac.ActionUpdate).Returns()
2626
}))
27-
s.Run("GetGroupByID", s.Subtest(func(db database.Store, check *MethodCase) {
27+
s.Run("GetGroupByID", s.Subtest(func(db database.Store, check *expects) {
2828
g := dbgen.Group(s.T(), db, database.Group{})
2929
check.Args(g.ID).Asserts(g, rbac.ActionRead).Returns(g)
3030
}))
31-
s.Run("GetGroupByOrgAndName", s.Subtest(func(db database.Store, check *MethodCase) {
31+
s.Run("GetGroupByOrgAndName", s.Subtest(func(db database.Store, check *expects) {
3232
g := dbgen.Group(s.T(), db, database.Group{})
3333
check.Args(database.GetGroupByOrgAndNameParams{
3434
OrganizationID: g.OrganizationID,
3535
Name: g.Name,
3636
}).Asserts(g, rbac.ActionRead).Returns(g)
3737
}))
38-
s.Run("GetGroupMembers", s.Subtest(func(db database.Store, check *MethodCase) {
38+
s.Run("GetGroupMembers", s.Subtest(func(db database.Store, check *expects) {
3939
g := dbgen.Group(s.T(), db, database.Group{})
4040
_ = dbgen.GroupMember(s.T(), db, database.GroupMember{})
4141
check.Args(g.ID).Asserts(g, rbac.ActionRead)
4242
}))
43-
s.Run("InsertAllUsersGroup", s.Subtest(func(db database.Store, check *MethodCase) {
43+
s.Run("InsertAllUsersGroup", s.Subtest(func(db database.Store, check *expects) {
4444
o := dbgen.Organization(s.T(), db, database.Organization{})
4545
check.Args(o.ID).Asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionCreate)
4646
}))
47-
s.Run("InsertGroup", s.Subtest(func(db database.Store, check *MethodCase) {
47+
s.Run("InsertGroup", s.Subtest(func(db database.Store, check *expects) {
4848
o := dbgen.Organization(s.T(), db, database.Organization{})
4949
check.Args(database.InsertGroupParams{
5050
OrganizationID: o.ID,
5151
Name: "test",
5252
}).Asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionCreate)
5353
}))
54-
s.Run("InsertGroupMember", s.Subtest(func(db database.Store, check *MethodCase) {
54+
s.Run("InsertGroupMember", s.Subtest(func(db database.Store, check *expects) {
5555
g := dbgen.Group(s.T(), db, database.Group{})
5656
check.Args(database.InsertGroupMemberParams{
5757
UserID: uuid.New(),
5858
GroupID: g.ID,
5959
}).Asserts(g, rbac.ActionUpdate).Returns()
6060
}))
61-
s.Run("InsertUserGroupsByName", s.Subtest(func(db database.Store, check *MethodCase) {
61+
s.Run("InsertUserGroupsByName", s.Subtest(func(db database.Store, check *expects) {
6262
o := dbgen.Organization(s.T(), db, database.Organization{})
6363
u1 := dbgen.User(s.T(), db, database.User{})
6464
g1 := dbgen.Group(s.T(), db, database.Group{OrganizationID: o.ID})
@@ -70,7 +70,7 @@ func (s *MethodTestSuite) TestGroup() {
7070
GroupNames: slice.New(g1.Name, g2.Name),
7171
}).Asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionUpdate).Returns()
7272
}))
73-
s.Run("DeleteGroupMembersByOrgAndUser", s.Subtest(func(db database.Store, check *MethodCase) {
73+
s.Run("DeleteGroupMembersByOrgAndUser", s.Subtest(func(db database.Store, check *expects) {
7474
o := dbgen.Organization(s.T(), db, database.Organization{})
7575
u1 := dbgen.User(s.T(), db, database.User{})
7676
g1 := dbgen.Group(s.T(), db, database.Group{OrganizationID: o.ID})
@@ -82,7 +82,7 @@ func (s *MethodTestSuite) TestGroup() {
8282
UserID: u1.ID,
8383
}).Asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionUpdate).Returns()
8484
}))
85-
s.Run("UpdateGroupByID", s.Subtest(func(db database.Store, check *MethodCase) {
85+
s.Run("UpdateGroupByID", s.Subtest(func(db database.Store, check *expects) {
8686
g := dbgen.Group(s.T(), db, database.Group{})
8787
check.Args(database.UpdateGroupByIDParams{
8888
ID: g.ID,

‎coderd/authzquery/job_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ import (
1212
)
1313

1414
func (s *MethodTestSuite) TestProvsionerJob() {
15-
s.Run("Build/GetProvisionerJobByID", s.Subtest(func(db database.Store, check *MethodCase) {
15+
s.Run("Build/GetProvisionerJobByID", s.Subtest(func(db database.Store, check *expects) {
1616
w := dbgen.Workspace(s.T(), db, database.Workspace{})
1717
j := dbgen.ProvisionerJob(s.T(), db, database.ProvisionerJob{
1818
Type: database.ProvisionerJobTypeWorkspaceBuild,
1919
})
2020
_ = dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{JobID: j.ID, WorkspaceID: w.ID})
2121
check.Args(j.ID).Asserts(w, rbac.ActionRead).Returns(j)
2222
}))
23-
s.Run("TemplateVersion/GetProvisionerJobByID", s.Subtest(func(db database.Store, check *MethodCase) {
23+
s.Run("TemplateVersion/GetProvisionerJobByID", s.Subtest(func(db database.Store, check *expects) {
2424
j := dbgen.ProvisionerJob(s.T(), db, database.ProvisionerJob{
2525
Type: database.ProvisionerJobTypeTemplateVersionImport,
2626
})
@@ -31,7 +31,7 @@ func (s *MethodTestSuite) TestProvsionerJob() {
3131
})
3232
check.Args(j.ID).Asserts(v.RBACObject(tpl), rbac.ActionRead).Returns(j)
3333
}))
34-
s.Run("TemplateVersionDryRun/GetProvisionerJobByID", s.Subtest(func(db database.Store, check *MethodCase) {
34+
s.Run("TemplateVersionDryRun/GetProvisionerJobByID", s.Subtest(func(db database.Store, check *expects) {
3535
tpl := dbgen.Template(s.T(), db, database.Template{})
3636
v := dbgen.TemplateVersion(s.T(), db, database.TemplateVersion{
3737
TemplateID: uuid.NullUUID{UUID: tpl.ID, Valid: true},
@@ -44,7 +44,7 @@ func (s *MethodTestSuite) TestProvsionerJob() {
4444
})
4545
check.Args(j.ID).Asserts(v.RBACObject(tpl), rbac.ActionRead).Returns(j)
4646
}))
47-
s.Run("Build/UpdateProvisionerJobWithCancelByID", s.Subtest(func(db database.Store, check *MethodCase) {
47+
s.Run("Build/UpdateProvisionerJobWithCancelByID", s.Subtest(func(db database.Store, check *expects) {
4848
tpl := dbgen.Template(s.T(), db, database.Template{AllowUserCancelWorkspaceJobs: true})
4949
w := dbgen.Workspace(s.T(), db, database.Workspace{TemplateID: tpl.ID})
5050
j := dbgen.ProvisionerJob(s.T(), db, database.ProvisionerJob{
@@ -53,7 +53,7 @@ func (s *MethodTestSuite) TestProvsionerJob() {
5353
_ = dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{JobID: j.ID, WorkspaceID: w.ID})
5454
check.Args(database.UpdateProvisionerJobWithCancelByIDParams{ID: j.ID}).Asserts(w, rbac.ActionUpdate).Returns()
5555
}))
56-
s.Run("TemplateVersion/UpdateProvisionerJobWithCancelByID", s.Subtest(func(db database.Store, check *MethodCase) {
56+
s.Run("TemplateVersion/UpdateProvisionerJobWithCancelByID", s.Subtest(func(db database.Store, check *expects) {
5757
j := dbgen.ProvisionerJob(s.T(), db, database.ProvisionerJob{
5858
Type: database.ProvisionerJobTypeTemplateVersionImport,
5959
})
@@ -65,7 +65,7 @@ func (s *MethodTestSuite) TestProvsionerJob() {
6565
check.Args(database.UpdateProvisionerJobWithCancelByIDParams{ID: j.ID}).
6666
Asserts(v.RBACObject(tpl), []rbac.Action{rbac.ActionRead, rbac.ActionUpdate}).Returns()
6767
}))
68-
s.Run("TemplateVersionDryRun/UpdateProvisionerJobWithCancelByID", s.Subtest(func(db database.Store, check *MethodCase) {
68+
s.Run("TemplateVersionDryRun/UpdateProvisionerJobWithCancelByID", s.Subtest(func(db database.Store, check *expects) {
6969
tpl := dbgen.Template(s.T(), db, database.Template{})
7070
v := dbgen.TemplateVersion(s.T(), db, database.TemplateVersion{
7171
TemplateID: uuid.NullUUID{UUID: tpl.ID, Valid: true},
@@ -79,12 +79,12 @@ func (s *MethodTestSuite) TestProvsionerJob() {
7979
check.Args(database.UpdateProvisionerJobWithCancelByIDParams{ID: j.ID}).
8080
Asserts(v.RBACObject(tpl), []rbac.Action{rbac.ActionRead, rbac.ActionUpdate}).Returns()
8181
}))
82-
s.Run("GetProvisionerJobsByIDs", s.Subtest(func(db database.Store, check *MethodCase) {
82+
s.Run("GetProvisionerJobsByIDs", s.Subtest(func(db database.Store, check *expects) {
8383
a := dbgen.ProvisionerJob(s.T(), db, database.ProvisionerJob{})
8484
b := dbgen.ProvisionerJob(s.T(), db, database.ProvisionerJob{})
8585
check.Args([]uuid.UUID{a.ID, b.ID}).Asserts().Returns(slice.New(a, b))
8686
}))
87-
s.Run("GetProvisionerLogsByIDBetween", s.Subtest(func(db database.Store, check *MethodCase) {
87+
s.Run("GetProvisionerLogsByIDBetween", s.Subtest(func(db database.Store, check *expects) {
8888
w := dbgen.Workspace(s.T(), db, database.Workspace{})
8989
j := dbgen.ProvisionerJob(s.T(), db, database.ProvisionerJob{
9090
Type: database.ProvisionerJobTypeWorkspaceBuild,

‎coderd/authzquery/license_test.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -11,47 +11,47 @@ import (
1111
)
1212

1313
func (s *MethodTestSuite) TestLicense() {
14-
s.Run("GetLicenses", s.Subtest(func(db database.Store, check *MethodCase) {
14+
s.Run("GetLicenses", s.Subtest(func(db database.Store, check *expects) {
1515
l, err := db.InsertLicense(context.Background(), database.InsertLicenseParams{
1616
Uuid: uuid.NullUUID{UUID: uuid.New(), Valid: true},
1717
})
1818
require.NoError(s.T(), err)
1919
check.Args().Asserts(l, rbac.ActionRead).
2020
Returns([]database.License{l})
2121
}))
22-
s.Run("InsertLicense", s.Subtest(func(db database.Store, check *MethodCase) {
22+
s.Run("InsertLicense", s.Subtest(func(db database.Store, check *expects) {
2323
check.Args(database.InsertLicenseParams{}).
2424
Asserts(rbac.ResourceLicense, rbac.ActionCreate)
2525
}))
26-
s.Run("InsertOrUpdateLogoURL", s.Subtest(func(db database.Store, check *MethodCase) {
26+
s.Run("InsertOrUpdateLogoURL", s.Subtest(func(db database.Store, check *expects) {
2727
check.Args("value").Asserts(rbac.ResourceDeploymentConfig, rbac.ActionCreate)
2828
}))
29-
s.Run("InsertOrUpdateServiceBanner", s.Subtest(func(db database.Store, check *MethodCase) {
29+
s.Run("InsertOrUpdateServiceBanner", s.Subtest(func(db database.Store, check *expects) {
3030
check.Args("value").Asserts(rbac.ResourceDeploymentConfig, rbac.ActionCreate)
3131
}))
32-
s.Run("GetLicenseByID", s.Subtest(func(db database.Store, check *MethodCase) {
32+
s.Run("GetLicenseByID", s.Subtest(func(db database.Store, check *expects) {
3333
l, err := db.InsertLicense(context.Background(), database.InsertLicenseParams{
3434
Uuid: uuid.NullUUID{UUID: uuid.New(), Valid: true},
3535
})
3636
require.NoError(s.T(), err)
3737
check.Args(l.ID).Asserts(l, rbac.ActionRead).Returns(l)
3838
}))
39-
s.Run("DeleteLicense", s.Subtest(func(db database.Store, check *MethodCase) {
39+
s.Run("DeleteLicense", s.Subtest(func(db database.Store, check *expects) {
4040
l, err := db.InsertLicense(context.Background(), database.InsertLicenseParams{
4141
Uuid: uuid.NullUUID{UUID: uuid.New(), Valid: true},
4242
})
4343
require.NoError(s.T(), err)
4444
check.Args(l.ID).Asserts(l, rbac.ActionDelete)
4545
}))
46-
s.Run("GetDeploymentID", s.Subtest(func(db database.Store, check *MethodCase) {
46+
s.Run("GetDeploymentID", s.Subtest(func(db database.Store, check *expects) {
4747
check.Args().Asserts().Returns("")
4848
}))
49-
s.Run("GetLogoURL", s.Subtest(func(db database.Store, check *MethodCase) {
49+
s.Run("GetLogoURL", s.Subtest(func(db database.Store, check *expects) {
5050
err := db.InsertOrUpdateLogoURL(context.Background(), "value")
5151
require.NoError(s.T(), err)
5252
check.Args().Asserts().Returns("value")
5353
}))
54-
s.Run("GetServiceBanner", s.Subtest(func(db database.Store, check *MethodCase) {
54+
s.Run("GetServiceBanner", s.Subtest(func(db database.Store, check *expects) {
5555
err := db.InsertOrUpdateServiceBanner(context.Background(), "value")
5656
require.NoError(s.T(), err)
5757
check.Args().Asserts().Returns("value")

‎coderd/authzquery/methods_test.go

+16-16
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (s *MethodTestSuite) TearDownSuite() {
9090
// s.Run(). This function will run the test case for the method that is being
9191
// tested. The check parameter is used to assert the results of the method.
9292
// If the caller does not use the `check` parameter, the test will fail.
93-
func (s *MethodTestSuite) Subtest(testCaseF func(db database.Store, check *MethodCase)) func() {
93+
func (s *MethodTestSuite) Subtest(testCaseF func(db database.Store, check *expects)) func() {
9494
return func() {
9595
t := s.T()
9696
testName := s.T().Name()
@@ -114,7 +114,7 @@ func (s *MethodTestSuite) Subtest(testCaseF func(db database.Store, check *Metho
114114
}
115115
ctx := authzquery.WithAuthorizeContext(context.Background(), actor)
116116

117-
var testCase MethodCase
117+
var testCase expects
118118
testCaseF(db, &testCase)
119119
// Check the developer added assertions. If there are no assertions,
120120
// an empty list should be passed.
@@ -158,11 +158,11 @@ func (s *MethodTestSuite) Subtest(testCaseF func(db database.Store, check *Metho
158158

159159
// Some tests may not care about the outputs, so we only assert if
160160
// they are provided.
161-
if testCase.expectedOutputs != nil {
161+
if testCase.outputs != nil {
162162
// Assert the required outputs
163-
s.Equal(len(testCase.expectedOutputs), len(outputs), "method %q returned unexpected number of outputs", methodName)
163+
s.Equal(len(testCase.outputs), len(outputs), "method %q returned unexpected number of outputs", methodName)
164164
for i := range outputs {
165-
a, b := testCase.expectedOutputs[i].Interface(), outputs[i].Interface()
165+
a, b := testCase.outputs[i].Interface(), outputs[i].Interface()
166166
if reflect.TypeOf(a).Kind() == reflect.Slice || reflect.TypeOf(a).Kind() == reflect.Array {
167167
// Order does not matter
168168
s.ElementsMatch(a, b, "method %q returned unexpected output %d", methodName, i)
@@ -248,18 +248,18 @@ func splitResp(t *testing.T, values []reflect.Value) ([]reflect.Value, error) {
248248
return nil, nil // unreachable, required to compile
249249
}
250250

251-
// A MethodCase contains the inputs to be provided to a single method call,
252-
// and the assertions to be made on the RBAC checks.
253-
type MethodCase struct {
251+
// expects is used to build a test case for a method.
252+
// It includes the expected inputs, rbac assertions, and expected outputs.
253+
type expects struct {
254254
inputs []reflect.Value
255255
assertions []AssertRBAC
256-
// expectedOutputs is optional. Can assert non-error return values.
257-
expectedOutputs []reflect.Value
256+
// outputs is optional. Can assert non-error return values.
257+
outputs []reflect.Value
258258
}
259259

260260
// Asserts is required. Asserts the RBAC authorize calls that should be made.
261261
// If no RBAC calls are expected, pass an empty list: 'm.Asserts()'
262-
func (m *MethodCase) Asserts(pairs ...any) *MethodCase {
262+
func (m *expects) Asserts(pairs ...any) *expects {
263263
m.assertions = asserts(pairs...)
264264
return m
265265
}
@@ -268,14 +268,14 @@ func (m *MethodCase) Asserts(pairs ...any) *MethodCase {
268268
// If there are no arguments, pass an empty list: 'm.Args()'
269269
// The first context argument should not be included, as the test suite
270270
// will provide it.
271-
func (m *MethodCase) Args(args ...any) *MethodCase {
271+
func (m *expects) Args(args ...any) *expects {
272272
m.inputs = values(args...)
273273
return m
274274
}
275275

276276
// Returns is optional. If it is never called, it will not be asserted.
277-
func (m *MethodCase) Returns(rets ...any) *MethodCase {
278-
m.expectedOutputs = values(rets...)
277+
func (m *expects) Returns(rets ...any) *expects {
278+
m.outputs = values(rets...)
279279
return m
280280
}
281281

@@ -360,14 +360,14 @@ func asserts(inputs ...any) []AssertRBAC {
360360
}
361361

362362
func (s *MethodTestSuite) TestExtraMethods() {
363-
s.Run("GetProvisionerDaemons", s.Subtest(func(db database.Store, check *MethodCase) {
363+
s.Run("GetProvisionerDaemons", s.Subtest(func(db database.Store, check *expects) {
364364
d, err := db.InsertProvisionerDaemon(context.Background(), database.InsertProvisionerDaemonParams{
365365
ID: uuid.New(),
366366
})
367367
s.NoError(err, "insert provisioner daemon")
368368
check.Args().Asserts(d, rbac.ActionRead)
369369
}))
370-
s.Run("GetDeploymentDAUs", s.Subtest(func(db database.Store, check *MethodCase) {
370+
s.Run("GetDeploymentDAUs", s.Subtest(func(db database.Store, check *expects) {
371371
check.Args().Asserts(rbac.ResourceUser.All(), rbac.ActionRead)
372372
}))
373373
}

0 commit comments

Comments
 (0)