mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-17 21:01:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move writing next to rendering

Browse Source 
All render(Thing) calls have a WritePublic call directly after it.  This
refactor creates one function that makes the specific call sequence.
This commit is contained in:
Noah Campbell
2013-10-01 19:58:15 -07:00
parent 2176d2c197
commit 19cb6c7819
2 changed files with 38 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
hugolib/site_test.go
View File

@@ -114,20 +114,28 @@ func TestrenderThing(t *testing.T) {
}
}
func TestrenderThingOrDefault(t *testing.T) {
func HTML(in string) string {
return fmt.Sprintf("<html><head></head><body>%s</body></html>", in)
}
func TestRenderThingOrDefault(t *testing.T) {
tests := []struct {
content string
missing bool
template string
expected string
}{
{PAGE_SIMPLE_TITLE, true, TEMPLATE_TITLE, "simple template"},
{PAGE_SIMPLE_TITLE, true, TEMPLATE_FUNC, "simple-template"},
{PAGE_SIMPLE_TITLE, false, TEMPLATE_TITLE, "simple template"},
{PAGE_SIMPLE_TITLE, false, TEMPLATE_FUNC, "simple-template"},
{PAGE_SIMPLE_TITLE, true, TEMPLATE_TITLE, HTML("simple template")},
{PAGE_SIMPLE_TITLE, true, TEMPLATE_FUNC, HTML("simple-template")},
{PAGE_SIMPLE_TITLE, false, TEMPLATE_TITLE, HTML("simple template")},
{PAGE_SIMPLE_TITLE, false, TEMPLATE_FUNC, HTML("simple-template")},
}
s := new(Site)
files := make(map[string][]byte)
target := &target.InMemoryTarget{Files: files}
s := &Site{
Target: target,
}
s.prepTemplates()
for i, test := range tests {
@@ -141,20 +149,19 @@ func TestrenderThingOrDefault(t *testing.T) {
t.Fatalf("Unable to add template")
}
var html *bytes.Buffer
var err2 error
if test.missing {
html, err2 = s.renderThingOrDefault(p, "missing", templateName)
err2 = s.render(p, "missing", templateName, "out")
} else {
html, err2 = s.renderThingOrDefault(p, templateName, "missing_default")
err2 = s.render(p, templateName, "missing_default", "out")
}
if err2 != nil {
t.Errorf("Unable to render html: %s", err)
}
if string(html.Bytes()) != test.expected {
t.Errorf("Content does not match. Expected '%s', got '%s'", test.expected, html)
if string(files["out"]) != test.expected {
t.Errorf("Content does not match. Expected '%s', got '%s'", test.expected, files["out"])
}
}
}