From 9ff36c5a8f9a09754c67f6019aba79ebc08d164f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Mon, 4 Jan 2016 23:48:05 +0100
Subject: [PATCH] Add some trailing newline shortcode tests

See #1753
---
 hugolib/shortcode_test.go |  8 ++++++++
 hugolib/site_test.go      | 11 +++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/hugolib/shortcode_test.go b/hugolib/shortcode_test.go
index ce655770e..78ea6ee27 100644
--- 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 15cdc02d8..68fb5e5fc 100644
--- 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("")},