Fix broken handling of legacy taxonomyTerm in disableKinds

Fixes #11257
This commit is contained in:
Bjørn Erik Pedersen 2023-07-19 19:10:34 +02:00
parent d947db3713
commit d70b6c7d01
2 changed files with 39 additions and 3 deletions

View file

@ -241,7 +241,7 @@ func (c *Config) CompileConfig(logger loggers.Logger) error {
kind = strings.ToLower(kind) kind = strings.ToLower(kind)
if kind == "taxonomyterm" { if kind == "taxonomyterm" {
// Legacy config. // Legacy config.
kind = "term" kind = "taxonomy"
} }
disabledKinds[kind] = true disabledKinds[kind] = true
} }

View file

@ -1060,7 +1060,7 @@ func TestConfigLegacyValues(t *testing.T) {
files := ` files := `
-- hugo.toml -- -- hugo.toml --
# taxonomyTerm was renamed to term in Hugo 0.60.0. # taxonomyTerm was renamed to taxonomy in Hugo 0.60.0.
disableKinds = ["taxonomyTerm"] disableKinds = ["taxonomyTerm"]
-- layouts/index.html -- -- layouts/index.html --
@ -1081,7 +1081,7 @@ Home
`) `)
conf := b.H.Configs.Base conf := b.H.Configs.Base
b.Assert(conf.IsKindEnabled("term"), qt.Equals, false) b.Assert(conf.IsKindEnabled("taxonomy"), qt.Equals, false)
} }
// Issue #11000 // Issue #11000
@ -1534,3 +1534,39 @@ disableKinds = ["taxonomy", "term", "RSS", "sitemap", "robotsTXT", "page", "sect
}) })
} }
// Issue #11257
func TestDisableKindsTaxonomyTerm(t *testing.T) {
t.Parallel()
files := `
-- hugo.toml --
baseURL = "https://example.com"
disableKinds = ['taxonomyTerm']
[taxonomies]
category = 'categories'
-- content/p1.md --
---
title: "P1"
categories: ["c1"]
---
-- layouts/index.html --
Home.
-- layouts/_default/list.html --
List.
`
b := NewIntegrationTestBuilder(
IntegrationTestConfig{
T: t,
TxtarString: files,
},
).Build()
b.AssertDestinationExists("index.html", true)
b.AssertDestinationExists("categories/c1/index.html", true)
b.AssertDestinationExists("categories/index.html", false)
}