Merge pull request #1594 from tw4452852/templateFuncsTest

template: add test for custom function

Merge pull request #1594 from tw4452852/templateFuncsTest
template: add test for custom function
729e4f02 · Matt Holt · GitHub · f28a159b · 790c842f · 729e4f02
Commit 729e4f02 authored Apr 18, 2017 by Matt Holt Committed by GitHub Apr 18, 2017
4 changed files
--- a/caddyhttp/httpserver/context.go
+++ b/caddyhttp/httpserver/context.go
@@ -264,8 +264,7 @@ func ContextInclude(filename string, ctx interface{}, fs http.FileSystem) (strin
 		return "", err
 	}
-	tpl := template.New(filename).Funcs(TemplateFuncs)
+	tpl, err := template.New(filename).Funcs(TemplateFuncs).Parse(string(body))
-	tpl, err = tpl.Parse(string(body))
 	if err != nil {
 		return "", err
 	}

--- a/caddyhttp/httpserver/context_test.go
+++ b/caddyhttp/httpserver/context_test.go
@@ -72,8 +72,16 @@ func TestInclude(t *testing.T) {
 			shouldErr:            true,
 			expectedErrorContent: `type httpserver.Context`,
 		},
+		// Test 4 - all good, with custom function
+		{
+			fileContent:          `hello {{ caddy }}`,
+			expectedContent:      "hello caddy",
+			shouldErr:            false,
+			expectedErrorContent: "",
+		},
 	}
+	TemplateFuncs["caddy"] = func() string { return "caddy" }
 	for i, test := range tests {
 		testPrefix := getTestPrefix(i)

--- a/caddyhttp/templates/templates_test.go
+++ b/caddyhttp/templates/templates_test.go
@@ -121,6 +121,8 @@ func TestTemplates(t *testing.T) {
 	rec = httptest.NewRecorder()
+	// register custom function which is used in template
+	httpserver.TemplateFuncs["root"] = func() string { return "root" }
 	tmplroot.ServeHTTP(rec, req)
 	if rec.Code != http.StatusOK {

--- a/caddyhttp/templates/testdata/root.html
+++ b/caddyhttp/templates/testdata/root.html
-<!DOCTYPE html><html><head><title>root</title></head><body>{{.Include "header.html"}}</body></html>
+<!DOCTYPE html><html><head><title>{{ root }}</title></head><body>{{.Include "header.html"}}</body></html>