Skip to content

Commit 97ad3df

Browse files
EmyrkEmyrk
committed
Convert all unit tests
1 parent f5dbd3e commit 97ad3df

9 files changed

+605
-952
lines changed

‎coderd/authzquery/audit_test.go

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,24 @@
11
package authzquery_test
22

33
import (
4-
"testing"
5-
64
"github.com/coder/coder/coderd/database/dbgen"
75

86
"github.com/coder/coder/coderd/database"
97
"github.com/coder/coder/coderd/rbac"
108
)
119

1210
func (s *MethodTestSuite) TestAuditLogs() {
13-
s.Run("InsertAuditLog", func() {
14-
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
15-
return methodCase(values(database.InsertAuditLogParams{
16-
ResourceType: database.ResourceTypeOrganization,
17-
Action: database.AuditActionCreate,
18-
}),
19-
asserts(rbac.ResourceAuditLog, rbac.ActionCreate),
20-
nil)
21-
})
22-
})
23-
s.Run("GetAuditLogsOffset", func() {
24-
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
25-
_ = dbgen.AuditLog(t, db, database.AuditLog{})
26-
_ = dbgen.AuditLog(t, db, database.AuditLog{})
27-
return methodCase(values(database.GetAuditLogsOffsetParams{
28-
Limit: 10,
29-
}),
30-
asserts(rbac.ResourceAuditLog, rbac.ActionRead),
31-
nil)
32-
})
33-
})
11+
s.Run("InsertAuditLog", s.Subtest(func(db database.Store, check *MethodCase) {
12+
check.Args(database.InsertAuditLogParams{
13+
ResourceType: database.ResourceTypeOrganization,
14+
Action: database.AuditActionCreate,
15+
}).Asserts(rbac.ResourceAuditLog, rbac.ActionCreate)
16+
}))
17+
s.Run("GetAuditLogsOffset", s.Subtest(func(db database.Store, check *MethodCase) {
18+
_ = dbgen.AuditLog(s.T(), db, database.AuditLog{})
19+
_ = dbgen.AuditLog(s.T(), db, database.AuditLog{})
20+
check.Args(database.GetAuditLogsOffsetParams{
21+
Limit: 10,
22+
}).Asserts(rbac.ResourceAuditLog, rbac.ActionRead)
23+
}))
3424
}

‎coderd/authzquery/file_test.go

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,27 @@
11
package authzquery_test
22

33
import (
4-
"testing"
5-
64
"github.com/coder/coder/coderd/database"
75
"github.com/coder/coder/coderd/database/dbgen"
86
"github.com/coder/coder/coderd/rbac"
97
)
108

119
func (s *MethodTestSuite) TestFile() {
12-
s.Run("GetFileByHashAndCreator", func() {
13-
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
14-
f := dbgen.File(t, db, database.File{})
15-
return methodCase(values(database.GetFileByHashAndCreatorParams{
16-
Hash: f.Hash,
17-
CreatedBy: f.CreatedBy,
18-
}), asserts(f, rbac.ActionRead), values(f))
19-
})
20-
})
21-
s.Run("GetFileByID", func() {
22-
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
23-
f := dbgen.File(t, db, database.File{})
24-
return methodCase(values(f.ID), asserts(f, rbac.ActionRead), values(f))
25-
})
26-
})
27-
s.Run("InsertFile", func() {
28-
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
29-
u := dbgen.User(t, db, database.User{})
30-
return methodCase(values(database.InsertFileParams{
31-
CreatedBy: u.ID,
32-
}), asserts(rbac.ResourceFile.WithOwner(u.ID.String()), rbac.ActionCreate),
33-
nil)
34-
})
35-
})
10+
s.Run("GetFileByHashAndCreator", s.Subtest(func(db database.Store, check *MethodCase) {
11+
f := dbgen.File(s.T(), db, database.File{})
12+
check.Args(database.GetFileByHashAndCreatorParams{
13+
Hash: f.Hash,
14+
CreatedBy: f.CreatedBy,
15+
}).Asserts(f, rbac.ActionRead).Returns(f)
16+
}))
17+
s.Run("GetFileByID", s.Subtest(func(db database.Store, check *MethodCase) {
18+
f := dbgen.File(s.T(), db, database.File{})
19+
check.Args(f.ID).Asserts(f, rbac.ActionRead).Returns(f)
20+
}))
21+
s.Run("InsertFile", s.Subtest(func(db database.Store, check *MethodCase) {
22+
u := dbgen.User(s.T(), db, database.User{})
23+
check.Args(database.InsertFileParams{
24+
CreatedBy: u.ID,
25+
}).Asserts(rbac.ResourceFile.WithOwner(u.ID.String()), rbac.ActionCreate)
26+
}))
3627
}

‎coderd/authzquery/group_test.go

Lines changed: 77 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package authzquery_test
22

