Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2c002bd

Browse files
johnstcnjohnstcn
committed
workspace_test.go values fix
1 parent a621743 commit 2c002bd

File tree

1 file changed

+24
-21
lines changed

1 file changed

+24
-21
lines changed

‎coderd/authzquery/workspace_test.go

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ func (s *MethodTestSuite) TestWorkspace() {
1414
s.Run("GetWorkspaceByID", func() {
1515
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
1616
ws := dbgen.Workspace(t, db, database.Workspace{})
17-
return methodCase(values(ws.ID), asserts(ws, rbac.ActionRead), values(ws))
17+
return methodCase(values(ws.ID), asserts(ws, rbac.ActionRead), nil) // GetWorkspacesRow
1818
})
1919
})
2020
s.Run("GetWorkspaces", func() {
2121
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
22-
a := dbgen.Workspace(t, db, database.Workspace{})
23-
b := dbgen.Workspace(t, db, database.Workspace{})
22+
_ = dbgen.Workspace(t, db, database.Workspace{})
23+
_ = dbgen.Workspace(t, db, database.Workspace{})
2424
// No asserts here because SQLFilter.
2525
return methodCase(values(database.GetWorkspacesParams{}), asserts(),
26-
values([]database.Workspace{a, b}))
26+
nil) // GetWorkspacesRow
2727
})
2828
})
2929
s.Run("GetLatestWorkspaceBuildByWorkspaceID", func() {
@@ -162,12 +162,10 @@ func (s *MethodTestSuite) TestWorkspace() {
162162
s.Run("GetWorkspaceBuildsByWorkspaceID", func() {
163163
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
164164
ws := dbgen.Workspace(t, db, database.Workspace{})
165-
a := dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{WorkspaceID: ws.ID, BuildNumber: 1})
166-
b := dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{WorkspaceID: ws.ID, BuildNumber: 2})
167-
c := dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{WorkspaceID: ws.ID, BuildNumber: 3})
168-
return methodCase(values(database.GetWorkspaceBuildsByWorkspaceIDParams{WorkspaceID: ws.ID}),
169-
asserts(ws, rbac.ActionRead),
170-
values([]database.WorkspaceBuild{a, b, c}))
165+
_ = dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{WorkspaceID: ws.ID, BuildNumber: 1})
166+
_ = dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{WorkspaceID: ws.ID, BuildNumber: 2})
167+
_ = dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{WorkspaceID: ws.ID, BuildNumber: 3})
168+
return methodCase(values(database.GetWorkspaceBuildsByWorkspaceIDParams{WorkspaceID: ws.ID}), asserts(ws, rbac.ActionRead), nil) // ordering
171169
})
172170
})
173171
s.Run("GetWorkspaceByAgentID", func() {
@@ -281,9 +279,11 @@ func (s *MethodTestSuite) TestWorkspace() {
281279
s.Run("UpdateWorkspace", func() {
282280
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
283281
w := dbgen.Workspace(t, db, database.Workspace{})
282+
expected := w
283+
expected.Name = ""
284284
return methodCase(values(database.UpdateWorkspaceParams{
285285
ID: w.ID,
286-
}), asserts(w, rbac.ActionUpdate), values(w))
286+
}), asserts(w, rbac.ActionUpdate), values(expected))
287287
})
288288
})
289289
s.Run("UpdateWorkspaceAgentConnectionByID", func() {
@@ -294,7 +294,7 @@ func (s *MethodTestSuite) TestWorkspace() {
294294
agt := dbgen.WorkspaceAgent(t, db, database.WorkspaceAgent{ResourceID: res.ID})
295295
return methodCase(values(database.UpdateWorkspaceAgentConnectionByIDParams{
296296
ID: agt.ID,
297-
}), asserts(ws, rbac.ActionUpdate), values(agt))
297+
}), asserts(ws, rbac.ActionUpdate), values())
298298
})
299299
})
300300
s.Run("InsertAgentStat", func() {
@@ -313,7 +313,7 @@ func (s *MethodTestSuite) TestWorkspace() {
313313
agt := dbgen.WorkspaceAgent(t, db, database.WorkspaceAgent{ResourceID: res.ID})
314314
return methodCase(values(database.UpdateWorkspaceAgentVersionByIDParams{
315315
ID: agt.ID,
316-
}), asserts(ws, rbac.ActionUpdate), values(agt))
316+
}), asserts(ws, rbac.ActionUpdate), values())
317317
})
318318
})
319319
s.Run("UpdateWorkspaceAppHealthByID", func() {
@@ -324,32 +324,35 @@ func (s *MethodTestSuite) TestWorkspace() {
324324
agt := dbgen.WorkspaceAgent(t, db, database.WorkspaceAgent{ResourceID: res.ID})
325325
app := dbgen.WorkspaceApp(t, db, database.WorkspaceApp{AgentID: agt.ID})
326326
return methodCase(values(database.UpdateWorkspaceAppHealthByIDParams{
327-
ID: app.ID,
328-
}), asserts(ws, rbac.ActionUpdate), values(app))
327+
ID: app.ID,
328+
Health: database.WorkspaceAppHealthDisabled,
329+
}), asserts(ws, rbac.ActionUpdate), values())
329330
})
330331
})
331332
s.Run("UpdateWorkspaceAutostart", func() {
332333
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
333334
ws := dbgen.Workspace(t, db, database.Workspace{})
334335
return methodCase(values(database.UpdateWorkspaceAutostartParams{
335336
ID: ws.ID,
336-
}), asserts(ws, rbac.ActionUpdate), values(ws))
337+
}), asserts(ws, rbac.ActionUpdate), values())
337338
})
338339
})
339340
s.Run("UpdateWorkspaceBuildByID", func() {
340341
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
341342
ws := dbgen.Workspace(t, db, database.Workspace{})
342343
build := dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{WorkspaceID: ws.ID, JobID: uuid.New()})
343344
return methodCase(values(database.UpdateWorkspaceBuildByIDParams{
344-
ID: build.ID,
345+
ID: build.ID,
346+
UpdatedAt: build.UpdatedAt,
347+
Deadline: build.Deadline,
345348
}), asserts(ws, rbac.ActionUpdate), values(build))
346349
})
347350
})
348351
s.Run("SoftDeleteWorkspaceByID", func() {
349352
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
350353
ws := dbgen.Workspace(t, db, database.Workspace{})
351354
ws.Deleted = true
352-
return methodCase(values(ws.ID), asserts(ws, rbac.ActionDelete), values(ws))
355+
return methodCase(values(ws.ID), asserts(ws, rbac.ActionDelete), values())
353356
})
354357
})
355358
s.Run("UpdateWorkspaceDeletedByID", func() {
@@ -358,23 +361,23 @@ func (s *MethodTestSuite) TestWorkspace() {
358361
return methodCase(values(database.UpdateWorkspaceDeletedByIDParams{
359362
ID: ws.ID,
360363
Deleted: true,
361-
}), asserts(ws, rbac.ActionDelete), values(ws))
364+
}), asserts(ws, rbac.ActionDelete), values())
362365
})
363366
})
364367
s.Run("UpdateWorkspaceLastUsedAt", func() {
365368
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
366369
ws := dbgen.Workspace(t, db, database.Workspace{})
367370
return methodCase(values(database.UpdateWorkspaceLastUsedAtParams{
368371
ID: ws.ID,
369-
}), asserts(ws, rbac.ActionUpdate), values(ws))
372+
}), asserts(ws, rbac.ActionUpdate), values())
370373
})
371374
})
372375
s.Run("UpdateWorkspaceTTL", func() {
373376
s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
374377
ws := dbgen.Workspace(t, db, database.Workspace{})
375378
return methodCase(values(database.UpdateWorkspaceTTLParams{
376379
ID: ws.ID,
377-
}), asserts(ws, rbac.ActionUpdate), values(ws))
380+
}), asserts(ws, rbac.ActionUpdate), values())
378381
})
379382
})
380383
s.Run("GetWorkspaceByWorkspaceAppID", func() {

0 commit comments

Comments
 (0)