phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-05 08:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add some trailing newline shortcode tests

Browse source 
See #1753
This commit is contained in:
Bjørn Erik Pedersen 2016-01-04 23:48:05 +01:00
parent 7bc5d3663f
commit 9ff36c5a8f
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hugolib/shortcode_test.go
View file

@ -95,6 +95,14 @@ func TestHyphenatedSC(t *testing.T) {
CheckShortCodeMatch(t, "{{< hyphenated-video 47238zzb >}}", "Playing Video 47238zzb", tem) CheckShortCodeMatch(t, "{{< hyphenated-video 47238zzb >}}", "Playing Video 47238zzb", tem)
} }
// Issue #1753
func TestNoTrailingNewline(t *testing.T) {
tem := tpl.New()
tem.AddInternalShortcode("a.html", `{{ .Get 0 }}`)
CheckShortCodeMatch(t, "ab{{< a c >}}d", "abcd", tem)
}
func TestPositionalParamSC(t *testing.T) { func TestPositionalParamSC(t *testing.T) {
tem := tpl.New() tem := tpl.New()
tem.AddInternalShortcode("video.html", `Playing Video {{ .Get 0 }}`) tem.AddInternalShortcode("video.html", `Playing Video {{ .Get 0 }}`)

11
hugolib/site_test.go
View file

@ -344,6 +344,9 @@ func doTestCrossrefs(t *testing.T, relative, uglyURLs bool) {
{{< %s "sect/doc1.md" >}} {{< %s "sect/doc1.md" >}}
THE END.`, refShortcode))}, THE END.`, refShortcode))},
// Issue #1753: Should not add a trailing newline after shortcode.
{filepath.FromSlash("sect/doc3.md"),
[]byte(fmt.Sprintf(`**Ref 1:**{{< %s "sect/doc3.md" >}}.`, refShortcode))},
} }
s := &Site{ s := &Site{
@ -364,6 +367,7 @@ THE END.`, refShortcode))},
}{ }{
{filepath.FromSlash(fmt.Sprintf("sect/doc1%s", expectedPathSuffix)), fmt.Sprintf("<p>Ref 2: %s/sect/doc2%s</p>\n", expectedBase, expectedURLSuffix)}, {filepath.FromSlash(fmt.Sprintf("sect/doc1%s", expectedPathSuffix)), fmt.Sprintf("<p>Ref 2: %s/sect/doc2%s</p>\n", expectedBase, expectedURLSuffix)},
{filepath.FromSlash(fmt.Sprintf("sect/doc2%s", expectedPathSuffix)), fmt.Sprintf("<p><strong>Ref 1:</strong></p>\n\n%s/sect/doc1%s\n\n<p>THE END.</p>\n", expectedBase, expectedURLSuffix)}, {filepath.FromSlash(fmt.Sprintf("sect/doc2%s", expectedPathSuffix)), fmt.Sprintf("<p><strong>Ref 1:</strong></p>\n\n%s/sect/doc1%s\n\n<p>THE END.</p>\n", expectedBase, expectedURLSuffix)},
{filepath.FromSlash(fmt.Sprintf("sect/doc3%s", expectedPathSuffix)), fmt.Sprintf("<p><strong>Ref 1:</strong>%s/sect/doc3%s.</p>\n", expectedBase, expectedURLSuffix)},
} }
for _, test := range tests { for _, test := range tests {
@ -1038,10 +1042,9 @@ func setupLinkingMockSite(t *testing.T) *Site {
{filepath.FromSlash("level2/index.md"), []byte("")}, {filepath.FromSlash("level2/index.md"), []byte("")},
{filepath.FromSlash("level2/common.md"), []byte("")}, {filepath.FromSlash("level2/common.md"), []byte("")},
// {filepath.FromSlash("level2b/2b-root.md"), []byte("")},
// {filepath.FromSlash("level2b/2b-root.md"), []byte("")}, // {filepath.FromSlash("level2b/index.md"), []byte("")},
// {filepath.FromSlash("level2b/index.md"), []byte("")}, // {filepath.FromSlash("level2b/common.md"), []byte("")},
// {filepath.FromSlash("level2b/common.md"), []byte("")},
{filepath.FromSlash("level2/2-image.png"), []byte("")}, {filepath.FromSlash("level2/2-image.png"), []byte("")},
{filepath.FromSlash("level2/common.png"), []byte("")}, {filepath.FromSlash("level2/common.png"), []byte("")},