Update template test to reflect inclusion of "default" text

dhleong · dhleong · commit c7e702203bef · 2020-09-08T20:25:52.000-04:00
Also, avoid excessive amounts of newlines separating the two
diff --git a/pkg/cmd/pr/create/create_test.go b/pkg/cmd/pr/create/create_test.go
@@ -316,7 +316,7 @@ func TestPRCreate_nonLegacyTemplate(t *testing.T) {
 
 	eq(t, reqBody.Variables.Input.RepositoryID, "REPOID")
 	eq(t, reqBody.Variables.Input.Title, "my title")
-	eq(t, reqBody.Variables.Input.Body, "Fixes a bug and Closes an issue")
+	eq(t, reqBody.Variables.Input.Body, "- commit 1\n- commit 0\n\nFixes a bug and Closes an issue")
 	eq(t, reqBody.Variables.Input.BaseRefName, "master")
 	eq(t, reqBody.Variables.Input.HeadRefName, "feature")
 
diff --git a/pkg/cmd/pr/shared/title_body_survey.go b/pkg/cmd/pr/shared/title_body_survey.go
@@ -2,6 +2,7 @@ package shared
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/cli/cli/api"
@@ -169,6 +170,8 @@ func TitleBodySurvey(io *iostreams.IOStreams, editorCommand string, issueState *
 
 		if templateContents != "" {
 			if issueState.Body != "" {
+				// prevent excessive newlines between default body and template
+				issueState.Body = strings.TrimRight(issueState.Body, "\n")
 				issueState.Body += "\n\n"
 			}
 			issueState.Body += templateContents
