Skip to content

Commit 8295eb3

Browse files
EmyrkEmyrk
committed
Use 's' for all suite methods
1 parent 0a061be commit 8295eb3

10 files changed

+258
-258
lines changed

‎coderd/authzquery/apikey_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ import (
1010
"github.com/coder/coder/coderd/util/slice"
1111
)
1212

13-
func (suite *MethodTestSuite) TestAPIKey() {
14-
suite.Run("DeleteAPIKeyByID", func() {
15-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
13+
func (s *MethodTestSuite) TestAPIKey() {
14+
s.Run("DeleteAPIKeyByID", func() {
15+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
1616
key, _ := dbgen.APIKey(t, db, database.APIKey{})
1717
return methodCase(values(key.ID), asserts(key, rbac.ActionDelete), values())
1818
})
1919
})
20-
suite.Run("GetAPIKeyByID", func() {
21-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
20+
s.Run("GetAPIKeyByID", func() {
21+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
2222
key, _ := dbgen.APIKey(t, db, database.APIKey{})
2323
return methodCase(values(key.ID), asserts(key, rbac.ActionRead), values(key))
2424
})
2525
})
26-
suite.Run("GetAPIKeysByLoginType", func() {
27-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
26+
s.Run("GetAPIKeysByLoginType", func() {
27+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
2828
a, _ := dbgen.APIKey(t, db, database.APIKey{LoginType: database.LoginTypePassword})
2929
b, _ := dbgen.APIKey(t, db, database.APIKey{LoginType: database.LoginTypePassword})
3030
_, _ = dbgen.APIKey(t, db, database.APIKey{LoginType: database.LoginTypeGithub})
@@ -33,8 +33,8 @@ func (suite *MethodTestSuite) TestAPIKey() {
3333
values(slice.New(a, b)))
3434
})
3535
})
36-
suite.Run("GetAPIKeysLastUsedAfter", func() {
37-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
36+
s.Run("GetAPIKeysLastUsedAfter", func() {
37+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
3838
a, _ := dbgen.APIKey(t, db, database.APIKey{LastUsed: time.Now().Add(time.Hour)})
3939
b, _ := dbgen.APIKey(t, db, database.APIKey{LastUsed: time.Now().Add(time.Hour)})
4040
_, _ = dbgen.APIKey(t, db, database.APIKey{LastUsed: time.Now().Add(-time.Hour)})
@@ -43,8 +43,8 @@ func (suite *MethodTestSuite) TestAPIKey() {
4343
values(slice.New(a, b)))
4444
})
4545
})
46-
suite.Run("InsertAPIKey", func() {
47-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
46+
s.Run("InsertAPIKey", func() {
47+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
4848
u := dbgen.User(t, db, database.User{})
4949
return methodCase(values(database.InsertAPIKeyParams{
5050
UserID: u.ID,
@@ -54,8 +54,8 @@ func (suite *MethodTestSuite) TestAPIKey() {
5454
nil)
5555
})
5656
})
57-
suite.Run("UpdateAPIKeyByID", func() {
58-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
57+
s.Run("UpdateAPIKeyByID", func() {
58+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
5959
a, _ := dbgen.APIKey(t, db, database.APIKey{})
6060
return methodCase(values(database.UpdateAPIKeyByIDParams{
6161
ID: a.ID,

‎coderd/authzquery/audit_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"github.com/coder/coder/coderd/rbac"
1010
)
1111

12-
func (suite *MethodTestSuite) TestAuditLogs() {
13-
suite.Run("InsertAuditLog", func() {
14-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
12+
func (s *MethodTestSuite) TestAuditLogs() {
13+
s.Run("InsertAuditLog", func() {
14+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
1515
return methodCase(values(database.InsertAuditLogParams{
1616
ResourceType: database.ResourceTypeOrganization,
1717
Action: database.AuditActionCreate,
@@ -20,8 +20,8 @@ func (suite *MethodTestSuite) TestAuditLogs() {
2020
nil)
2121
})
2222
})
23-
suite.Run("GetAuditLogsOffset", func() {
24-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
23+
s.Run("GetAuditLogsOffset", func() {
24+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
2525
_ = dbgen.AuditLog(t, db, database.AuditLog{})
2626
_ = dbgen.AuditLog(t, db, database.AuditLog{})
2727
return methodCase(values(database.GetAuditLogsOffsetParams{

‎coderd/authzquery/file_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@ import (
88
"github.com/coder/coder/coderd/rbac"
99
)
1010

11-
func (suite *MethodTestSuite) TestFile() {
12-
suite.Run("GetFileByHashAndCreator", func() {
13-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
11+
func (s *MethodTestSuite) TestFile() {
12+
s.Run("GetFileByHashAndCreator", func() {
13+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
1414
f := dbgen.File(t, db, database.File{})
1515
return methodCase(values(database.GetFileByHashAndCreatorParams{
1616
Hash: f.Hash,
1717
CreatedBy: f.CreatedBy,
1818
}), asserts(f, rbac.ActionRead), values(f))
1919
})
2020
})
21-
suite.Run("GetFileByID", func() {
22-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
21+
s.Run("GetFileByID", func() {
22+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
2323
f := dbgen.File(t, db, database.File{})
2424
return methodCase(values(f.ID), asserts(f, rbac.ActionRead), values(f))
2525
})
2626
})
27-
suite.Run("InsertFile", func() {
28-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
27+
s.Run("InsertFile", func() {
28+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
2929
u := dbgen.User(t, db, database.User{})
3030
return methodCase(values(database.InsertFileParams{
3131
CreatedBy: u.ID,

‎coderd/authzquery/group_test.go

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ import (
1111
"github.com/coder/coder/coderd/util/slice"
1212
)
1313

14-
func (suite *MethodTestSuite) TestGroup() {
15-
suite.Run("DeleteGroupByID", func() {
16-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
14+
func (s *MethodTestSuite) TestGroup() {
15+
s.Run("DeleteGroupByID", func() {
16+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
1717
g := dbgen.Group(t, db, database.Group{})
1818
return methodCase(values(g.ID), asserts(g, rbac.ActionDelete), values())
1919
})
2020
})
21-
suite.Run("DeleteGroupMemberFromGroup", func() {
22-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
21+
s.Run("DeleteGroupMemberFromGroup", func() {
22+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
2323
g := dbgen.Group(t, db, database.Group{})
2424
m := dbgen.GroupMember(t, db, database.GroupMember{
2525
GroupID: g.ID,
@@ -30,37 +30,37 @@ func (suite *MethodTestSuite) TestGroup() {
3030
}), asserts(g, rbac.ActionUpdate), values())
3131
})
3232
})
33-
suite.Run("GetGroupByID", func() {
34-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
33+
s.Run("GetGroupByID", func() {
34+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
3535
g := dbgen.Group(t, db, database.Group{})
3636
return methodCase(values(g.ID), asserts(g, rbac.ActionRead), values(g))
3737
})
3838
})
39-
suite.Run("GetGroupByOrgAndName", func() {
40-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
39+
s.Run("GetGroupByOrgAndName", func() {
40+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
4141
g := dbgen.Group(t, db, database.Group{})
4242
return methodCase(values(database.GetGroupByOrgAndNameParams{
4343
OrganizationID: g.OrganizationID,
4444
Name: g.Name,
4545
}), asserts(g, rbac.ActionRead), values(g))
4646
})
4747
})
48-
suite.Run("GetGroupMembers", func() {
49-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
48+
s.Run("GetGroupMembers", func() {
49+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
5050
g := dbgen.Group(t, db, database.Group{})
5151
_ = dbgen.GroupMember(t, db, database.GroupMember{})
5252
return methodCase(values(g.ID), asserts(g, rbac.ActionRead), nil)
5353
})
5454
})
55-
suite.Run("InsertAllUsersGroup", func() {
56-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
55+
s.Run("InsertAllUsersGroup", func() {
56+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
5757
o := dbgen.Organization(t, db, database.Organization{})
5858
return methodCase(values(o.ID), asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionCreate),
5959
nil)
6060
})
6161
})
62-
suite.Run("InsertGroup", func() {
63-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
62+
s.Run("InsertGroup", func() {
63+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
6464
o := dbgen.Organization(t, db, database.Organization{})
6565
return methodCase(values(database.InsertGroupParams{
6666
OrganizationID: o.ID,
@@ -69,8 +69,8 @@ func (suite *MethodTestSuite) TestGroup() {
6969
nil)
7070
})
7171
})
72-
suite.Run("InsertGroupMember", func() {
73-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
72+
s.Run("InsertGroupMember", func() {
73+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
7474
g := dbgen.Group(t, db, database.Group{})
7575
return methodCase(values(database.InsertGroupMemberParams{
7676
UserID: uuid.New(),
@@ -79,8 +79,8 @@ func (suite *MethodTestSuite) TestGroup() {
7979
values())
8080
})
8181
})
82-
suite.Run("InsertUserGroupsByName", func() {
83-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
82+
s.Run("InsertUserGroupsByName", func() {
83+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
8484
o := dbgen.Organization(t, db, database.Organization{})
8585
u1 := dbgen.User(t, db, database.User{})
8686
g1 := dbgen.Group(t, db, database.Group{OrganizationID: o.ID})
@@ -93,8 +93,8 @@ func (suite *MethodTestSuite) TestGroup() {
9393
}), asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionUpdate), values())
9494
})
9595
})
96-
suite.Run("DeleteGroupMembersByOrgAndUser", func() {
97-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
96+
s.Run("DeleteGroupMembersByOrgAndUser", func() {
97+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
9898
o := dbgen.Organization(t, db, database.Organization{})
9999
u1 := dbgen.User(t, db, database.User{})
100100
g1 := dbgen.Group(t, db, database.Group{OrganizationID: o.ID})
@@ -107,8 +107,8 @@ func (suite *MethodTestSuite) TestGroup() {
107107
}), asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionUpdate), values())
108108
})
109109
})
110-
suite.Run("UpdateGroupByID", func() {
111-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
110+
s.Run("UpdateGroupByID", func() {
111+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
112112
g := dbgen.Group(t, db, database.Group{})
113113
return methodCase(values(database.UpdateGroupByIDParams{
114114
ID: g.ID,

‎coderd/authzquery/job_test.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"github.com/coder/coder/coderd/util/slice"
1313
)
1414

15-
func (suite *MethodTestSuite) TestProvsionerJob() {
16-
suite.Run("Build/GetProvisionerJobByID", func() {
17-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
15+
func (s *MethodTestSuite) TestProvsionerJob() {
16+
s.Run("Build/GetProvisionerJobByID", func() {
17+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
1818
w := dbgen.Workspace(t, db, database.Workspace{})
1919
j := dbgen.ProvisionerJob(t, db, database.ProvisionerJob{
2020
Type: database.ProvisionerJobTypeWorkspaceBuild,
@@ -23,8 +23,8 @@ func (suite *MethodTestSuite) TestProvsionerJob() {
2323
return methodCase(values(j.ID), asserts(w, rbac.ActionRead), values(j))
2424
})
2525
})
26-
suite.Run("TemplateVersion/GetProvisionerJobByID", func() {
27-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
26+
s.Run("TemplateVersion/GetProvisionerJobByID", func() {
27+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
2828
j := dbgen.ProvisionerJob(t, db, database.ProvisionerJob{
2929
Type: database.ProvisionerJobTypeTemplateVersionImport,
3030
})
@@ -36,8 +36,8 @@ func (suite *MethodTestSuite) TestProvsionerJob() {
3636
return methodCase(values(j.ID), asserts(v.RBACObject(tpl), rbac.ActionRead), values(j))
3737
})
3838
})
39-
suite.Run("TemplateVersionDryRun/GetProvisionerJobByID", func() {
40-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
39+
s.Run("TemplateVersionDryRun/GetProvisionerJobByID", func() {
40+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
4141
tpl := dbgen.Template(t, db, database.Template{})
4242
v := dbgen.TemplateVersion(t, db, database.TemplateVersion{
4343
TemplateID: uuid.NullUUID{UUID: tpl.ID, Valid: true},
@@ -51,8 +51,8 @@ func (suite *MethodTestSuite) TestProvsionerJob() {
5151
return methodCase(values(j.ID), asserts(v.RBACObject(tpl), rbac.ActionRead), values(j))
5252
})
5353
})
54-
suite.Run("Build/UpdateProvisionerJobWithCancelByID", func() {
55-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
54+
s.Run("Build/UpdateProvisionerJobWithCancelByID", func() {
55+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
5656
tpl := dbgen.Template(t, db, database.Template{AllowUserCancelWorkspaceJobs: true})
5757
w := dbgen.Workspace(t, db, database.Workspace{TemplateID: tpl.ID})
5858
j := dbgen.ProvisionerJob(t, db, database.ProvisionerJob{
@@ -62,8 +62,8 @@ func (suite *MethodTestSuite) TestProvsionerJob() {
6262
return methodCase(values(database.UpdateProvisionerJobWithCancelByIDParams{ID: j.ID}), asserts(w, rbac.ActionUpdate), values())
6363
})
6464
})
65-
suite.Run("TemplateVersion/UpdateProvisionerJobWithCancelByID", func() {
66-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
65+
s.Run("TemplateVersion/UpdateProvisionerJobWithCancelByID", func() {
66+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
6767
j := dbgen.ProvisionerJob(t, db, database.ProvisionerJob{
6868
Type: database.ProvisionerJobTypeTemplateVersionImport,
6969
})
@@ -76,8 +76,8 @@ func (suite *MethodTestSuite) TestProvsionerJob() {
7676
asserts(v.RBACObject(tpl), []rbac.Action{rbac.ActionRead, rbac.ActionUpdate}), values())
7777
})
7878
})
79-
suite.Run("TemplateVersionDryRun/UpdateProvisionerJobWithCancelByID", func() {
80-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
79+
s.Run("TemplateVersionDryRun/UpdateProvisionerJobWithCancelByID", func() {
80+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
8181
tpl := dbgen.Template(t, db, database.Template{})
8282
v := dbgen.TemplateVersion(t, db, database.TemplateVersion{
8383
TemplateID: uuid.NullUUID{UUID: tpl.ID, Valid: true},
@@ -92,15 +92,15 @@ func (suite *MethodTestSuite) TestProvsionerJob() {
9292
asserts(v.RBACObject(tpl), []rbac.Action{rbac.ActionRead, rbac.ActionUpdate}), values())
9393
})
9494
})
95-
suite.Run("GetProvisionerJobsByIDs", func() {
96-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
95+
s.Run("GetProvisionerJobsByIDs", func() {
96+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
9797
a := dbgen.ProvisionerJob(t, db, database.ProvisionerJob{})
9898
b := dbgen.ProvisionerJob(t, db, database.ProvisionerJob{})
9999
return methodCase(values([]uuid.UUID{a.ID, b.ID}), asserts(), values(slice.New(a, b)))
100100
})
101101
})
102-
suite.Run("GetProvisionerLogsByIDBetween", func() {
103-
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
102+
s.Run("GetProvisionerLogsByIDBetween", func() {
103+
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
104104
w := dbgen.Workspace(t, db, database.Workspace{})
105105
j := dbgen.ProvisionerJob(t, db, database.ProvisionerJob{
106106
Type: database.ProvisionerJobTypeWorkspaceBuild,

0 commit comments

Comments
 (0)