summaryrefslogtreecommitdiffstats
path: root/hugolib/pagecollections_test.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2019-09-10 11:26:34 +0200
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2020-02-18 09:49:42 +0100
commiteada236f87d9669885da1ff647672bb3dc6b4954 (patch)
treea0303f067b2cbe06c55637013dbd7702a551c64f /hugolib/pagecollections_test.go
parente5329f13c02b87f0c30f8837759c810cd90ff8da (diff)
Introduce a tree map for all content
This commit introduces a new data structure to store pages and their resources. This data structure is backed by radix trees. This simplies tree operations, makes all pages a bundle, and paves the way for #6310. It also solves a set of annoying issues (see list below). Not a motivation behind this, but this commit also makes Hugo in general a little bit faster and more memory effective (see benchmarks). Especially for partial rebuilds on content edits, but also when taxonomies is in use. ``` name old time/op new time/op delta SiteNew/Bundle_with_image/Edit-16 1.32ms ± 8% 1.00ms ± 9% -24.42% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file/Edit-16 1.28ms ± 0% 0.94ms ± 0% -26.26% (p=0.029 n=4+4) SiteNew/Tags_and_categories/Edit-16 33.9ms ± 2% 21.8ms ± 1% -35.67% (p=0.029 n=4+4) SiteNew/Canonify_URLs/Edit-16 40.6ms ± 1% 37.7ms ± 3% -7.20% (p=0.029 n=4+4) SiteNew/Deep_content_tree/Edit-16 56.7ms ± 0% 51.7ms ± 1% -8.82% (p=0.029 n=4+4) SiteNew/Many_HTML_templates/Edit-16 19.9ms ± 2% 18.3ms ± 3% -7.64% (p=0.029 n=4+4) SiteNew/Page_collections/Edit-16 37.9ms ± 4% 34.0ms ± 2% -10.28% (p=0.029 n=4+4) SiteNew/Bundle_with_image-16 10.7ms ± 0% 10.6ms ± 0% -1.15% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file-16 10.8ms ± 0% 10.7ms ± 0% -1.05% (p=0.029 n=4+4) SiteNew/Tags_and_categories-16 43.2ms ± 1% 39.6ms ± 1% -8.35% (p=0.029 n=4+4) SiteNew/Canonify_URLs-16 47.6ms ± 1% 47.3ms ± 0% ~ (p=0.057 n=4+4) SiteNew/Deep_content_tree-16 73.0ms ± 1% 74.2ms ± 1% ~ (p=0.114 n=4+4) SiteNew/Many_HTML_templates-16 37.9ms ± 0% 38.1ms ± 1% ~ (p=0.114 n=4+4) SiteNew/Page_collections-16 53.6ms ± 1% 54.7ms ± 1% +2.09% (p=0.029 n=4+4) name old alloc/op new alloc/op delta SiteNew/Bundle_with_image/Edit-16 486kB ± 0% 430kB ± 0% -11.47% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file/Edit-16 265kB ± 0% 209kB ± 0% -21.06% (p=0.029 n=4+4) SiteNew/Tags_and_categories/Edit-16 13.6MB ± 0% 8.8MB ± 0% -34.93% (p=0.029 n=4+4) SiteNew/Canonify_URLs/Edit-16 66.5MB ± 0% 63.9MB ± 0% -3.95% (p=0.029 n=4+4) SiteNew/Deep_content_tree/Edit-16 28.8MB ± 0% 25.8MB ± 0% -10.55% (p=0.029 n=4+4) SiteNew/Many_HTML_templates/Edit-16 6.16MB ± 0% 5.56MB ± 0% -9.86% (p=0.029 n=4+4) SiteNew/Page_collections/Edit-16 16.9MB ± 0% 16.0MB ± 0% -5.19% (p=0.029 n=4+4) SiteNew/Bundle_with_image-16 2.28MB ± 0% 2.29MB ± 0% +0.35% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file-16 2.07MB ± 0% 2.07MB ± 0% ~ (p=0.114 n=4+4) SiteNew/Tags_and_categories-16 14.3MB ± 0% 13.2MB ± 0% -7.30% (p=0.029 n=4+4) SiteNew/Canonify_URLs-16 69.1MB ± 0% 69.0MB ± 0% ~ (p=0.343 n=4+4) SiteNew/Deep_content_tree-16 31.3MB ± 0% 31.8MB ± 0% +1.49% (p=0.029 n=4+4) SiteNew/Many_HTML_templates-16 10.8MB ± 0% 10.9MB ± 0% +1.11% (p=0.029 n=4+4) SiteNew/Page_collections-16 21.4MB ± 0% 21.6MB ± 0% +1.15% (p=0.029 n=4+4) name old allocs/op new allocs/op delta SiteNew/Bundle_with_image/Edit-16 4.74k ± 0% 3.86k ± 0% -18.57% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file/Edit-16 4.73k ± 0% 3.85k ± 0% -18.58% (p=0.029 n=4+4) SiteNew/Tags_and_categories/Edit-16 301k ± 0% 198k ± 0% -34.14% (p=0.029 n=4+4) SiteNew/Canonify_URLs/Edit-16 389k ± 0% 373k ± 0% -4.07% (p=0.029 n=4+4) SiteNew/Deep_content_tree/Edit-16 338k ± 0% 262k ± 0% -22.63% (p=0.029 n=4+4) SiteNew/Many_HTML_templates/Edit-16 102k ± 0% 88k ± 0% -13.81% (p=0.029 n=4+4) SiteNew/Page_collections/Edit-16 176k ± 0% 152k ± 0% -13.32% (p=0.029 n=4+4) SiteNew/Bundle_with_image-16 26.8k ± 0% 26.8k ± 0% +0.05% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file-16 26.8k ± 0% 26.8k ± 0% +0.05% (p=0.029 n=4+4) SiteNew/Tags_and_categories-16 273k ± 0% 245k ± 0% -10.36% (p=0.029 n=4+4) SiteNew/Canonify_URLs-16 396k ± 0% 398k ± 0% +0.39% (p=0.029 n=4+4) SiteNew/Deep_content_tree-16 317k ± 0% 325k ± 0% +2.53% (p=0.029 n=4+4) SiteNew/Many_HTML_templates-16 146k ± 0% 147k ± 0% +0.98% (p=0.029 n=4+4) SiteNew/Page_collections-16 210k ± 0% 215k ± 0% +2.44% (p=0.029 n=4+4) ``` Fixes #6312 Fixes #6087 Fixes #6738 Fixes #6412 Fixes #6743 Fixes #6875 Fixes #6034 Fixes #6902 Fixes #6173 Fixes #6590
Diffstat (limited to 'hugolib/pagecollections_test.go')
-rw-r--r--hugolib/pagecollections_test.go268
1 files changed, 179 insertions, 89 deletions
diff --git a/hugolib/pagecollections_test.go b/hugolib/pagecollections_test.go
index 0f7520e1b..690a315a8 100644
--- a/hugolib/pagecollections_test.go
+++ b/hugolib/pagecollections_test.go
@@ -70,43 +70,91 @@ func BenchmarkGetPage(b *testing.B) {
}
}
-func BenchmarkGetPageRegular(b *testing.B) {
+func createGetPageRegularBenchmarkSite(t testing.TB) *Site {
+
var (
- c = qt.New(b)
+ c = qt.New(t)
cfg, fs = newTestCfg()
- r = rand.New(rand.NewSource(time.Now().UnixNano()))
)
+ pc := func(title string) string {
+ return fmt.Sprintf(pageCollectionsPageTemplate, title)
+ }
+
for i := 0; i < 10; i++ {
for j := 0; j < 100; j++ {
- content := fmt.Sprintf(pageCollectionsPageTemplate, fmt.Sprintf("Title%d_%d", i, j))
- writeSource(b, fs, filepath.Join("content", fmt.Sprintf("sect%d", i), fmt.Sprintf("page%d.md", j)), content)
+ content := pc(fmt.Sprintf("Title%d_%d", i, j))
+ writeSource(c, fs, filepath.Join("content", fmt.Sprintf("sect%d", i), fmt.Sprintf("page%d.md", j)), content)
}
}
- s := buildSingleSite(b, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{SkipRender: true})
+ return buildSingleSite(c, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{SkipRender: true})
- pagePaths := make([]string, b.N)
+}
- for i := 0; i < b.N; i++ {
- pagePaths[i] = path.Join(fmt.Sprintf("sect%d", r.Intn(10)), fmt.Sprintf("page%d.md", r.Intn(100)))
- }
+func TestBenchmarkGetPageRegular(t *testing.T) {
+ c := qt.New(t)
+ s := createGetPageRegularBenchmarkSite(t)
- b.ResetTimer()
- for i := 0; i < b.N; i++ {
- page, _ := s.getPageNew(nil, pagePaths[i])
- c.Assert(page, qt.Not(qt.IsNil))
+ for i := 0; i < 10; i++ {
+ pp := path.Join("/", fmt.Sprintf("sect%d", i), fmt.Sprintf("page%d.md", i))
+ page, _ := s.getPageNew(nil, pp)
+ c.Assert(page, qt.Not(qt.IsNil), qt.Commentf(pp))
}
}
-type testCase struct {
+func BenchmarkGetPageRegular(b *testing.B) {
+ r := rand.New(rand.NewSource(time.Now().UnixNano()))
+
+ b.Run("From root", func(b *testing.B) {
+ s := createGetPageRegularBenchmarkSite(b)
+ c := qt.New(b)
+
+ pagePaths := make([]string, b.N)
+
+ for i := 0; i < b.N; i++ {
+ pagePaths[i] = path.Join(fmt.Sprintf("/sect%d", r.Intn(10)), fmt.Sprintf("page%d.md", r.Intn(100)))
+ }
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ page, _ := s.getPageNew(nil, pagePaths[i])
+ c.Assert(page, qt.Not(qt.IsNil))
+ }
+ })
+
+ b.Run("Page relative", func(b *testing.B) {
+ s := createGetPageRegularBenchmarkSite(b)
+ c := qt.New(b)
+ allPages := s.RegularPages()
+
+ pagePaths := make([]string, b.N)
+ pages := make([]page.Page, b.N)
+
+ for i := 0; i < b.N; i++ {
+ pagePaths[i] = fmt.Sprintf("page%d.md", r.Intn(100))
+ pages[i] = allPages[r.Intn(len(allPages)/3)]
+ }
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ page, _ := s.getPageNew(pages[i], pagePaths[i])
+ c.Assert(page, qt.Not(qt.IsNil))
+ }
+ })
+
+}
+
+type getPageTest struct {
+ name string
kind string
context page.Page
- path []string
+ pathVariants []string
expectedTitle string
}
-func (t *testCase) check(p page.Page, err error, errorMsg string, c *qt.C) {
+func (t *getPageTest) check(p page.Page, err error, errorMsg string, c *qt.C) {
+ c.Helper()
errorComment := qt.Commentf(errorMsg)
switch t.kind {
case "Ambiguous":
@@ -130,117 +178,159 @@ func TestGetPage(t *testing.T) {
c = qt.New(t)
)
+ pc := func(title string) string {
+ return fmt.Sprintf(pageCollectionsPageTemplate, title)
+ }
+
for i := 0; i < 10; i++ {
for j := 0; j < 10; j++ {
- content := fmt.Sprintf(pageCollectionsPageTemplate, fmt.Sprintf("Title%d_%d", i, j))
+ content := pc(fmt.Sprintf("Title%d_%d", i, j))
writeSource(t, fs, filepath.Join("content", fmt.Sprintf("sect%d", i), fmt.Sprintf("page%d.md", j)), content)
}
}
- content := fmt.Sprintf(pageCollectionsPageTemplate, "home page")
+ content := pc("home page")
writeSource(t, fs, filepath.Join("content", "_index.md"), content)
- content = fmt.Sprintf(pageCollectionsPageTemplate, "about page")
+ content = pc("about page")
writeSource(t, fs, filepath.Join("content", "about.md"), content)
- content = fmt.Sprintf(pageCollectionsPageTemplate, "section 3")
+ content = pc("section 3")
writeSource(t, fs, filepath.Join("content", "sect3", "_index.md"), content)
- content = fmt.Sprintf(pageCollectionsPageTemplate, "UniqueBase")
- writeSource(t, fs, filepath.Join("content", "sect3", "unique.md"), content)
+ writeSource(t, fs, filepath.Join("content", "sect3", "unique.md"), pc("UniqueBase"))
+ writeSource(t, fs, filepath.Join("content", "sect3", "Unique2.md"), pc("UniqueBase2"))
- content = fmt.Sprintf(pageCollectionsPageTemplate, "another sect7")
+ content = pc("another sect7")
writeSource(t, fs, filepath.Join("content", "sect3", "sect7", "_index.md"), content)
- content = fmt.Sprintf(pageCollectionsPageTemplate, "deep page")
+ content = pc("deep page")
writeSource(t, fs, filepath.Join("content", "sect3", "subsect", "deep.md"), content)
+ // Bundle variants
+ writeSource(t, fs, filepath.Join("content", "sect3", "b1", "index.md"), pc("b1 bundle"))
+ writeSource(t, fs, filepath.Join("content", "sect3", "index", "index.md"), pc("index bundle"))
+
s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{SkipRender: true})
sec3, err := s.getPageNew(nil, "/sect3")
c.Assert(err, qt.IsNil)
c.Assert(sec3, qt.Not(qt.IsNil))
- tests := []testCase{
+ tests := []getPageTest{
// legacy content root relative paths
- {page.KindHome, nil, []string{}, "home page"},
- {page.KindPage, nil, []string{"about.md"}, "about page"},
- {page.KindSection, nil, []string{"sect3"}, "section 3"},
- {page.KindPage, nil, []string{"sect3/page1.md"}, "Title3_1"},
- {page.KindPage, nil, []string{"sect4/page2.md"}, "Title4_2"},
- {page.KindSection, nil, []string{"sect3/sect7"}, "another sect7"},
- {page.KindPage, nil, []string{"sect3/subsect/deep.md"}, "deep page"},
- {page.KindPage, nil, []string{filepath.FromSlash("sect5/page3.md")}, "Title5_3"}, //test OS-specific path
-
- // shorthand refs (potentially ambiguous)
- {page.KindPage, nil, []string{"unique.md"}, "UniqueBase"},
- {"Ambiguous", nil, []string{"page1.md"}, ""},
+ {"Root relative, no slash, home", page.KindHome, nil, []string{""}, "home page"},
+ {"Root relative, no slash, root page", page.KindPage, nil, []string{"about.md", "ABOUT.md"}, "about page"},
+ {"Root relative, no slash, section", page.KindSection, nil, []string{"sect3"}, "section 3"},
+ {"Root relative, no slash, section page", page.KindPage, nil, []string{"sect3/page1.md"}, "Title3_1"},
+ {"Root relative, no slash, sub setion", page.KindSection, nil, []string{"sect3/sect7"}, "another sect7"},
+ {"Root relative, no slash, nested page", page.KindPage, nil, []string{"sect3/subsect/deep.md"}, "deep page"},
+ {"Root relative, no slash, OS slashes", page.KindPage, nil, []string{filepath.FromSlash("sect5/page3.md")}, "Title5_3"},
+
+ {"Short ref, unique", page.KindPage, nil, []string{"unique.md", "unique"}, "UniqueBase"},
+ {"Short ref, unique, upper case", page.KindPage, nil, []string{"Unique2.md", "unique2.md", "unique2"}, "UniqueBase2"},
+ {"Short ref, ambiguous", "Ambiguous", nil, []string{"page1.md"}, ""},
// ISSUE: This is an ambiguous ref, but because we have to support the legacy
// content root relative paths without a leading slash, the lookup
// returns /sect7. This undermines ambiguity detection, but we have no choice.
//{"Ambiguous", nil, []string{"sect7"}, ""},
- {page.KindSection, nil, []string{"sect7"}, "Sect7s"},
-
- // absolute paths
- {page.KindHome, nil, []string{"/"}, "home page"},
- {page.KindPage, nil, []string{"/about.md"}, "about page"},
- {page.KindSection, nil, []string{"/sect3"}, "section 3"},
- {page.KindPage, nil, []string{"/sect3/page1.md"}, "Title3_1"},
- {page.KindPage, nil, []string{"/sect4/page2.md"}, "Title4_2"},
- {page.KindSection, nil, []string{"/sect3/sect7"}, "another sect7"},
- {page.KindPage, nil, []string{"/sect3/subsect/deep.md"}, "deep page"},
- {page.KindPage, nil, []string{filepath.FromSlash("/sect5/page3.md")}, "Title5_3"}, //test OS-specific path
- {page.KindPage, nil, []string{"/sect3/unique.md"}, "UniqueBase"}, //next test depends on this page existing
+ {"Section, ambigous", page.KindSection, nil, []string{"sect7"}, "Sect7s"},
+
+ {"Absolute, home", page.KindHome, nil, []string{"/", ""}, "home page"},
+ {"Absolute, page", page.KindPage, nil, []string{"/about.md", "/about"}, "about page"},
+ {"Absolute, sect", page.KindSection, nil, []string{"/sect3"}, "section 3"},
+ {"Absolute, page in subsection", page.KindPage, nil, []string{"/sect3/page1.md", "/Sect3/Page1.md"}, "Title3_1"},
+ {"Absolute, section, subsection with same name", page.KindSection, nil, []string{"/sect3/sect7"}, "another sect7"},
+ {"Absolute, page, deep", page.KindPage, nil, []string{"/sect3/subsect/deep.md"}, "deep page"},
+ {"Absolute, page, OS slashes", page.KindPage, nil, []string{filepath.FromSlash("/sect5/page3.md")}, "Title5_3"}, //test OS-specific path
+ {"Absolute, unique", page.KindPage, nil, []string{"/sect3/unique.md"}, "UniqueBase"},
+ {"Absolute, unique, case", page.KindPage, nil, []string{"/sect3/Unique2.md", "/sect3/unique2.md", "/sect3/unique2", "/sect3/Unique2"}, "UniqueBase2"},
+ //next test depends on this page existing
// {"NoPage", nil, []string{"/unique.md"}, ""}, // ISSUE #4969: this is resolving to /sect3/unique.md
- {"NoPage", nil, []string{"/missing-page.md"}, ""},
- {"NoPage", nil, []string{"/missing-section"}, ""},
+ {"Absolute, missing page", "NoPage", nil, []string{"/missing-page.md"}, ""},
+ {"Absolute, missing section", "NoPage", nil, []string{"/missing-section"}, ""},
// relative paths
- {page.KindHome, sec3, []string{".."}, "home page"},
- {page.KindHome, sec3, []string{"../"}, "home page"},
- {page.KindPage, sec3, []string{"../about.md"}, "about page"},
- {page.KindSection, sec3, []string{"."}, "section 3"},
- {page.KindSection, sec3, []string{"./"}, "section 3"},
- {page.KindPage, sec3, []string{"page1.md"}, "Title3_1"},
- {page.KindPage, sec3, []string{"./page1.md"}, "Title3_1"},
- {page.KindPage, sec3, []string{"../sect4/page2.md"}, "Title4_2"},
- {page.KindSection, sec3, []string{"sect7"}, "another sect7"},
- {page.KindSection, sec3, []string{"./sect7"}, "another sect7"},
- {page.KindPage, sec3, []string{"./subsect/deep.md"}, "deep page"},
- {page.KindPage, sec3, []string{"./subsect/../../sect7/page9.md"}, "Title7_9"},
- {page.KindPage, sec3, []string{filepath.FromSlash("../sect5/page3.md")}, "Title5_3"}, //test OS-specific path
- {page.KindPage, sec3, []string{"./unique.md"}, "UniqueBase"},
- {"NoPage", sec3, []string{"./sect2"}, ""},
+ {"Dot relative, home", page.KindHome, sec3, []string{".."}, "home page"},
+ {"Dot relative, home, slash", page.KindHome, sec3, []string{"../"}, "home page"},
+ {"Dot relative about", page.KindPage, sec3, []string{"../about.md"}, "about page"},
+ {"Dot", page.KindSection, sec3, []string{"."}, "section 3"},
+ {"Dot slash", page.KindSection, sec3, []string{"./"}, "section 3"},
+ {"Page relative, no dot", page.KindPage, sec3, []string{"page1.md"}, "Title3_1"},
+ {"Page relative, dot", page.KindPage, sec3, []string{"./page1.md"}, "Title3_1"},
+ {"Up and down another section", page.KindPage, sec3, []string{"../sect4/page2.md"}, "Title4_2"},
+ {"Rel sect7", page.KindSection, sec3, []string{"sect7"}, "another sect7"},
+ {"Rel sect7 dot", page.KindSection, sec3, []string{"./sect7"}, "another sect7"},
+ {"Dot deep", page.KindPage, sec3, []string{"./subsect/deep.md"}, "deep page"},
+ {"Dot dot inner", page.KindPage, sec3, []string{"./subsect/../../sect7/page9.md"}, "Title7_9"},
+ {"Dot OS slash", page.KindPage, sec3, []string{filepath.FromSlash("../sect5/page3.md")}, "Title5_3"}, //test OS-specific path
+ {"Dot unique", page.KindPage, sec3, []string{"./unique.md"}, "UniqueBase"},
+ {"Dot sect", "NoPage", sec3, []string{"./sect2"}, ""},
//{"NoPage", sec3, []string{"sect2"}, ""}, // ISSUE: /sect3 page relative query is resolving to /sect2
- // absolute paths ignore context
- {page.KindHome, sec3, []string{"/"}, "home page"},
- {page.KindPage, sec3, []string{"/about.md"}, "about page"},
- {page.KindPage, sec3, []string{"/sect4/page2.md"}, "Title4_2"},
- {page.KindPage, sec3, []string{"/sect3/subsect/deep.md"}, "deep page"}, //next test depends on this page existing
- {"NoPage", sec3, []string{"/subsect/deep.md"}, ""},
+ {"Abs, ignore context, home", page.KindHome, sec3, []string{"/"}, "home page"},
+ {"Abs, ignore context, about", page.KindPage, sec3, []string{"/about.md"}, "about page"},
+ {"Abs, ignore context, page in section", page.KindPage, sec3, []string{"/sect4/page2.md"}, "Title4_2"},
+ {"Abs, ignore context, page subsect deep", page.KindPage, sec3, []string{"/sect3/subsect/deep.md"}, "deep page"}, //next test depends on this page existing
+ {"Abs, ignore context, page deep", "NoPage", sec3, []string{"/subsect/deep.md"}, ""},
+
+ // Taxonomies
+ {"Taxonomy term", page.KindTaxonomyTerm, nil, []string{"categories"}, "Categories"},
+ {"Taxonomy", page.KindTaxonomy, nil, []string{"categories/hugo", "categories/Hugo"}, "Hugo"},
+
+ // Bundle variants
+ {"Bundle regular", page.KindPage, nil, []string{"sect3/b1", "sect3/b1/index.md", "sect3/b1/index.en.md"}, "b1 bundle"},
+ {"Bundle index name", page.KindPage, nil, []string{"sect3/index/index.md", "sect3/index"}, "index bundle"},
}
for _, test := range tests {
- errorMsg := fmt.Sprintf("Test case %s %v -> %s", test.context, test.path, test.expectedTitle)
+ c.Run(test.name, func(c *qt.C) {
+ errorMsg := fmt.Sprintf("Test case %v %v -> %s", test.context, test.pathVariants, test.expectedTitle)
+
+ // test legacy public Site.GetPage (which does not support page context relative queries)
+ if test.context == nil {
+ for _, ref := range test.pathVariants {
+ args := append([]string{test.kind}, ref)
+ page, err := s.Info.GetPage(args...)
+ test.check(page, err, errorMsg, c)
+ }
+ }
+
+ // test new internal Site.getPageNew
+ for _, ref := range test.pathVariants {
+ page2, err := s.getPageNew(test.context, ref)
+ test.check(page2, err, errorMsg, c)
+ }
+
+ })
+ }
- // test legacy public Site.GetPage (which does not support page context relative queries)
- if test.context == nil {
- args := append([]string{test.kind}, test.path...)
- page, err := s.Info.GetPage(args...)
- test.check(page, err, errorMsg, c)
- }
+}
- // test new internal Site.getPageNew
- var ref string
- if len(test.path) == 1 {
- ref = filepath.ToSlash(test.path[0])
- } else {
- ref = path.Join(test.path...)
- }
- page2, err := s.getPageNew(test.context, ref)
- test.check(page2, err, errorMsg, c)
+// https://github.com/gohugoio/hugo/issues/6034
+func TestGetPageRelative(t *testing.T) {
+ b := newTestSitesBuilder(t)
+ for i, section := range []string{"what", "where", "who"} {
+ isDraft := i == 2
+ b.WithContent(
+ section+"/_index.md", fmt.Sprintf("---title: %s\n---", section),
+ section+"/members.md", fmt.Sprintf("---title: members %s\ndraft: %t\n---", section, isDraft),
+ )
}
+ b.WithTemplates("_default/list.html", `
+{{ with .GetPage "members.md" }}
+ Members: {{ .Title }}
+{{ else }}
+NOT FOUND
+{{ end }}
+`)
+
+ b.Build(BuildCfg{})
+
+ b.AssertFileContent("public/what/index.html", `Members: members what`)
+ b.AssertFileContent("public/where/index.html", `Members: members where`)
+ b.AssertFileContent("public/who/index.html", `NOT FOUND`)
+
}