pagr

commit 8dd407a404489cf325037850454630c217dfae95
parent f3df74a888a9174577a776c9b471b081e842576e
Author: gearsix <gearsix@tuta.io>
Date:   Mon, 27 Sep 2021 16:24:04 +0100

review template_test.go; minor fix to .ignore catches

Diffstat:
M
template.go
 | 
2
+-
M
template_test.go
 | 
6
+++++-

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/template.go b/template.go
@@ -41,7 +41,7 @@ func LoadTemplateDir(dir string) ([]suti.Template, error) {
 	} else {
 		err = nil
 		for _, t := range tpaths {
-			if filepath.Ext(t) == ".ignore" {
+			if strings.Contains(t, ".ignore") {
 				continue
 			}
 			paths[t] = make([]string, 0)
diff --git a/template_test.go b/template_test.go
@@ -21,7 +21,7 @@ func TestLoadTemplateDir(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if len(tmpls) != len(templates) * 2 { // *2 = partial
+	if len(tmpls) != len(templates) * 2 { // * 2 for partials
 		t.Fatalf("number of returned templates is %d (should be %d)",
 			len(tmpls), len(templates))
 	}
@@ -42,10 +42,14 @@ func createProjectTemplates(dir string) error {
 
 	for ext, data := range templates {
 		writef(fmt.Sprintf("%s/%s.%s", dir, ext, ext), data)
+		writef(fmt.Sprintf("%s/%s.ignore.%s", dir, ext, ext), data)
+		writef(fmt.Sprintf("%s/%s.%s.ignore", dir, ext, ext), data)
 
 		pdir := filepath.Join(dir, ext)
 		err = os.Mkdir(pdir, 0755)
 		writef(fmt.Sprintf("%s/partial.%s", pdir, ext), data)
+		writef(fmt.Sprintf("%s/partial.ignore.%s", pdir, ext), data)
+		writef(fmt.Sprintf("%s/partial.%s.ignore", pdir, ext), data)
 
 		if err != nil {
 			break