Skip to content

Commit cbb4502

Browse files
EmyrkEmyrk
committed
Template outputs
1 parent e799713 commit cbb4502

File tree

1 file changed

+37
-31
lines changed

1 file changed

+37
-31
lines changed

‎coderd/authzquery/template_test.go

Lines changed: 37 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func (suite *MethodTestSuite) TestTemplate() {
2121
OrganizationID: o1.ID,
2222
ActiveVersionID: tvid,
2323
})
24-
_ = dbgen.TemplateVersion(t, db, database.TemplateVersion{
24+
a := dbgen.TemplateVersion(t, db, database.TemplateVersion{
2525
CreatedAt: now.Add(-time.Hour),
2626
ID: tvid,
2727
Name: t1.Name,
@@ -36,21 +36,21 @@ func (suite *MethodTestSuite) TestTemplate() {
3636
Name: t1.Name,
3737
OrganizationID: o1.ID,
3838
TemplateID: uuid.NullUUID{UUID: t1.ID, Valid: true},
39-
}), asserts(t1, rbac.ActionRead))
39+
}), asserts(t1, rbac.ActionRead), values(a))
4040
})
4141
})
4242
suite.Run("GetTemplateAverageBuildTime", func() {
4343
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
4444
t1 := dbgen.Template(t, db, database.Template{})
4545
return methodCase(values(database.GetTemplateAverageBuildTimeParams{
4646
TemplateID: uuid.NullUUID{UUID: t1.ID, Valid: true},
47-
}), asserts(t1, rbac.ActionRead))
47+
}), asserts(t1, rbac.ActionRead), nil)
4848
})
4949
})
5050
suite.Run("GetTemplateByID", func() {
5151
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
5252
t1 := dbgen.Template(t, db, database.Template{})
53-
return methodCase(values(t1.ID), asserts(t1, rbac.ActionRead))
53+
return methodCase(values(t1.ID), asserts(t1, rbac.ActionRead), values(t1))
5454
})
5555
})
5656
suite.Run("GetTemplateByOrganizationAndName", func() {
@@ -62,13 +62,13 @@ func (suite *MethodTestSuite) TestTemplate() {
6262
return methodCase(values(database.GetTemplateByOrganizationAndNameParams{
6363
Name: t1.Name,
6464
OrganizationID: o1.ID,
65-
}), asserts(t1, rbac.ActionRead))
65+
}), asserts(t1, rbac.ActionRead), values(t1))
6666
})
6767
})
6868
suite.Run("GetTemplateDAUs", func() {
6969
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
7070
t1 := dbgen.Template(t, db, database.Template{})
71-
return methodCase(values(t1.ID), asserts(t1, rbac.ActionRead))
71+
return methodCase(values(t1.ID), asserts(t1, rbac.ActionRead), nil)
7272
})
7373
})
7474
suite.Run("GetTemplateVersionByJobID", func() {
@@ -77,7 +77,7 @@ func (suite *MethodTestSuite) TestTemplate() {
7777
tv := dbgen.TemplateVersion(t, db, database.TemplateVersion{
7878
TemplateID: uuid.NullUUID{UUID: t1.ID, Valid: true},
7979
})
80-
return methodCase(values(tv.JobID), asserts(t1, rbac.ActionRead))
80+
return methodCase(values(tv.JobID), asserts(t1, rbac.ActionRead), values(tv))
8181
})
8282
})
8383
suite.Run("GetTemplateVersionByTemplateIDAndName", func() {
@@ -89,7 +89,7 @@ func (suite *MethodTestSuite) TestTemplate() {
8989
return methodCase(values(database.GetTemplateVersionByTemplateIDAndNameParams{
9090
Name: tv.Name,
9191
TemplateID: uuid.NullUUID{UUID: t1.ID, Valid: true},
92-
}), asserts(t1, rbac.ActionRead))
92+
}), asserts(t1, rbac.ActionRead), values(tv))
9393
})
9494
})
9595
suite.Run("GetTemplateVersionParameters", func() {
@@ -98,19 +98,19 @@ func (suite *MethodTestSuite) TestTemplate() {
9898
tv := dbgen.TemplateVersion(t, db, database.TemplateVersion{
9999
TemplateID: uuid.NullUUID{UUID: t1.ID, Valid: true},
100100
})
101-
return methodCase(values(tv.ID), asserts(t1, rbac.ActionRead))
101+
return methodCase(values(tv.ID), asserts(t1, rbac.ActionRead), values([]database.TemplateVersionParameter{}))
102102
})
103103
})
104104
suite.Run("GetTemplateGroupRoles", func() {
105105
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
106106
t1 := dbgen.Template(t, db, database.Template{})
107-
return methodCase(values(t1.ID), asserts(t1, rbac.ActionRead))
107+
return methodCase(values(t1.ID), asserts(t1, rbac.ActionRead), nil)
108108
})
109109
})
110110
suite.Run("GetTemplateUserRoles", func() {
111111
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
112112
t1 := dbgen.Template(t, db, database.Template{})
113-
return methodCase(values(t1.ID), asserts(t1, rbac.ActionRead))
113+
return methodCase(values(t1.ID), asserts(t1, rbac.ActionRead), nil)
114114
})
115115
})
116116
suite.Run("GetTemplateVersionByID", func() {
@@ -119,7 +119,7 @@ func (suite *MethodTestSuite) TestTemplate() {
119119
tv := dbgen.TemplateVersion(t, db, database.TemplateVersion{
120120
TemplateID: uuid.NullUUID{UUID: t1.ID, Valid: true},
121121
})
122-
return methodCase(values(tv.ID), asserts(t1, rbac.ActionRead))
122+
return methodCase(values(tv.ID), asserts(t1, rbac.ActionRead), values(tv))
123123
})
124124
})
125125
suite.Run("GetTemplateVersionsByIDs", func() {
@@ -133,21 +133,23 @@ func (suite *MethodTestSuite) TestTemplate() {
133133
TemplateID: uuid.NullUUID{UUID: t2.ID, Valid: true},
134134
})
135135
return methodCase(values([]uuid.UUID{tv1.ID, tv2.ID}),
136-
asserts(t1, rbac.ActionRead, t2, rbac.ActionRead))
136+
asserts(t1, rbac.ActionRead, t2, rbac.ActionRead),
137+
values([]database.TemplateVersion{tv1, tv2}))
137138
})
138139
})
139140
suite.Run("GetTemplateVersionsByTemplateID", func() {
140141
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
141142
t1 := dbgen.Template(t, db, database.Template{})
142-
_ = dbgen.TemplateVersion(t, db, database.TemplateVersion{
143+
a := dbgen.TemplateVersion(t, db, database.TemplateVersion{
143144
TemplateID: uuid.NullUUID{UUID: t1.ID, Valid: true},
144145
})
145-
_ = dbgen.TemplateVersion(t, db, database.TemplateVersion{
146+
b := dbgen.TemplateVersion(t, db, database.TemplateVersion{
146147
TemplateID: uuid.NullUUID{UUID: t1.ID, Valid: true},
147148
})
148149
return methodCase(values(database.GetTemplateVersionsByTemplateIDParams{
149150
TemplateID: t1.ID,
150-
}), asserts(t1, rbac.ActionRead))
151+
}), asserts(t1, rbac.ActionRead),
152+
values([]database.TemplateVersion{a, b}))
151153
})
152154
})
153155
suite.Run("GetTemplateVersionsCreatedAfter", func() {
@@ -162,14 +164,16 @@ func (suite *MethodTestSuite) TestTemplate() {
162164
TemplateID: uuid.NullUUID{UUID: t1.ID, Valid: true},
163165
CreatedAt: now.Add(-2 * time.Hour),
164166
})
165-
return methodCase(values(now.Add(-time.Hour)), asserts(rbac.ResourceTemplate.All(), rbac.ActionRead))
167+
return methodCase(values(now.Add(-time.Hour)), asserts(rbac.ResourceTemplate.All(), rbac.ActionRead), nil)
166168
})
167169
})
168170
suite.Run("GetTemplatesWithFilter", func() {
169171
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
170-
_ = dbgen.Template(t, db, database.Template{})
172+
a := dbgen.Template(t, db, database.Template{})
171173
// No asserts because SQLFilter.
172-
return methodCase(values(database.GetTemplatesWithFilterParams{}), asserts())
174+
return methodCase(values(database.GetTemplatesWithFilterParams{}),
175+
asserts(),
176+
values([]database.Template{a}))
173177
})
174178
})
175179
suite.Run("InsertTemplate", func() {
@@ -178,7 +182,7 @@ func (suite *MethodTestSuite) TestTemplate() {
178182
return methodCase(values(database.InsertTemplateParams{
179183
Provisioner: "echo",
180184
OrganizationID: orgID,
181-
}), asserts(rbac.ResourceTemplate.InOrg(orgID), rbac.ActionCreate))
185+
}), asserts(rbac.ResourceTemplate.InOrg(orgID), rbac.ActionCreate), nil)
182186
})
183187
})
184188
suite.Run("InsertTemplateVersion", func() {
@@ -187,33 +191,36 @@ func (suite *MethodTestSuite) TestTemplate() {
187191
return methodCase(values(database.InsertTemplateVersionParams{
188192
TemplateID: uuid.NullUUID{UUID: t1.ID, Valid: true},
189193
OrganizationID: t1.OrganizationID,
190-
}), asserts(t1, rbac.ActionRead, t1, rbac.ActionCreate))
194+
}), asserts(t1, rbac.ActionRead, t1, rbac.ActionCreate), nil)
191195
})
192196
})
193197
suite.Run("SoftDeleteTemplateByID", func() {
194198
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
195199
t1 := dbgen.Template(t, db, database.Template{})
196-
return methodCase(values(t1.ID), asserts(t1, rbac.ActionDelete))
200+
return methodCase(values(t1.ID), asserts(t1, rbac.ActionDelete), nil)
197201
})
198202
})
199203
suite.Run("UpdateTemplateACLByID", func() {
200204
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
201205
t1 := dbgen.Template(t, db, database.Template{})
202206
return methodCase(values(database.UpdateTemplateACLByIDParams{
203207
ID: t1.ID,
204-
}), asserts(t1, rbac.ActionCreate))
208+
}), asserts(t1, rbac.ActionCreate), values(t1))
205209
})
206210
})
207211
suite.Run("UpdateTemplateActiveVersionByID", func() {
208212
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
209-
t1 := dbgen.Template(t, db, database.Template{})
213+
t1 := dbgen.Template(t, db, database.Template{
214+
ActiveVersionID: uuid.New(),
215+
})
210216
tv := dbgen.TemplateVersion(t, db, database.TemplateVersion{
217+
ID: t1.ActiveVersionID,
211218
TemplateID: uuid.NullUUID{UUID: t1.ID, Valid: true},
212219
})
213220
return methodCase(values(database.UpdateTemplateActiveVersionByIDParams{
214221
ID: t1.ID,
215222
ActiveVersionID: tv.ID,
216-
}), asserts(t1, rbac.ActionUpdate))
223+
}), asserts(t1, rbac.ActionUpdate), values(t1))
217224
})
218225
})
219226
suite.Run("UpdateTemplateDeletedByID", func() {
@@ -222,16 +229,15 @@ func (suite *MethodTestSuite) TestTemplate() {
222229
return methodCase(values(database.UpdateTemplateDeletedByIDParams{
223230
ID: t1.ID,
224231
Deleted: true,
225-
}), asserts(t1, rbac.ActionDelete))
232+
}), asserts(t1, rbac.ActionDelete), values())
226233
})
227234
})
228235
suite.Run("UpdateTemplateMetaByID", func() {
229236
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
230237
t1 := dbgen.Template(t, db, database.Template{})
231238
return methodCase(values(database.UpdateTemplateMetaByIDParams{
232-
ID: t1.ID,
233-
Name: "foo",
234-
}), asserts(t1, rbac.ActionUpdate))
239+
ID: t1.ID,
240+
}), asserts(t1, rbac.ActionUpdate), values(t1))
235241
})
236242
})
237243
suite.Run("UpdateTemplateVersionByID", func() {
@@ -243,7 +249,7 @@ func (suite *MethodTestSuite) TestTemplate() {
243249
return methodCase(values(database.UpdateTemplateVersionByIDParams{
244250
ID: tv.ID,
245251
TemplateID: uuid.NullUUID{UUID: t1.ID, Valid: true},
246-
}), asserts(t1, rbac.ActionUpdate))
252+
}), asserts(t1, rbac.ActionUpdate), values())
247253
})
248254
})
249255
suite.Run("UpdateTemplateVersionDescriptionByJobID", func() {
@@ -257,7 +263,7 @@ func (suite *MethodTestSuite) TestTemplate() {
257263
return methodCase(values(database.UpdateTemplateVersionDescriptionByJobIDParams{
258264
JobID: jobID,
259265
Readme: "foo",
260-
}), asserts(t1, rbac.ActionUpdate))
266+
}), asserts(t1, rbac.ActionUpdate), values())
261267
})
262268
})
263269
}

0 commit comments

Comments
 (0)