From ce013a52aad307cf013b923b589adca5346a303a Mon Sep 17 00:00:00 2001 From: Sas Swart Date: Wed, 12 Feb 2025 12:11:41 +0000 Subject: [PATCH] improve test --- coderd/presets_test.go | 20 ++++++++++---------- codersdk/presets.go | 5 ++--- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/coderd/presets_test.go b/coderd/presets_test.go index c7df021180..ffe51787d5 100644 --- a/coderd/presets_test.go +++ b/coderd/presets_test.go @@ -19,7 +19,7 @@ func TestTemplateVersionPresets(t *testing.T) { t.Parallel() - sdkPreset := codersdk.Preset{ + givenPreset := codersdk.Preset{ Name: "My Preset", Parameters: []codersdk.PresetParameter{ { @@ -41,20 +41,20 @@ func TestTemplateVersionPresets(t *testing.T) { // nolint:gocritic // This is a test provisionerCtx := dbauthz.AsProvisionerd(ctx) - preset, err := db.InsertPreset(provisionerCtx, database.InsertPresetParams{ - Name: sdkPreset.Name, + dbPreset, err := db.InsertPreset(provisionerCtx, database.InsertPresetParams{ + Name: givenPreset.Name, TemplateVersionID: version.ID, }) require.NoError(t, err) var presetParameterNames []string var presetParameterValues []string - for _, presetParameter := range sdkPreset.Parameters { + for _, presetParameter := range givenPreset.Parameters { presetParameterNames = append(presetParameterNames, presetParameter.Name) presetParameterValues = append(presetParameterValues, presetParameter.Value) } _, err = db.InsertPresetParameters(provisionerCtx, database.InsertPresetParametersParams{ - TemplateVersionPresetID: preset.ID, + TemplateVersionPresetID: dbPreset.ID, Names: presetParameterNames, Values: presetParameterValues, }) @@ -64,13 +64,13 @@ func TestTemplateVersionPresets(t *testing.T) { require.NoError(t, err) userCtx := dbauthz.As(ctx, userSubject) - presets, err := client.TemplateVersionPresets(userCtx, version.ID) + gotPresets, err := client.TemplateVersionPresets(userCtx, version.ID) require.NoError(t, err) - require.Equal(t, 1, len(presets)) - require.Equal(t, sdkPreset.Name, presets[0].Name) + require.Equal(t, 1, len(gotPresets)) + require.Equal(t, givenPreset.Name, gotPresets[0].Name) - for _, presetParameter := range sdkPreset.Parameters { - require.Contains(t, presets[0].Parameters, presetParameter) + for _, presetParameter := range givenPreset.Parameters { + require.Contains(t, gotPresets[0].Parameters, presetParameter) } } diff --git a/codersdk/presets.go b/codersdk/presets.go index 78b186c435..110f6c605f 100644 --- a/codersdk/presets.go +++ b/codersdk/presets.go @@ -17,9 +17,8 @@ type Preset struct { } type PresetParameter struct { - PresetID uuid.UUID - Name string - Value string + Name string + Value string } // TemplateVersionPresets returns the presets associated with a template version.