mirror of
https://github.com/gohugoio/hugo.git
synced 2024-05-10 03:36:31 +00:00
Merge 02a7f59c28
into 74ce5dc841
This commit is contained in:
commit
c756d95cb6
|
@ -770,7 +770,7 @@ func (c *cachedContent) contentPlain(ctx context.Context, cp *pageContentOutput)
|
||||||
result.readingTime = (result.wordCount + 212) / 213
|
result.readingTime = (result.wordCount + 212) / 213
|
||||||
}
|
}
|
||||||
|
|
||||||
if rendered.summary != "" {
|
if c.pi.hasSummaryDivider || rendered.summary != "" {
|
||||||
result.summary = rendered.summary
|
result.summary = rendered.summary
|
||||||
result.summaryTruncated = rendered.summaryTruncated
|
result.summaryTruncated = rendered.summaryTruncated
|
||||||
} else if cp.po.p.m.pageConfig.Summary != "" {
|
} else if cp.po.p.m.pageConfig.Summary != "" {
|
||||||
|
|
|
@ -63,6 +63,15 @@ Summary Next Line
|
||||||
|
|
||||||
<!--more-->
|
<!--more-->
|
||||||
Some more text
|
Some more text
|
||||||
|
`
|
||||||
|
|
||||||
|
simplePageWithBlankSummary = `---
|
||||||
|
title: SimpleWithBlankSummary
|
||||||
|
---
|
||||||
|
|
||||||
|
<!--more-->
|
||||||
|
|
||||||
|
Some text.
|
||||||
`
|
`
|
||||||
|
|
||||||
simplePageWithSummaryParameter = `---
|
simplePageWithSummaryParameter = `---
|
||||||
|
@ -351,6 +360,9 @@ func normalizeExpected(ext, str string) string {
|
||||||
|
|
||||||
return expected
|
return expected
|
||||||
case "rst":
|
case "rst":
|
||||||
|
if str == "" {
|
||||||
|
return "<div class=\"document\"></div>"
|
||||||
|
}
|
||||||
return fmt.Sprintf("<div class=\"document\">\n\n\n%s</div>", str)
|
return fmt.Sprintf("<div class=\"document\">\n\n\n%s</div>", str)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -630,6 +642,19 @@ func TestPageWithDelimiter(t *testing.T) {
|
||||||
testAllMarkdownEnginesForPages(t, assertFunc, nil, simplePageWithSummaryDelimiter)
|
testAllMarkdownEnginesForPages(t, assertFunc, nil, simplePageWithSummaryDelimiter)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestPageWithBlankSummary(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
assertFunc := func(t *testing.T, ext string, pages page.Pages) {
|
||||||
|
p := pages[0]
|
||||||
|
checkPageTitle(t, p, "SimpleWithBlankSummary")
|
||||||
|
checkPageContent(t, p, normalizeExpected(ext, "<p>Some text.</p>\n"), ext)
|
||||||
|
checkPageSummary(t, p, normalizeExpected(ext, ""), ext)
|
||||||
|
checkPageType(t, p, "page")
|
||||||
|
}
|
||||||
|
|
||||||
|
testAllMarkdownEnginesForPages(t, assertFunc, nil, simplePageWithBlankSummary)
|
||||||
|
}
|
||||||
|
|
||||||
func TestPageWithSummaryParameter(t *testing.T) {
|
func TestPageWithSummaryParameter(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
assertFunc := func(t *testing.T, ext string, pages page.Pages) {
|
assertFunc := func(t *testing.T, ext string, pages page.Pages) {
|
||||||
|
|
Loading…
Reference in a new issue