diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2022-09-27 11:42:25 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2022-09-27 11:42:25 +0200 |
commit | 2171e3c9a55bbc39a052f141180ffcad5a5941cb (patch) | |
tree | a53e050b2641c9da9dd8024e285846287902875f /hugolib | |
parent | cac773aeffb5626c9bb5a50de6bfec7b6370226d (diff) |
Revert "Adjust a test"
Committed by mistake.
This reverts commit cac773aeffb5626c9bb5a50de6bfec7b6370226d.
Diffstat (limited to 'hugolib')
-rw-r--r-- | hugolib/shortcode_test.go | 85 |
1 files changed, 32 insertions, 53 deletions
diff --git a/hugolib/shortcode_test.go b/hugolib/shortcode_test.go index 42b0bcd05..ec521729b 100644 --- a/hugolib/shortcode_test.go +++ b/hugolib/shortcode_test.go @@ -476,79 +476,58 @@ C-%s` func TestShortcodeParentResourcesOnRebuild(t *testing.T) { t.Parallel() - files := ` --- config.toml -- -baseURL = 'http://example.com/' --- content/b1/index.md -- ---- -title: MyPage ---- -CONTENT --- content/b1/data.txt -- -b1 data --- content/b1/p1.md -- ---- -title: MyPage ---- + b := newTestSitesBuilder(t).Running().WithSimpleConfigFile() + b.WithTemplatesAdded( + "index.html", ` +{{ $b := .Site.GetPage "b1" }} +b1 Content: {{ $b.Content }} +{{$p := $b.Resources.GetMatch "p1*" }} +Content: {{ $p.Content }} +{{ $article := .Site.GetPage "blog/article" }} +Article Content: {{ $article.Content }} +`, + "shortcodes/c.html", ` +{{ range .Page.Parent.Resources }} +* Parent resource: {{ .Name }}: {{ .RelPermalink }} +{{ end }} +`) -SHORTCODE: {{< c >}} --- content/blog/_index.md -- + pageContent := ` --- title: MyPage --- SHORTCODE: {{< c >}} --- content/blog/article.md -- ---- -title: MyPage ---- -SHORTCODE: {{< c >}} --- content/blog/data-article.txt -- -data article --- layouts/index.html -- -{{ $b := .Site.GetPage "b1" }} -b1 Content: {{ $b.Path }}|{{ $b.Content }}| -{{$p := $b.Resources.GetMatch "p1*" }} -p1: {{ $p.Path }}|{{ $p.Content }}| -{{ $article := .Site.GetPage "blog/article" }} -Article Content: {{ $article.Content }} --- layouts/shortcodes/c.html -- -{{ range $i, $e := .Page.Parent.Resources }}{{ $i }}:{{ $.Page.Parent.Path }}: Parent resource: {{ .Name }}: {{ .RelPermalink }}|{{ end }}` +` - c := qt.New(t) + b.WithContent("b1/index.md", pageContent, + "b1/logo.png", "PNG logo", + "b1/p1.md", pageContent, + "blog/_index.md", pageContent, + "blog/logo-article.png", "PNG logo", + "blog/article.md", pageContent, + ) - b := NewIntegrationTestBuilder( - IntegrationTestConfig{ - T: c, - TxtarString: files, - Running: true, - }, - ).Build() + b.Build(BuildCfg{}) assert := func(matchers ...string) { + allMatchers := append(matchers, "Parent resource: logo.png: /b1/logo.png", + "Article Content: <p>SHORTCODE: \n\n* Parent resource: logo-article.png: /blog/logo-article.png", + ) b.AssertFileContent("public/index.html", - ` -b1 Content: b1/index.md| -p1: b1/p1.md|<p>SHORTCODE: 0:b1/index.md: Parent resource: p1.md: |1:b1/index.md: Parent resource: data.txt: /b1/data.txt|</p> -Article Content: <p>SHORTCODE: 0:blog/_index.md: Parent resource: data-article.txt: /blog/data-article.txt|</p> - -`, + allMatchers..., ) - - for _, m := range matchers { - b.AssertFileContent("public/index.html", m) - } } assert() - b.EditFileReplace("content/b1/index.md", func(s string) string { return strings.ReplaceAll(s, "CONTENT", "Content Edit") }) + b.EditFiles("content/b1/index.md", pageContent+" Edit.") - b.Build() + b.Build(BuildCfg{}) - assert("Content Edit") + assert("Edit.") } func TestShortcodePreserveOrder(t *testing.T) { |