Skip to content

Commit 924ef9c

Browse files
committed
fix unit test to work with dbauthz
1 parent 399241a commit 924ef9c

File tree

1 file changed

+22
-8
lines changed

1 file changed

+22
-8
lines changed

coderd/httpmw/workspaceagent_test.go

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@ import (
1919
func TestWorkspaceAgent(t *testing.T) {
2020
t.Parallel()
2121

22-
setup := func(db database.Store) (*http.Request, uuid.UUID) {
23-
token := uuid.New()
22+
setup := func(db database.Store, token uuid.UUID) *http.Request {
2423
r := httptest.NewRequest("GET", "/", nil)
2524
r.Header.Set(codersdk.SessionTokenHeader, token.String())
26-
return r, token
25+
return r
2726
}
2827

2928
t.Run("None", func(t *testing.T) {
@@ -34,7 +33,7 @@ func TestWorkspaceAgent(t *testing.T) {
3433
httpmw.ExtractWorkspaceAgent(db),
3534
)
3635
rtr.Get("/", nil)
37-
r, _ := setup(db)
36+
r := setup(db, uuid.New())
3837
rw := httptest.NewRecorder()
3938
rtr.ServeHTTP(rw, r)
4039

@@ -46,6 +45,24 @@ func TestWorkspaceAgent(t *testing.T) {
4645
t.Run("Found", func(t *testing.T) {
4746
t.Parallel()
4847
db := dbfake.New()
48+
var (
49+
user = dbgen.User(t, db, database.User{})
50+
workspace = dbgen.Workspace(t, db, database.Workspace{
51+
OwnerID: user.ID,
52+
})
53+
job = dbgen.ProvisionerJob(t, db, database.ProvisionerJob{})
54+
resource = dbgen.WorkspaceResource(t, db, database.WorkspaceResource{
55+
JobID: job.ID,
56+
})
57+
_ = dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{
58+
WorkspaceID: workspace.ID,
59+
JobID: job.ID,
60+
})
61+
agent = dbgen.WorkspaceAgent(t, db, database.WorkspaceAgent{
62+
ResourceID: resource.ID,
63+
})
64+
)
65+
4966
rtr := chi.NewRouter()
5067
rtr.Use(
5168
httpmw.ExtractWorkspaceAgent(db),
@@ -54,10 +71,7 @@ func TestWorkspaceAgent(t *testing.T) {
5471
_ = httpmw.WorkspaceAgent(r)
5572
rw.WriteHeader(http.StatusOK)
5673
})
57-
r, token := setup(db)
58-
_ = dbgen.WorkspaceAgent(t, db, database.WorkspaceAgent{
59-
AuthToken: token,
60-
})
74+
r := setup(db, agent.AuthToken)
6175
rw := httptest.NewRecorder()
6276
rtr.ServeHTTP(rw, r)
6377

0 commit comments

Comments
 (0)