Skip to content

Commit e799713

Browse files
committed
values group_test.go
1 parent d1e3214 commit e799713

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

coderd/authzquery/group_test.go

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func (suite *MethodTestSuite) TestGroup() {
1515
suite.Run("DeleteGroupByID", func() {
1616
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
1717
g := dbgen.Group(t, db, database.Group{})
18-
return methodCase(values(g.ID), asserts(g, rbac.ActionDelete))
18+
return methodCase(values(g.ID), asserts(g, rbac.ActionDelete), values())
1919
})
2020
})
2121
suite.Run("DeleteGroupMemberFromGroup", func() {
@@ -27,13 +27,13 @@ func (suite *MethodTestSuite) TestGroup() {
2727
return methodCase(values(database.DeleteGroupMemberFromGroupParams{
2828
UserID: m.UserID,
2929
GroupID: g.ID,
30-
}), asserts(g, rbac.ActionUpdate))
30+
}), asserts(g, rbac.ActionUpdate), values())
3131
})
3232
})
3333
suite.Run("GetGroupByID", func() {
3434
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
3535
g := dbgen.Group(t, db, database.Group{})
36-
return methodCase(values(g.ID), asserts(g, rbac.ActionRead))
36+
return methodCase(values(g.ID), asserts(g, rbac.ActionRead), values(g))
3737
})
3838
})
3939
suite.Run("GetGroupByOrgAndName", func() {
@@ -42,20 +42,20 @@ func (suite *MethodTestSuite) TestGroup() {
4242
return methodCase(values(database.GetGroupByOrgAndNameParams{
4343
OrganizationID: g.OrganizationID,
4444
Name: g.Name,
45-
}), asserts(g, rbac.ActionRead))
45+
}), asserts(g, rbac.ActionRead), values(g))
4646
})
4747
})
4848
suite.Run("GetGroupMembers", func() {
4949
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
5050
g := dbgen.Group(t, db, database.Group{})
51-
_ = dbgen.GroupMember(t, db, database.GroupMember{})
52-
return methodCase(values(g.ID), asserts(g, rbac.ActionRead))
51+
gm := dbgen.GroupMember(t, db, database.GroupMember{})
52+
return methodCase(values(g.ID), asserts(g, rbac.ActionRead), values(gm))
5353
})
5454
})
5555
suite.Run("InsertAllUsersGroup", func() {
5656
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
5757
o := dbgen.Organization(t, db, database.Organization{})
58-
return methodCase(values(o.ID), asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionCreate))
58+
return methodCase(values(o.ID), asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionCreate), values(database.Group{}))
5959
})
6060
})
6161
suite.Run("InsertGroup", func() {
@@ -64,7 +64,8 @@ func (suite *MethodTestSuite) TestGroup() {
6464
return methodCase(values(database.InsertGroupParams{
6565
OrganizationID: o.ID,
6666
Name: "test",
67-
}), asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionCreate))
67+
}), asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionCreate),
68+
values(database.Group{}))
6869
})
6970
})
7071
suite.Run("InsertGroupMember", func() {
@@ -73,7 +74,8 @@ func (suite *MethodTestSuite) TestGroup() {
7374
return methodCase(values(database.InsertGroupMemberParams{
7475
UserID: uuid.New(),
7576
GroupID: g.ID,
76-
}), asserts(g, rbac.ActionUpdate))
77+
}), asserts(g, rbac.ActionUpdate),
78+
values())
7779
})
7880
})
7981
suite.Run("InsertUserGroupsByName", func() {
@@ -87,7 +89,7 @@ func (suite *MethodTestSuite) TestGroup() {
8789
OrganizationID: o.ID,
8890
UserID: u1.ID,
8991
GroupNames: slice.New(g1.Name, g2.Name),
90-
}), asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionUpdate))
92+
}), asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionUpdate), values())
9193
})
9294
})
9395
suite.Run("DeleteGroupMembersByOrgAndUser", func() {
@@ -101,7 +103,7 @@ func (suite *MethodTestSuite) TestGroup() {
101103
return methodCase(values(database.DeleteGroupMembersByOrgAndUserParams{
102104
OrganizationID: o.ID,
103105
UserID: u1.ID,
104-
}), asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionUpdate))
106+
}), asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionUpdate), values())
105107
})
106108
})
107109
suite.Run("UpdateGroupByID", func() {
@@ -110,7 +112,7 @@ func (suite *MethodTestSuite) TestGroup() {
110112
return methodCase(values(database.UpdateGroupByIDParams{
111113
Name: "new-name",
112114
ID: g.ID,
113-
}), asserts(g, rbac.ActionUpdate))
115+
}), asserts(g, rbac.ActionUpdate), values(g))
114116
})
115117
})
116118
}

0 commit comments

Comments
 (0)