aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/allconfig/allconfig_integration_test.go26
-rw-r--r--hugolib/config_test.go26
-rw-r--r--hugolib/embedded_templates_test.go2
-rw-r--r--hugolib/hugo_sites_multihost_test.go4
-rw-r--r--hugolib/hugo_smoke_test.go13
-rw-r--r--hugolib/paginator_test.go11
-rw-r--r--hugolib/rebuild_test.go5
-rw-r--r--hugolib/securitypolicies_test.go12
-rw-r--r--hugolib/shortcode_test.go5
-rw-r--r--hugolib/site_output_test.go15
-rw-r--r--hugolib/site_sections_test.go2
-rw-r--r--hugolib/site_stats_test.go4
-rw-r--r--hugolib/site_url_test.go2
-rw-r--r--hugolib/taxonomy_test.go3
-rw-r--r--hugolib/template_test.go6
-rw-r--r--hugolib/testhelpers_test.go10
-rw-r--r--resources/resource_transformers/tocss/scss/scss_integration_test.go2
-rw-r--r--tpl/page/page_integration_test.go5
18 files changed, 71 insertions, 82 deletions
diff --git a/config/allconfig/allconfig_integration_test.go b/config/allconfig/allconfig_integration_test.go
index 7dc0d230e..debdff650 100644
--- a/config/allconfig/allconfig_integration_test.go
+++ b/config/allconfig/allconfig_integration_test.go
@@ -103,31 +103,7 @@ suffixes = ["html", "xhtml"]
b.Assert(contentTypes.Markdown.Suffixes(), qt.DeepEquals, []string{"md", "mdown", "markdown"})
}
-func TestPaginationConfigOld(t *testing.T) {
- files := `
--- hugo.toml --
- [languages.en]
- weight = 1
- paginatePath = "page-en"
-
- [languages.de]
- weight = 2
- paginatePath = "page-de"
- paginate = 20
-`
-
- b := hugolib.Test(t, files)
-
- confEn := b.H.Sites[0].Conf.Pagination()
- confDe := b.H.Sites[1].Conf.Pagination()
-
- b.Assert(confEn.Path, qt.Equals, "page-en")
- b.Assert(confEn.PagerSize, qt.Equals, 10)
- b.Assert(confDe.Path, qt.Equals, "page-de")
- b.Assert(confDe.PagerSize, qt.Equals, 20)
-}
-
-func TestPaginationConfigNew(t *testing.T) {
+func TestPaginationConfig(t *testing.T) {
files := `
-- hugo.toml --
[languages.en]
diff --git a/hugolib/config_test.go b/hugolib/config_test.go
index aaba534f5..c9db0d2f0 100644
--- a/hugolib/config_test.go
+++ b/hugolib/config_test.go
@@ -276,11 +276,13 @@ func TestLoadMultiConfig(t *testing.T) {
// Add a random config variable for testing.
// side = page in Norwegian.
configContentBase := `
- Paginate = 32
- PaginatePath = "side"
+ [pagination]
+ pagerSize = 32
+ path = "side"
`
configContentSub := `
- PaginatePath = "top"
+ [pagination]
+ path = "top"
`
mm := afero.NewMemMapFs()
@@ -292,8 +294,8 @@ func TestLoadMultiConfig(t *testing.T) {
c.Assert(err, qt.IsNil)
cfg := all.Base
- c.Assert(cfg.PaginatePath, qt.Equals, "top")
- c.Assert(cfg.Paginate, qt.Equals, 32)
+ c.Assert(cfg.Pagination.Path, qt.Equals, "top")
+ c.Assert(cfg.Pagination.PagerSize, qt.Equals, 32)
}
func TestLoadConfigFromThemes(t *testing.T) {
@@ -698,10 +700,6 @@ func TestHugoConfig(t *testing.T) {
filesTemplate := `
-- hugo.toml --
theme = "mytheme"
-[social]
-twitter = "bepsays"
-[author]
-name = "bep"
[params]
rootparam = "rootvalue"
-- config/_default/hugo.toml --
@@ -718,9 +716,6 @@ rootparam: {{ site.Params.rootparam }}
rootconfigparam: {{ site.Params.rootconfigparam }}
themeparam: {{ site.Params.themeparam }}
themeconfigdirparam: {{ site.Params.themeconfigdirparam }}
-social: {{ site.Social }}
-author: {{ site.Author }}
-
`
@@ -744,8 +739,6 @@ author: {{ site.Author }}
"rootconfigparam: rootconfigvalue",
"themeparam: themevalue",
"themeconfigdirparam: themeconfigdirvalue",
- "social: map[twitter:bepsays]",
- "author: map[name:bep]",
)
})
}
@@ -918,11 +911,9 @@ title: "My Swedish Section"
-- layouts/index.html --
LanguageCode: {{ eq site.LanguageCode site.Language.LanguageCode }}|{{ site.Language.LanguageCode }}|
{{ range $i, $e := (slice site .Site) }}
-{{ $i }}|AllPages: {{ len .AllPages }}|Sections: {{ if .Sections }}true{{ end }}| Author: {{ .Authors }}|BuildDrafts: {{ .BuildDrafts }}|IsMultilingual: {{ .IsMultiLingual }}|Param: {{ .Language.Params.myparam }}|Language string: {{ .Language }}|Languages: {{ .Languages }}
+{{ $i }}|AllPages: {{ len .AllPages }}|Sections: {{ if .Sections }}true{{ end }}|BuildDrafts: {{ .BuildDrafts }}|Param: {{ .Language.Params.myparam }}|Language string: {{ .Language }}|Languages: {{ .Languages }}
{{ end }}
-
-
`
b := NewIntegrationTestBuilder(
IntegrationTestConfig{
@@ -940,7 +931,6 @@ AllPages: 4|
Sections: true|
Param: enParamValue
Param: enParamValue
-IsMultilingual: true
LanguageCode: true|en-US|
`)
diff --git a/hugolib/embedded_templates_test.go b/hugolib/embedded_templates_test.go
index d9575a45f..ec59751f3 100644
--- a/hugolib/embedded_templates_test.go
+++ b/hugolib/embedded_templates_test.go
@@ -100,7 +100,7 @@ func TestEmbeddedPaginationTemplate(t *testing.T) {
test := func(variant string, expectedOutput string) {
b := newTestSitesBuilder(t)
- b.WithConfigFile("toml", `paginate = 1`)
+ b.WithConfigFile("toml", `pagination.pagerSize = 1`)
b.WithContent(
"s1/p01.md", "---\ntitle: p01\n---",
"s1/p02.md", "---\ntitle: p02\n---",
diff --git a/hugolib/hugo_sites_multihost_test.go b/hugolib/hugo_sites_multihost_test.go
index ce3944a38..39504202b 100644
--- a/hugolib/hugo_sites_multihost_test.go
+++ b/hugolib/hugo_sites_multihost_test.go
@@ -11,12 +11,14 @@ func TestMultihost(t *testing.T) {
files := `
-- hugo.toml --
-paginate = 1
defaultContentLanguage = "fr"
defaultContentLanguageInSubdir = false
staticDir = ["s1", "s2"]
enableRobotsTXT = true
+[pagination]
+pagerSize = 1
+
[permalinks]
other = "/somewhere/else/:filename"
diff --git a/hugolib/hugo_smoke_test.go b/hugolib/hugo_smoke_test.go
index a4a5b7cbd..c43ba7293 100644
--- a/hugolib/hugo_smoke_test.go
+++ b/hugolib/hugo_smoke_test.go
@@ -107,10 +107,13 @@ func TestSmoke(t *testing.T) {
baseURL = "https://example.com"
title = "Smoke Site"
rssLimit = 3
-paginate = 1
defaultContentLanguage = "en"
defaultContentLanguageInSubdir = true
enableRobotsTXT = true
+
+[pagination]
+pagerSize = 1
+
[taxonomies]
category = 'categories'
tag = 'tags'
@@ -434,10 +437,10 @@ func TestDataRace(t *testing.T) {
---
title: "The Page"
outputs: ["HTML", "JSON"]
----
+---
The content.
-
+
`
@@ -450,10 +453,10 @@ The content.
---
title: "The Home"
outputs: ["HTML", "JSON", "CSV", "RSS"]
----
+---
The content.
-
+
`)
diff --git a/hugolib/paginator_test.go b/hugolib/paginator_test.go
index fb592bed1..dcee6e38e 100644
--- a/hugolib/paginator_test.go
+++ b/hugolib/paginator_test.go
@@ -24,8 +24,10 @@ import (
func TestPaginator(t *testing.T) {
configFile := `
baseURL = "https://example.com/foo/"
-paginate = 3
-paginatepath = "thepage"
+
+[pagination]
+pagerSize = 3
+path = "thepage"
[languages.en]
weight = 1
@@ -161,10 +163,11 @@ Len Pag: {{ len $pag.Pages }}
func TestPaginatorNodePagesOnly(t *testing.T) {
files := `
-- hugo.toml --
-paginate = 1
+[pagination]
+pagerSize = 1
-- content/p1.md --
-- layouts/_default/single.html --
-Paginator: {{ .Paginator }}
+Paginator: {{ .Paginator }}
`
b, err := TestE(t, files)
b.Assert(err, qt.IsNotNil)
diff --git a/hugolib/rebuild_test.go b/hugolib/rebuild_test.go
index 0db418ee1..2219fe812 100644
--- a/hugolib/rebuild_test.go
+++ b/hugolib/rebuild_test.go
@@ -559,7 +559,8 @@ baseURL = "https://example.com"
disableKinds = ["term", "taxonomy"]
disableLiveReload = true
defaultContentLanguage = "nn"
-paginate = 20
+[pagination]
+pagerSize = 20
[security]
enableInlineShortcodes = true
[languages]
@@ -1431,7 +1432,7 @@ title: "My Sect"
---
title: "P%d"
---
-P%d Content.
+P%d Content.
`
for i := 0; i < count; i++ {
diff --git a/hugolib/securitypolicies_test.go b/hugolib/securitypolicies_test.go
index 3ddda7d6a..facda80eb 100644
--- a/hugolib/securitypolicies_test.go
+++ b/hugolib/securitypolicies_test.go
@@ -123,7 +123,7 @@ func TestSecurityPolicies(t *testing.T) {
c.Skip()
}
cb := func(b *sitesBuilder) {
- b.WithTemplatesAdded("index.html", `{{ $scss := "body { color: #333; }" | resources.FromString "foo.scss" | resources.ToCSS (dict "transpiler" "dartsass") }}`)
+ b.WithTemplatesAdded("index.html", `{{ $scss := "body { color: #333; }" | resources.FromString "foo.scss" | css.Sass (dict "transpiler" "dartsass") }}`)
}
testVariant(c, cb, "")
})
@@ -137,10 +137,10 @@ func TestSecurityPolicies(t *testing.T) {
b.WithConfigFile("toml", `
[security]
[security.exec]
-allow="none"
-
+allow="none"
+
`)
- b.WithTemplatesAdded("index.html", `{{ $scss := "body { color: #333; }" | resources.FromString "foo.scss" | resources.ToCSS (dict "transpiler" "dartsass") }}`)
+ b.WithTemplatesAdded("index.html", `{{ $scss := "body { color: #333; }" | resources.FromString "foo.scss" | css.Sass (dict "transpiler" "dartsass") }}`)
}
testVariant(c, cb, `(?s).*sass(-embedded)?" is not whitelisted in policy "security\.exec\.allow".*`)
})
@@ -160,7 +160,7 @@ allow="none"
httpTestVariant(c, `{{ $json := resources.GetRemote "%[1]s/fruits.json" }}{{ $json.Content }}`, `(?s).*is not whitelisted in policy "security\.http\.urls".*`,
func(b *sitesBuilder) {
b.WithConfigFile("toml", `
-[security]
+[security]
[security.http]
urls="none"
`)
@@ -181,7 +181,7 @@ urls="none"
httpTestVariant(c, `{{ $json := resources.GetRemote "%[1]s/fakejson.json" }}{{ $json.Content }}`, ``,
func(b *sitesBuilder) {
b.WithConfigFile("toml", `
-[security]
+[security]
[security.http]
mediaTypes=["application/json"]
diff --git a/hugolib/shortcode_test.go b/hugolib/shortcode_test.go
index 21436d980..92812bf66 100644
--- a/hugolib/shortcode_test.go
+++ b/hugolib/shortcode_test.go
@@ -126,10 +126,11 @@ func TestShortcodeMultipleOutputFormats(t *testing.T) {
siteConfig := `
baseURL = "http://example.com/blog"
-paginate = 1
-
disableKinds = ["section", "term", "taxonomy", "RSS", "sitemap", "robotsTXT", "404"]
+[pagination]
+pagerSize = 1
+
[outputs]
home = [ "HTML", "AMP", "Calendar" ]
page = [ "HTML", "AMP", "JSON" ]
diff --git a/hugolib/site_output_test.go b/hugolib/site_output_test.go
index 3d95709c5..37ebce730 100644
--- a/hugolib/site_output_test.go
+++ b/hugolib/site_output_test.go
@@ -15,7 +15,6 @@ package hugolib
import (
"fmt"
- "html/template"
"strings"
"testing"
@@ -45,11 +44,13 @@ func doTestSiteWithPageOutputs(t *testing.T, outputs []string) {
siteConfig := `
baseURL = "http://example.com/blog"
-paginate = 1
defaultContentLanguage = "en"
disableKinds = ["section", "term", "taxonomy", "RSS", "sitemap", "robotsTXT", "404"]
+[pagination]
+pagerSize = 1
+
[Taxonomies]
tag = "tags"
category = "categories"
@@ -221,11 +222,13 @@ func TestRedefineRSSOutputFormat(t *testing.T) {
siteConfig := `
baseURL = "http://example.com/blog"
-paginate = 1
defaultContentLanguage = "en"
disableKinds = ["page", "section", "term", "taxonomy", "sitemap", "robotsTXT", "404"]
+[pagination]
+pagerSize = 1
+
[outputFormats]
[outputFormats.RSS]
mediatype = "application/rss"
@@ -249,7 +252,7 @@ baseName = "feed"
s := h.Sites[0]
// Issue #3450
- c.Assert(s.RSSLink(), qt.Equals, template.URL("http://example.com/blog/feed.xml"))
+ c.Assert(s.Home().OutputFormats().Get("rss").Permalink(), qt.Equals, "http://example.com/blog/feed.xml")
}
// Issue #3614
@@ -257,11 +260,13 @@ func TestDotLessOutputFormat(t *testing.T) {
siteConfig := `
baseURL = "http://example.com/blog"
-paginate = 1
defaultContentLanguage = "en"
disableKinds = ["page", "section", "term", "taxonomy", "sitemap", "robotsTXT", "404"]
+[pagination]
+pagerSize = 1
+
[mediaTypes]
[mediaTypes."text/nodot"]
delimiter = ""
diff --git a/hugolib/site_sections_test.go b/hugolib/site_sections_test.go
index 7fa15fb66..0bf166092 100644
--- a/hugolib/site_sections_test.go
+++ b/hugolib/site_sections_test.go
@@ -115,7 +115,7 @@ PAG|{{ .Title }}|{{ $sect.InSection . }}
{{ $sections := (.Site.GetPage "section" .Section).Sections.ByWeight }}
</html>`)
- cfg.Set("paginate", 2)
+ cfg.Set("pagination.pagerSize", 2)
th, configs := newTestHelperFromProvider(cfg, fs, t)
diff --git a/hugolib/site_stats_test.go b/hugolib/site_stats_test.go
index 7fd68ff44..da09ec368 100644
--- a/hugolib/site_stats_test.go
+++ b/hugolib/site_stats_test.go
@@ -32,9 +32,11 @@ func TestSiteStats(t *testing.T) {
siteConfig := `
baseURL = "http://example.com/blog"
-paginate = 1
defaultContentLanguage = "nn"
+[pagination]
+pagerSize = 1
+
[languages]
[languages.nn]
languageName = "Nynorsk"
diff --git a/hugolib/site_url_test.go b/hugolib/site_url_test.go
index 8efaae3a2..29170118f 100644
--- a/hugolib/site_url_test.go
+++ b/hugolib/site_url_test.go
@@ -91,7 +91,7 @@ Do not go gentle into that good night.
`
cfg, fs := newTestCfg()
- cfg.Set("paginate", 1)
+ cfg.Set("pagination.pagerSize", 1)
th, configs := newTestHelperFromProvider(cfg, fs, t)
writeSource(t, fs, filepath.Join("content", "sect1", "_index.md"), fmt.Sprintf(st, "/ss1/"))
diff --git a/hugolib/taxonomy_test.go b/hugolib/taxonomy_test.go
index e96b82d39..26148dd1b 100644
--- a/hugolib/taxonomy_test.go
+++ b/hugolib/taxonomy_test.go
@@ -80,8 +80,9 @@ func doTestTaxonomiesWithAndWithoutContentFile(t *testing.T, uglyURLs bool) {
baseURL = "http://example.com/blog"
titleCaseStyle = "firstupper"
uglyURLs = %t
-paginate = 1
defaultContentLanguage = "en"
+[pagination]
+pagerSize = 1
[Taxonomies]
tag = "tags"
category = "categories"
diff --git a/hugolib/template_test.go b/hugolib/template_test.go
index a610b4d59..055d9593c 100644
--- a/hugolib/template_test.go
+++ b/hugolib/template_test.go
@@ -377,7 +377,7 @@ func TestTemplateFuncs(t *testing.T) {
b := newTestSitesBuilder(t).WithDefaultMultiSiteConfig()
homeTpl := `Site: {{ site.Language.Lang }} / {{ .Site.Language.Lang }} / {{ site.BaseURL }}
-Sites: {{ site.Sites.First.Home.Language.Lang }}
+Sites: {{ site.Sites.Default.Home.Language.Lang }}
Hugo: {{ hugo.Generator }}
`
@@ -460,7 +460,7 @@ complex: 80: 80
func TestPartialWithZeroedArgs(t *testing.T) {
b := newTestSitesBuilder(t)
b.WithTemplatesAdded("index.html",
- `
+ `
X{{ partial "retval" dict }}X
X{{ partial "retval" slice }}X
X{{ partial "retval" "" }}X
@@ -696,7 +696,7 @@ func TestApplyWithNamespace(t *testing.T) {
b.WithTemplates(
"index.html", `
-{{ $b := slice " a " " b " " c" }}
+{{ $b := slice " a " " b " " c" }}
{{ $a := apply $b "strings.Trim" "." " " }}
a: {{ $a }}
`,
diff --git a/hugolib/testhelpers_test.go b/hugolib/testhelpers_test.go
index 746f4c26e..08eb21787 100644
--- a/hugolib/testhelpers_test.go
+++ b/hugolib/testhelpers_test.go
@@ -292,11 +292,13 @@ func (s *sitesBuilder) WithDefaultMultiSiteConfig() *sitesBuilder {
defaultMultiSiteConfig := `
baseURL = "http://example.com/blog"
-paginate = 1
disablePathToLower = true
defaultContentLanguage = "en"
defaultContentLanguageInSubdir = true
+[pagination]
+pagerSize = 1
+
[permalinks]
other = "/somewhere/else/:filename"
@@ -324,7 +326,8 @@ plaque = "plaques"
weight = 30
title = "På nynorsk"
languageName = "Nynorsk"
-paginatePath = "side"
+[Languages.nn.pagination]
+path = "side"
[Languages.nn.Taxonomies]
lag = "lag"
[[Languages.nn.menu.main]]
@@ -336,7 +339,8 @@ weight = 1
weight = 40
title = "På bokmål"
languageName = "Bokmål"
-paginatePath = "side"
+[Languages.nb.pagination]
+path = "side"
[Languages.nb.Taxonomies]
lag = "lag"
` + commonConfigSections
diff --git a/resources/resource_transformers/tocss/scss/scss_integration_test.go b/resources/resource_transformers/tocss/scss/scss_integration_test.go
index bd140cc88..10309ad20 100644
--- a/resources/resource_transformers/tocss/scss/scss_integration_test.go
+++ b/resources/resource_transformers/tocss/scss/scss_integration_test.go
@@ -396,7 +396,7 @@ h3 {
{{ range $stylesheets }}
- {{ with . | resources.ToCSS | fingerprint }}
+ {{ with . | css.Sass | fingerprint }}
<link as="style" href="{{ .RelPermalink }}" rel="preload stylesheet">
{{ end }}
{{ end }}
diff --git a/tpl/page/page_integration_test.go b/tpl/page/page_integration_test.go
index 22f6323dd..0f48ecd28 100644
--- a/tpl/page/page_integration_test.go
+++ b/tpl/page/page_integration_test.go
@@ -29,8 +29,9 @@ func TestThatPageIsAvailableEverywhere(t *testing.T) {
baseURL = 'http://example.com/'
disableKinds = ["taxonomy", "term"]
enableInlineShortcodes = true
-paginate = 1
enableRobotsTXT = true
+[pagination]
+pagerSize = 1
LANG_CONFIG
-- content/_index.md --
---
@@ -191,7 +192,7 @@ title: "P1"
# Heading 1
-- layouts/shortcodes/toc.html --
-{{ page.TableOfContents }}
+{{ page.TableOfContents }}
-- layouts/_default/single.html --
{{ .Content }}
`
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 13:35:10 +0000