add the option to specify preset parameters in wsbuilder_test

SasSwart · SasSwart · commit a66c533684c6 · 2025-04-16T12:40:40.000Z
diff --git a/coderd/wsbuilder/wsbuilder_test.go b/coderd/wsbuilder/wsbuilder_test.go
@@ -789,7 +789,10 @@ func TestWorkspaceBuildWithPreset(t *testing.T) {
 		// Inputs
 		withTemplate,
 		withActiveVersion(nil),
-		withTemplateVersionPreset(presetID),
+		// building workspaces using presets with different combinations of parameters
+		// is tested at the API layer, in TestWorkspace. Here, it is sufficient to
+		// test that the preset is used when provided.
+		withTemplateVersionPresetParameters(presetID, nil),
 		withLastBuildNotFound,
 		withTemplateVersionVariables(activeVersionID, nil),
 		withParameterSchemas(activeJobID, nil),
@@ -961,9 +964,9 @@ func withInactiveVersion(params []database.TemplateVersionParameter) func(mTx *d
 	}
 }
 
-func withTemplateVersionPreset(presetID uuid.UUID) func(mTx *dbmock.MockStore) {
+func withTemplateVersionPresetParameters(presetID uuid.UUID, params []database.TemplateVersionPresetParameter) func(mTx *dbmock.MockStore) {
 	return func(mTx *dbmock.MockStore) {
-		mTx.EXPECT().GetPresetParametersByPresetID(gomock.Any(), presetID).Return(nil, nil)
+		mTx.EXPECT().GetPresetParametersByPresetID(gomock.Any(), presetID).Return(params, nil)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -789,7 +789,10 @@ func TestWorkspaceBuildWithPreset(t *testing.T) {`
`789`	`789`	`// Inputs`
`790`	`790`	`withTemplate,`
`791`	`791`	`withActiveVersion(nil),`
`792`		`- withTemplateVersionPreset(presetID),`
	`792`	`+ // building workspaces using presets with different combinations of parameters`
	`793`	`+ // is tested at the API layer, in TestWorkspace. Here, it is sufficient to`
	`794`	`+ // test that the preset is used when provided.`
	`795`	`+ withTemplateVersionPresetParameters(presetID, nil),`
`793`	`796`	`withLastBuildNotFound,`
`794`	`797`	`withTemplateVersionVariables(activeVersionID, nil),`
`795`	`798`	`withParameterSchemas(activeJobID, nil),`
`@@ -961,9 +964,9 @@ func withInactiveVersion(params []database.TemplateVersionParameter) func(mTx *d`
`961`	`964`	`}`
`962`	`965`	`}`
`963`	`966`
`964`		`-func withTemplateVersionPreset(presetID uuid.UUID) func(mTx *dbmock.MockStore) {`
	`967`	`+func withTemplateVersionPresetParameters(presetID uuid.UUID, params []database.TemplateVersionPresetParameter) func(mTx *dbmock.MockStore) {`
`965`	`968`	`return func(mTx *dbmock.MockStore) {`
`966`		`- mTx.EXPECT().GetPresetParametersByPresetID(gomock.Any(), presetID).Return(nil, nil)`
	`969`	`+ mTx.EXPECT().GetPresetParametersByPresetID(gomock.Any(), presetID).Return(params, nil)`
`967`	`970`	`}`
`968`	`971`	`}`
`969`	`972`