Simplify template processing

Signed-off-by: Dave Henderson <dhenderson@gmail.com>

1 files changed, 19 insertions, 10 deletions

diff --git a/template_windows_test.go b/template_windows_test.go
index 4e678670..3990aa9f 100644
--- a/template_windows_test.go
+++ b/template_windows_test.go
@@ -1,22 +1,26 @@
 //go:build windows
-// +build windows
 
 package gomplate
 
 import (
+	"context"
 	"testing"
 
+	"github.com/hairyhenderson/gomplate/v3/internal/config"
 	"github.com/spf13/afero"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestWalkDir(t *testing.T) {
+	ctx := context.Background()
 	origfs := fs
 	defer func() { fs = origfs }()
 	fs = afero.NewMemMapFs()
 
-	_, err := walkDir(`C:\indir`, simpleNamer(`C:\outdir`), nil, 0, false)
+	cfg := &config.Config{}
+
+	_, err := walkDir(ctx, cfg, `C:\indir`, simpleNamer(`C:\outdir`), nil, 0, false)
 	assert.Error(t, err)
 
 	_ = fs.MkdirAll(`C:\indir\one`, 0777)
@@ -25,20 +29,25 @@ func TestWalkDir(t *testing.T) {
 	afero.WriteFile(fs, `C:\indir\one\bar`, []byte("bar"), 0644)
 	afero.WriteFile(fs, `C:\indir\two\baz`, []byte("baz"), 0644)
 
-	templates, err := walkDir(`C:\indir`, simpleNamer(`C:\outdir`), []string{`*\two`}, 0, false)
+	templates, err := walkDir(ctx, cfg, `C:\indir`, simpleNamer(`C:\outdir`), []string{`*\two`}, 0, false)
 
 	assert.NoError(t, err)
 	expected := []*tplate{
 		{
-			name:       `C:\indir\one\bar`,
-			targetPath: `C:\outdir\one\bar`,
-			mode:       0644,
+			name:     `C:\indir\one\bar`,
+			contents: "bar",
+			mode:     0644,
 		},
 		{
-			name:       `C:\indir\one\foo`,
-			targetPath: `C:\outdir\one\foo`,
-			mode:       0644,
+			name:     `C:\indir\one\foo`,
+			contents: "foo",
+			mode:     0644,
 		},
 	}
-	assert.EqualValues(t, expected, templates)
+	assert.Len(t, templates, 2)
+	for i, tmpl := range templates {
+		assert.Equal(t, expected[i].name, tmpl.name)
+		assert.Equal(t, expected[i].contents, tmpl.contents)
+		assert.Equal(t, expected[i].mode, tmpl.mode)
+	}
 }