Revert "Move matchRender to test helpers file"

This reverts commit 32d91d616e.
This commit is contained in:
Bjørn Erik Pedersen 2015-06-21 15:01:02 +02:00
parent d770fa59a5
commit f25ce7fefa
2 changed files with 12 additions and 13 deletions

View file

@ -1,7 +1,6 @@
package hugolib
import (
"bytes"
"testing"
"github.com/spf13/afero"
@ -79,15 +78,3 @@ func pageMust(p *Page, err error) *Page {
}
return p
}
func matchRender(t *testing.T, s *Site, p *Page, tmplName string, expected string) {
content := new(bytes.Buffer)
err := s.renderThing(p, tmplName, NopCloser(content))
if err != nil {
t.Fatalf("Unable to render template.")
}
if string(content.Bytes()) != expected {
t.Fatalf("Content did not match expected: %s. got: %s", expected, content)
}
}

View file

@ -79,6 +79,18 @@ func NopCloser(w io.Writer) io.WriteCloser {
return nopCloser{w}
}
func matchRender(t *testing.T, s *Site, p *Page, tmplName string, expected string) {
content := new(bytes.Buffer)
err := s.renderThing(p, tmplName, NopCloser(content))
if err != nil {
t.Fatalf("Unable to render template.")
}
if string(content.Bytes()) != expected {
t.Fatalf("Content did not match expected: %s. got: %s", expected, content)
}
}
func TestRenderThing(t *testing.T) {
tests := []struct {
content string