diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2016-08-01 23:04:44 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2016-09-06 18:32:16 +0300 |
| commit | ed0985404db4630d1b9d3ad0b7e41fb186ae0112 (patch) | |
| tree | 86d509e1a8648924d460329c67e68223b7a9b644 /hugolib/site_test.go | |
| parent | 708bc78770a0b0361908f6404f57264c53252a95 (diff) | |
Render the shortcodes as late as possible
This is needed to make shortcode users happy with the new multilanguage support,
but it will also solve many other related posts about "stuff not available in the shortcode".
We will have to revisit this re the handler chain at some point, but that will be easier
now as the integration test story has improved so much.
As part of this commit, the site-building tests in page_test.go is refreshed, they now
tests for all the rendering engines (when available), and all of them now uses the
same code-path as used in production.
Fixes #1229
Fixes #2323
Fixes ##1076
Diffstat (limited to 'hugolib/site_test.go')
| -rw-r--r-- | hugolib/site_test.go | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/hugolib/site_test.go b/hugolib/site_test.go index b9e2d346b..f98bc6a7d 100644 --- a/hugolib/site_test.go +++ b/hugolib/site_test.go @@ -30,6 +30,7 @@ import ( "github.com/spf13/hugo/target" "github.com/spf13/viper" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) const ( @@ -84,10 +85,16 @@ func pageMust(p *Page, err error) *Page { } func TestDegenerateRenderThingMissingTemplate(t *testing.T) { - p, _ := NewPageFrom(strings.NewReader(pageSimpleTitle), "content/a/file.md") - p.Convert() - s := new(Site) - s.prepTemplates(nil) + s := newSiteFromSources("content/a/file.md", pageSimpleTitle) + + if err := buildSiteSkipRender(s); err != nil { + t.Fatalf("Failed to build site: %s", err) + } + + require.Len(t, s.Pages, 1) + + p := s.Pages[0] + err := s.renderThing(p, "foobar", nil) if err == nil { t.Errorf("Expected err to be returned when missing the template.") |