33
import (
4-
"testing"
5-
64
"github.com/google/uuid"
75

86
"github.com/coder/coder/coderd/database"
@@ -12,107 +10,82 @@ import (
1210
)
1311

1412
func (s *MethodTestSuite) TestGroup() {
15-
s.Run("DeleteGroupByID", func() {
16-
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
17-
g := dbgen.Group(t, db, database.Group{})
18-
return methodCase(values(g.ID), asserts(g, rbac.ActionDelete), values())
19-
})
20-
})
21-
s.Run("DeleteGroupMemberFromGroup", func() {
22-
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
23-
g := dbgen.Group(t, db, database.Group{})
24-
m := dbgen.GroupMember(t, db, database.GroupMember{
25-
GroupID: g.ID,
26-
})
27-
return methodCase(values(database.DeleteGroupMemberFromGroupParams{
28-
UserID: m.UserID,
29-
GroupID: g.ID,
30-
}), asserts(g, rbac.ActionUpdate), values())
31-
})
32-
})
33-
s.Run("GetGroupByID", func() {
34-
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
35-
g := dbgen.Group(t, db, database.Group{})
36-
return methodCase(values(g.ID), asserts(g, rbac.ActionRead), values(g))
37-
})
38-
})
39-
s.Run("GetGroupByOrgAndName", func() {
40-
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
41-
g := dbgen.Group(t, db, database.Group{})
42-
return methodCase(values(database.GetGroupByOrgAndNameParams{
43-
OrganizationID: g.OrganizationID,
44-
Name: g.Name,
45-
}), asserts(g, rbac.ActionRead), values(g))
46-
})
47-
})
48-
s.Run("GetGroupMembers", func() {
49-
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
50-
g := dbgen.Group(t, db, database.Group{})
51-
_ = dbgen.GroupMember(t, db, database.GroupMember{})
52-
return methodCase(values(g.ID), asserts(g, rbac.ActionRead), nil)
53-
})
54-
})
55-
s.Run("InsertAllUsersGroup", func() {
56-
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
57-
o := dbgen.Organization(t, db, database.Organization{})
58-
return methodCase(values(o.ID), asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionCreate),
59-
nil)
60-
})
61-
})
62-
s.Run("InsertGroup", func() {
63-
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
64-
o := dbgen.Organization(t, db, database.Organization{})
65-
return methodCase(values(database.InsertGroupParams{
66-
OrganizationID: o.ID,
67-
Name: "test",
68-
}), asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionCreate),
69-
nil)
70-
})
71-
})
72-
s.Run("InsertGroupMember", func() {
73-
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
74-
g := dbgen.Group(t, db, database.Group{})
75-
return methodCase(values(database.InsertGroupMemberParams{
76-
UserID: uuid.New(),
77-
GroupID: g.ID,
78-
}), asserts(g, rbac.ActionUpdate),
79-
values())
80-
})
81-
})
82-
s.Run("InsertUserGroupsByName", func() {
83-
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
84-
o := dbgen.Organization(t, db, database.Organization{})
85-
u1 := dbgen.User(t, db, database.User{})
86-
g1 := dbgen.Group(t, db, database.Group{OrganizationID: o.ID})
87-
g2 := dbgen.Group(t, db, database.Group{OrganizationID: o.ID})
88-
_ = dbgen.GroupMember(t, db, database.GroupMember{GroupID: g1.ID, UserID: u1.ID})
89-
return methodCase(values(database.InsertUserGroupsByNameParams{
90-
OrganizationID: o.ID,
91-
UserID: u1.ID,
92-
GroupNames: slice.New(g1.Name, g2.Name),
93-
}), asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionUpdate), values())
94-
})
95-
})
96-
s.Run("DeleteGroupMembersByOrgAndUser", func() {
97-
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
98-
o := dbgen.Organization(t, db, database.Organization{})
99-
u1 := dbgen.User(t, db, database.User{})
100-
g1 := dbgen.Group(t, db, database.Group{OrganizationID: o.ID})
101-
g2 := dbgen.Group(t, db, database.Group{OrganizationID: o.ID})
102-
_ = dbgen.GroupMember(t, db, database.GroupMember{GroupID: g1.ID, UserID: u1.ID})
103-
_ = dbgen.GroupMember(t, db, database.GroupMember{GroupID: g2.ID, UserID: u1.ID})
104-
return methodCase(values(database.DeleteGroupMembersByOrgAndUserParams{
105-
OrganizationID: o.ID,
106-
UserID: u1.ID,
107-
}), asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionUpdate), values())
108-
})
109-
})
110-
s.Run("UpdateGroupByID", func() {
111-
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
112-
g := dbgen.Group(t, db, database.Group{})
113-
return methodCase(values(database.UpdateGroupByIDParams{
114-
ID: g.ID,
115-
}), asserts(g, rbac.ActionUpdate), nil)
13+
s.Run("DeleteGroupByID", s.Subtest(func(db database.Store, check *MethodCase) {
14+
g := dbgen.Group(s.T(), db, database.Group{})
15+
check.Args(g.ID).Asserts(g, rbac.ActionDelete).Returns()
16+
}))
17+
s.Run("DeleteGroupMemberFromGroup", s.Subtest(func(db database.Store, check *MethodCase) {
18+
g := dbgen.Group(s.T(), db, database.Group{})
19+
m := dbgen.GroupMember(s.T(), db, database.GroupMember{
20+
GroupID: g.ID,
11621
})
117-
})
22+
check.Args(database.DeleteGroupMemberFromGroupParams{
23+
UserID: m.UserID,
24+
GroupID: g.ID,
25+
}).Asserts(g, rbac.ActionUpdate).Returns()
26+
}))
27+
s.Run("GetGroupByID", s.Subtest(func(db database.Store, check *MethodCase) {
28+
g := dbgen.Group(s.T(), db, database.Group{})
29+
check.Args(g.ID).Asserts(g, rbac.ActionRead).Returns(g)
30+
}))
31+
s.Run("GetGroupByOrgAndName", s.Subtest(func(db database.Store, check *MethodCase) {
32+
g := dbgen.Group(s.T(), db, database.Group{})
33+
check.Args(database.GetGroupByOrgAndNameParams{
34+
OrganizationID: g.OrganizationID,
35+
Name: g.Name,
36+
}).Asserts(g, rbac.ActionRead).Returns(g)
37+
}))
38+
s.Run("GetGroupMembers", s.Subtest(func(db database.Store, check *MethodCase) {
39+
g := dbgen.Group(s.T(), db, database.Group{})
40+
_ = dbgen.GroupMember(s.T(), db, database.GroupMember{})
41+
check.Args(g.ID).Asserts(g, rbac.ActionRead)
42+
}))
43+
s.Run("InsertAllUsersGroup", s.Subtest(func(db database.Store, check *MethodCase) {
44+
o := dbgen.Organization(s.T(), db, database.Organization{})
45+
check.Args(o.ID).Asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionCreate)
46+
}))
47+
s.Run("InsertGroup", s.Subtest(func(db database.Store, check *MethodCase) {
48+
o := dbgen.Organization(s.T(), db, database.Organization{})
49+
check.Args(database.InsertGroupParams{
50+
OrganizationID: o.ID,
51+
Name: "test",
52+
}).Asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionCreate)
53+
}))
54+
s.Run("InsertGroupMember", s.Subtest(func(db database.Store, check *MethodCase) {
55+
g := dbgen.Group(s.T(), db, database.Group{})
56+
check.Args(database.InsertGroupMemberParams{
57+
UserID: uuid.New(),
58+
GroupID: g.ID,
59+
}).Asserts(g, rbac.ActionUpdate).Returns()
60+
}))
61+
s.Run("InsertUserGroupsByName", s.Subtest(func(db database.Store, check *MethodCase) {
62+
o := dbgen.Organization(s.T(), db, database.Organization{})
63+
u1 := dbgen.User(s.T(), db, database.User{})
64+
g1 := dbgen.Group(s.T(), db, database.Group{OrganizationID: o.ID})
65+
g2 := dbgen.Group(s.T(), db, database.Group{OrganizationID: o.ID})
66+
_ = dbgen.GroupMember(s.T(), db, database.GroupMember{GroupID: g1.ID, UserID: u1.ID})
67+
check.Args(database.InsertUserGroupsByNameParams{
68+
OrganizationID: o.ID,
69+
UserID: u1.ID,
70+
GroupNames: slice.New(g1.Name, g2.Name),
71+
}).Asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionUpdate).Returns()
72+
}))
73+
s.Run("DeleteGroupMembersByOrgAndUser", s.Subtest(func(db database.Store, check *MethodCase) {
74+
o := dbgen.Organization(s.T(), db, database.Organization{})
75+
u1 := dbgen.User(s.T(), db, database.User{})
76+
g1 := dbgen.Group(s.T(), db, database.Group{OrganizationID: o.ID})
77+
g2 := dbgen.Group(s.T(), db, database.Group{OrganizationID: o.ID})
78+
_ = dbgen.GroupMember(s.T(), db, database.GroupMember{GroupID: g1.ID, UserID: u1.ID})
79+
_ = dbgen.GroupMember(s.T(), db, database.GroupMember{GroupID: g2.ID, UserID: u1.ID})
80+
check.Args(database.DeleteGroupMembersByOrgAndUserParams{
81+
OrganizationID: o.ID,
82+
UserID: u1.ID,
83+
}).Asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionUpdate).Returns()
84+
}))
85+
s.Run("UpdateGroupByID", s.Subtest(func(db database.Store, check *MethodCase) {
86+
g := dbgen.Group(s.T(), db, database.Group{})
87+
check.Args(database.UpdateGroupByIDParams{
88+
ID: g.ID,
89+
}).Asserts(g, rbac.ActionUpdate)
90+
}))
11891
}

0 commit comments

Comments
 (0)