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

Use io.Pipe for chaning render tasks.

Browse Source 
Also clean up logic for finding layouts.
This commit is contained in:
Noah Campbell
2013-10-02 09:34:41 -04:00
parent 689cda1740
commit 54a2790fce
2 changed files with 55 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
hugolib/site_test.go
View File

@@ -2,6 +2,7 @@ package hugolib
import (
"bytes"
"io"
"fmt"
"github.com/spf13/hugo/source"
"github.com/spf13/hugo/target"
@@ -46,11 +47,11 @@ func pageMust(p *Page, err error) *Page {
return p
}
func TestDegeneraterenderThingMissingTemplate(t *testing.T) {
func TestDegenerateRenderThingMissingTemplate(t *testing.T) {
p, _ := ReadFrom(strings.NewReader(PAGE_SIMPLE_TITLE), "content/a/file.md")
s := new(Site)
s.prepTemplates()
_, err := s.renderThing(p, "foobar")
err := s.renderThing(p, "foobar", nil)
if err == nil {
t.Errorf("Expected err to be returned when missing the template.")
}
@@ -65,8 +66,19 @@ func TestAddInvalidTemplate(t *testing.T) {
}
}
type nopCloser struct {
io.Writer
}
func (nopCloser) Close() error { return nil }
func NopCloser(w io.Writer) io.WriteCloser {
return nopCloser{w}
}
func matchRender(t *testing.T, s *Site, p *Page, tmplName string, expected string) {
content, err := s.renderThing(p, tmplName)
content := new(bytes.Buffer)
err := s.renderThing(p, tmplName, NopCloser(content))
if err != nil {
t.Fatalf("Unable to render template.")
}
@@ -103,8 +115,9 @@ func TestrenderThing(t *testing.T) {
}
p.Content = template.HTML(p.Content)
html, err2 := s.renderThing(p, templateName)
if err2 != nil {
html := new(bytes.Buffer)
err = s.renderThing(p, templateName, NopCloser(html))
if err != nil {
t.Errorf("Unable to render html: %s", err)
}
@@ -151,9 +164,9 @@ func TestRenderThingOrDefault(t *testing.T) {
var err2 error
if test.missing {
err2 = s.render(p, "missing", templateName, "out")
err2 = s.render(p, "out", "missing", templateName)
} else {
err2 = s.render(p, templateName, "missing_default", "out")
err2 = s.render(p, "out", templateName, "missing_default")
}
if err2 != nil {