Updating shortcode imports & site test to work with new buffer pool functions
authorspf13 <steve.francia@gmail.com>
Sat, 31 Jan 2015 06:06:04 +0000 (01:06 -0500)
committerspf13 <steve.francia@gmail.com>
Sat, 31 Jan 2015 06:24:52 +0000 (01:24 -0500)
hugolib/shortcode.go
hugolib/site_test.go

index 1e9fdd87734d25da927223120acb105e445e1f2a..0bdfcd5a5a7f6dbb31abd3ec89b28afc05094d68 100644 (file)
@@ -14,7 +14,6 @@
 package hugolib
 
 import (
-       "bytes"
        "fmt"
        "html/template"
        "reflect"
index 798bc8c60474e65b874793021a1adf30cf2f4bb5..0ab543ef1e1961c317fb7a5a1b5b16ed8ed08e36 100644 (file)
@@ -178,19 +178,16 @@ func TestRenderThingOrDefault(t *testing.T) {
                }
 
                var err2 error
-               var b io.Reader
+
                if test.missing {
-                       b, err2 = s.renderPage("name", p, "missing", templateName)
+                       err2 = s.renderAndWritePage("name", "out", p, "missing", templateName)
                } else {
-                       b, err2 = s.renderPage("name", p, templateName, "missing_default")
+                       err2 = s.renderAndWritePage("name", "out", p, templateName, "missing_default")
                }
 
                if err2 != nil {
                        t.Errorf("Unable to render html: %s", err)
                }
-               if err2 := s.WriteDestPage("out", b); err2 != nil {
-                       t.Errorf("Unable to write html: %s", err)
-               }
 
                file, err := hugofs.DestinationFS.Open(filepath.FromSlash("out/index.html"))
                if err != nil {