Skip to content

Commit f0f77fb

Browse files
committed
chore: generate test fixtures correctly
Signed-off-by: Danny Kopping <dannykopping@gmail.com>
1 parent 1b737ff commit f0f77fb

32 files changed

+1232
-188
lines changed

provisioner/terraform/resources_test.go

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,7 +1314,7 @@ func TestDefaultPresets(t *testing.T) {
13141314

13151315
// nolint:dogsled
13161316
_, filename, _, _ := runtime.Caller(0)
1317-
dir := filepath.Join(filepath.Dir(filename), "testdata", "resources", "presets")
1317+
dir := filepath.Join(filepath.Dir(filename), "testdata", "resources")
13181318

13191319
cases := map[string]struct {
13201320
fixtureFile string
@@ -1323,12 +1323,12 @@ func TestDefaultPresets(t *testing.T) {
13231323
validate func(t *testing.T, state *terraform.State)
13241324
}{
13251325
"multiple defaults should fail": {
1326-
fixtureFile: "multiple-defaults",
1326+
fixtureFile: "presets-multiple-defaults",
13271327
expectError: true,
13281328
errorMsg: "a maximum of 1 coder_workspace_preset can be marked as default, but 2 are set",
13291329
},
13301330
"single default should succeed": {
1331-
fixtureFile: "single-default",
1331+
fixtureFile: "presets-single-default",
13321332
expectError: false,
13331333
validate: func(t *testing.T, state *terraform.State) {
13341334
require.Len(t, state.Presets, 2)
@@ -1342,16 +1342,6 @@ func TestDefaultPresets(t *testing.T) {
13421342
require.Equal(t, 1, defaultCount)
13431343
},
13441344
},
1345-
"no defaults should succeed": {
1346-
fixtureFile: "no-defaults",
1347-
expectError: false,
1348-
validate: func(t *testing.T, state *terraform.State) {
1349-
require.Len(t, state.Presets, 2)
1350-
for _, preset := range state.Presets {
1351-
require.False(t, preset.Default)
1352-
}
1353-
},
1354-
},
13551345
}
13561346

13571347
for name, tc := range cases {
@@ -1360,12 +1350,12 @@ func TestDefaultPresets(t *testing.T) {
13601350
t.Parallel()
13611351
ctx, logger := ctxAndLogger(t)
13621352

1363-
tfPlanRaw, err := os.ReadFile(filepath.Join(dir, tc.fixtureFile+".tfplan.json"))
1353+
tfPlanRaw, err := os.ReadFile(filepath.Join(dir, tc.fixtureFile, tc.fixtureFile+".tfplan.json"))
13641354
require.NoError(t, err)
13651355
var tfPlan tfjson.Plan
13661356
err = json.Unmarshal(tfPlanRaw, &tfPlan)
13671357
require.NoError(t, err)
1368-
tfPlanGraph, err := os.ReadFile(filepath.Join(dir, tc.fixtureFile+".tfplan.dot"))
1358+
tfPlanGraph, err := os.ReadFile(filepath.Join(dir, tc.fixtureFile, tc.fixtureFile+".tfplan.dot"))
13691359
require.NoError(t, err)
13701360

13711361
modules := []*tfjson.StateModule{tfPlan.PlannedValues.RootModule}

provisioner/terraform/testdata/resources/external-auth-providers/external-auth-providers.tfplan.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provisioner/terraform/testdata/resources/external-auth-providers/external-auth-providers.tfstate.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provisioner/terraform/testdata/resources/presets/multiple-defaults.tf renamed to provisioner/terraform/testdata/resources/presets-multiple-defaults/multiple-defaults.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ terraform {
22
required_providers {
33
coder = {
44
source = "coder/coder"
5-
version = ">= 2.3.0-pre2"
5+
version = ">= 2.3.0"
66
}
77
}
88
}

provisioner/terraform/testdata/resources/presets-multiple-defaults/presets-multiple-defaults.tfplan.dot

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy