Revert "Move matchRender to test helpers file"

This reverts commit 32d91d616e99cd05b59644e292b29be415d5054f.

diff --git a/hugolib/helpers_for_test.go b/hugolib/helpers_for_test.go
index f7b1dc5fac022d3415ccaceb7f09698dd60b51b9..7c41376a545516bb8b76480c54f608728c0808b4 100644 (file)
--- a/hugolib/helpers_for_test.go
+++ b/hugolib/helpers_for_test.go
@@ -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)
-       }
-}

diff --git a/hugolib/site_test.go b/hugolib/site_test.go
index e4f9fca0484af45c6cc6ee3e473673b51b9d3c33..5b1bb0df240d98110eb4d9086e635c84e8fa31be 100644 (file)
--- a/hugolib/site_test.go
+++ b/hugolib/site_test.go
@@ -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