Merge pull request #1410 from hairyhenderson/read-nested-templates-from-fsys

Harmonize nested template and datasource config (map config, and URL support)

1 files changed, 0 insertions, 64 deletions

diff --git a/gomplate_test.go b/gomplate_test.go
index 89f36831..0d621ab7 100644
--- a/gomplate_test.go
+++ b/gomplate_test.go
@@ -8,8 +8,6 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/spf13/afero"
-
 	"text/template"
 
 	"github.com/hairyhenderson/gomplate/v3/aws"
@@ -166,68 +164,6 @@ func TestRunTemplates(t *testing.T) {
 	assert.Equal(t, 0, Metrics.Errors)
 }
 
-func TestParseTemplateArg(t *testing.T) {
-	fs = afero.NewMemMapFs()
-	afero.WriteFile(fs, "foo.t", []byte("hi"), 0600)
-	_ = fs.MkdirAll("dir", 0755)
-	afero.WriteFile(fs, "dir/foo.t", []byte("hi"), 0600)
-	afero.WriteFile(fs, "dir/bar.t", []byte("hi"), 0600)
-
-	err := parseTemplateArg("bogus.t", templateAliases{})
-	assert.Error(t, err)
-
-	testdata := []struct {
-		expected map[string]string
-		arg      string
-	}{
-		{map[string]string{"foo.t": "foo.t"}, "foo.t"},
-		{map[string]string{"foo": "foo.t"}, "foo=foo.t"},
-		{map[string]string{"dir/foo.t": "dir/foo.t"}, "dir/foo.t"},
-		{map[string]string{"foo": "dir/foo.t"}, "foo=dir/foo.t"},
-		{map[string]string{"dir/foo.t": "dir/foo.t", "dir/bar.t": "dir/bar.t"}, "dir/"},
-		{map[string]string{"t/foo.t": "dir/foo.t", "t/bar.t": "dir/bar.t"}, "t=dir/"},
-	}
-
-	for _, d := range testdata {
-		nested := templateAliases{}
-		err := parseTemplateArg(d.arg, nested)
-		assert.NoError(t, err, d.arg)
-		assert.Equal(t, templateAliases(d.expected), nested, d.arg)
-	}
-}
-
-func TestParseTemplateArgs(t *testing.T) {
-	fs = afero.NewMemMapFs()
-	afero.WriteFile(fs, "foo.t", []byte("hi"), 0600)
-	_ = fs.MkdirAll("dir", 0755)
-	afero.WriteFile(fs, "dir/foo.t", []byte("hi"), 0600)
-	afero.WriteFile(fs, "dir/bar.t", []byte("hi"), 0600)
-
-	args := []string{"foo.t",
-		"foo=foo.t",
-		"bar=dir/foo.t",
-		"dir/",
-		"t=dir/",
-	}
-
-	expected := map[string]string{
-		"foo.t":     "foo.t",
-		"foo":       "foo.t",
-		"bar":       "dir/foo.t",
-		"dir/foo.t": "dir/foo.t",
-		"dir/bar.t": "dir/bar.t",
-		"t/foo.t":   "dir/foo.t",
-		"t/bar.t":   "dir/bar.t",
-	}
-
-	nested, err := parseTemplateArgs(args)
-	assert.NoError(t, err)
-	assert.Equal(t, templateAliases(expected), nested)
-
-	_, err = parseTemplateArgs([]string{"bogus.t"})
-	assert.Error(t, err)
-}
-
 func TestSimpleNamer(t *testing.T) {
 	n := simpleNamer("out/")
 	out, err := n(context.Background(), "file")