ref: 67524c993623871626f0f22e6a2ac705a816a959
parent: 952a3194962dd91f87e5bd227a1591b00c39ff05
author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
date: Thu Aug 15 08:11:49 EDT 2019
Fix mainSections logic Fixes #6217
--- a/hugolib/pagecollections.go
+++ b/hugolib/pagecollections.go
@@ -441,7 +441,7 @@
if parentBucket != nil {- if !mainSectionsFound && strings.Count(s, "/") == 1 {+ if !mainSectionsFound && strings.Count(s, "/") == 1 && bucket.owner.IsSection() {// Root section
rootBuckets = append(rootBuckets, bucket)
}
--- a/hugolib/site_test.go
+++ b/hugolib/site_test.go
@@ -20,6 +20,8 @@
"strings"
"testing"
+ "github.com/spf13/viper"
+
"github.com/markbates/inflect"
"github.com/gohugoio/hugo/helpers"
@@ -362,6 +364,61 @@
th := newTestHelper(s.Cfg, s.Fs, t)
th.assertFileNotExist(filepath.Join("public", "index.html"))+}
+
+func TestMainSections(t *testing.T) {+ c := qt.New(t)
+ for _, paramSet := range []bool{false, true} {+ c.Run(fmt.Sprintf("param-%t", paramSet), func(c *qt.C) {+ v := viper.New()
+ if paramSet {+ v.Set("params", map[string]interface{}{+ "mainSections": []string{"a1", "a2"},+ })
+ }
+
+ b := newTestSitesBuilder(c).WithViper(v)
+
+ for i := 0; i < 20; i++ {+ b.WithContent(fmt.Sprintf("page%d.md", i), `---+title: "Page"
+---
+`)
+ }
+
+ for i := 0; i < 5; i++ {+ b.WithContent(fmt.Sprintf("blog/page%d.md", i), `---+title: "Page"
+tags: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j"]
+---
+`)
+ }
+
+ for i := 0; i < 3; i++ {+ b.WithContent(fmt.Sprintf("docs/page%d.md", i), `---+title: "Page"
+---
+`)
+ }
+
+ b.WithTemplates("index.html", `+mainSections: {{ .Site.Params.mainSections }}+
+{{ range (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}+Main section page: {{ .RelPermalink }}+{{ end }}+`)
+
+ b.Build(BuildCfg{})+
+ if paramSet {+ b.AssertFileContent("public/index.html", "mainSections: [a1 a2]")+ } else {+ b.AssertFileContent("public/index.html", "mainSections: [blog]", "Main section page: /blog/page3/")+ }
+
+ })
+ }
}
// Issue #1176