fix test

Author: hiifong

routers/web/repo/issue_view.go

@@ -388,8 +388,10 @@ func ViewIssue(ctx *context.Context) {
 		prepareIssueViewSidebarTimeTracker,
 		prepareIssueViewSidebarDependency,
 		prepareIssueViewSidebarPin,
-		func(ctx *context.Context, issue *issues_model.Issue) { preparePullViewPullInfo(ctx, issue) },
-		preparePullViewReviewAndMerge,
+		func(ctx *context.Context, issue *issues_model.Issue) {
+			compareInfo := preparePullViewPullInfo(ctx, issue)
+			preparePullViewReviewAndMerge(ctx, issue, compareInfo)
+		},
 	}
 
 	for _, prepareFunc := range prepareFuncs {
@@ -441,8 +443,8 @@ func ViewPullMergeBox(ctx *context.Context) {
 		ctx.NotFound(nil)
 		return
 	}
-	preparePullViewPullInfo(ctx, issue)
-	preparePullViewReviewAndMerge(ctx, issue)
+	compareInfo := preparePullViewPullInfo(ctx, issue)
+	preparePullViewReviewAndMerge(ctx, issue, compareInfo)
 	ctx.Data["PullMergeBoxReloading"] = issue.PullRequest.IsChecking()
 
 	// TODO: it should use a dedicated struct to render the pull merge box, to make sure all data is prepared correctly
@@ -823,7 +825,7 @@ func prepareIssueViewCommentsAndSidebarParticipants(ctx *context.Context, issue
 	ctx.Data["NumParticipants"] = len(participants)
 }
 
-func preparePullViewReviewAndMerge(ctx *context.Context, issue *issues_model.Issue) {
+func preparePullViewReviewAndMerge(ctx *context.Context, issue *issues_model.Issue, compareInfo *pull_service.CompareInfo) {
 	getBranchData(ctx, issue)
 	if !issue.IsPull {
 		return
@@ -938,14 +940,15 @@ func preparePullViewReviewAndMerge(ctx *context.Context, issue *issues_model.Iss
 
 	defaultSquashMergeBody = fmt.Sprintf("%s%s", defaultSquashMergeBody, coAuthors)
 
-	commitsMsg, err := getPullViewSquashMergeCommits(ctx, issue)
-	if err != nil {
-		ctx.ServerError("getPullViewSquashMergeCommits", err)
-		return
+	commitsBuilder := strings.Builder{}
+	for _, c := range compareInfo.Commits {
+		commitsBuilder.WriteString("* ")
+		commitsBuilder.WriteString(c.CommitMessage)
+		commitsBuilder.WriteRune('\n')
 	}
 
 	ctx.Data["DefaultSquashMergeMessage"] = defaultSquashMergeMessage
-	ctx.Data["DefaultSquashMergeBody"] = fmt.Sprintf("--------------------\n%s%s", commitsMsg, defaultSquashMergeBody)
+	ctx.Data["DefaultSquashMergeBody"] = fmt.Sprintf("--------------------\n%s%s", commitsBuilder.String(), defaultSquashMergeBody)
 
 	pb, err := git_model.GetFirstMatchProtectedBranchRule(ctx, pull.BaseRepoID, pull.BaseBranch)
 	if err != nil {
@@ -1017,24 +1020,3 @@ func prepareIssueViewContent(ctx *context.Context, issue *issues_model.Issue) {
 		return
 	}
 }
-
-func getPullViewSquashMergeCommits(ctx *context.Context, issue *issues_model.Issue) (string, error) {
-	pull := issue.PullRequest
-	pull.Issue = issue
-
-	baseCommit := GetMergedBaseCommitID(ctx, issue)
-
-	compareInfo, err := pull_service.GetCompareInfo(ctx, ctx.Repo.Repository, ctx.Repo.Repository, ctx.Repo.GitRepo, baseCommit, pull.GetGitHeadRefName(), false, false)
-	if err != nil {
-		return "", err
-	}
-
-	commitsBuilder := strings.Builder{}
-	for _, c := range compareInfo.Commits {
-		commitsBuilder.WriteString("* ")
-		commitsBuilder.WriteString(c.CommitMessage)
-		commitsBuilder.WriteRune('\n')
-	}
-
-	return commitsBuilder.String(), nil
-}