Add some trailing newline shortcode tests

See #1753

diff --git a/hugolib/shortcode_test.go b/hugolib/shortcode_test.go
index ce655770ef5204f30729f6c1416ce159abc88bd7..78ea6ee2729b5b649b9c0df706e32e8311fc7232 100644 (file)
--- a/hugolib/shortcode_test.go
+++ b/hugolib/shortcode_test.go
@@ -95,6 +95,14 @@ func TestHyphenatedSC(t *testing.T) {
        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) {
        tem := tpl.New()
        tem.AddInternalShortcode("video.html", `Playing Video {{ .Get 0 }}`)

diff --git a/hugolib/site_test.go b/hugolib/site_test.go
index 15cdc02d80775100f661f8f016c77441afb4f752..68fb5e5fc37e59a90e6b3a04c753d327482ac90d 100644 (file)
--- a/hugolib/site_test.go
+++ b/hugolib/site_test.go
@@ -344,6 +344,9 @@ func doTestCrossrefs(t *testing.T, relative, uglyURLs bool) {
 {{< %s "sect/doc1.md" >}}
 
 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{
@@ -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/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 {
@@ -1038,10 +1042,9 @@ func setupLinkingMockSite(t *testing.T) *Site {
                {filepath.FromSlash("level2/index.md"), []byte("")},
                {filepath.FromSlash("level2/common.md"), []byte("")},
 
-
-//             {filepath.FromSlash("level2b/2b-root.md"), []byte("")},
-//             {filepath.FromSlash("level2b/index.md"), []byte("")},
-//             {filepath.FromSlash("level2b/common.md"), []byte("")},
+               //              {filepath.FromSlash("level2b/2b-root.md"), []byte("")},
+               //              {filepath.FromSlash("level2b/index.md"), []byte("")},
+               //              {filepath.FromSlash("level2b/common.md"), []byte("")},
 
                {filepath.FromSlash("level2/2-image.png"), []byte("")},
                {filepath.FromSlash("level2/common.png"), []byte("")},