synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-15 22:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(coderd/httpmw): remove dbmem usage from tests (#18146)

Browse Source 
Related to https://github.com/coder/coder/issues/15109
This commit is contained in:
Hugo Dutka
2025-06-02 13:57:56 +02:00
committed by GitHub
parent f986d13a9c
commit 782d01bae2
14 changed files with 235 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
coderd/httpmw/workspacebuildparam_test.go
View File

@ -12,7 +12,7 @@ import (
"github.com/coder/coder/v2/coderd/database"
"github.com/coder/coder/v2/coderd/database/dbgen"
"github.com/coder/coder/v2/coderd/database/dbmem"
"github.com/coder/coder/v2/coderd/database/dbtestutil"
"github.com/coder/coder/v2/coderd/httpmw"
"github.com/coder/coder/v2/codersdk"
)
@ -26,8 +26,15 @@ func TestWorkspaceBuildParam(t *testing.T) {
_, token = dbgen.APIKey(t, db, database.APIKey{
UserID: user.ID,
})
org = dbgen.Organization(t, db, database.Organization{})
tpl = dbgen.Template(t, db, database.Template{
OrganizationID: org.ID,
CreatedBy: user.ID,
})
workspace = dbgen.Workspace(t, db, database.WorkspaceTable{
OwnerID: user.ID,
OwnerID: user.ID,
OrganizationID: org.ID,
TemplateID: tpl.ID,
})
)
@ -43,7 +50,7 @@ func TestWorkspaceBuildParam(t *testing.T) {
t.Run("None", func(t *testing.T) {
t.Parallel()
db := dbmem.New()
db, _ := dbtestutil.NewDB(t)
rtr := chi.NewRouter()
rtr.Use(httpmw.ExtractWorkspaceBuildParam(db))
rtr.Get("/", nil)
@ -58,7 +65,7 @@ func TestWorkspaceBuildParam(t *testing.T) {
t.Run("NotFound", func(t *testing.T) {
t.Parallel()
db := dbmem.New()
db, _ := dbtestutil.NewDB(t)
rtr := chi.NewRouter()
rtr.Use(httpmw.ExtractWorkspaceBuildParam(db))
rtr.Get("/", nil)
@ -75,7 +82,7 @@ func TestWorkspaceBuildParam(t *testing.T) {
t.Run("WorkspaceBuild", func(t *testing.T) {
t.Parallel()
db := dbmem.New()
db, _ := dbtestutil.NewDB(t)
rtr := chi.NewRouter()
rtr.Use(
httpmw.ExtractAPIKeyMW(httpmw.ExtractAPIKeyConfig{
@ -91,10 +98,21 @@ func TestWorkspaceBuildParam(t *testing.T) {
})
r, workspace := setupAuthentication(db)
tv := dbgen.TemplateVersion(t, db, database.TemplateVersion{
TemplateID: uuid.NullUUID{
UUID: workspace.TemplateID,
Valid: true,
},
OrganizationID: workspace.OrganizationID,
CreatedBy: workspace.OwnerID,
})
pj := dbgen.ProvisionerJob(t, db, nil, database.ProvisionerJob{})
workspaceBuild := dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{
Transition: database.WorkspaceTransitionStart,
Reason: database.BuildReasonInitiator,
WorkspaceID: workspace.ID,
JobID: pj.ID,
TemplateVersionID: tv.ID,
Transition: database.WorkspaceTransitionStart,
Reason: database.BuildReasonInitiator,
WorkspaceID: workspace.ID,
})
chi.RouteContext(r.Context()).URLParams.Add("workspacebuild", workspaceBuild.ID.String())