mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-07-25 02:48:05 +00:00
Closes https://codeberg.org/forgejo/forgejo/issues/6093 This PR adds support for **multi-line review comments** on pull requests, allowing reviewers to select a range of lines in diffs instead of only a single line — similar to GitHub's implementation. ### Tests for Go changes - I added test coverage for Go changes... - [X] in their respective `*_test.go` for unit tests. - [X] `make pr-go` before pushing Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/12582 Reviewed-by: Mathieu Fenniak <mfenniak@noreply.codeberg.org>
209 lines
7.3 KiB
Go
209 lines
7.3 KiB
Go
// Copyright 2017 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package issues_test
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"forgejo.org/models/db"
|
|
issues_model "forgejo.org/models/issues"
|
|
repo_model "forgejo.org/models/repo"
|
|
"forgejo.org/models/unittest"
|
|
user_model "forgejo.org/models/user"
|
|
"forgejo.org/modules/structs"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestCreateComment(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{})
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID})
|
|
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
|
|
|
|
now := time.Now().Unix()
|
|
comment, err := issues_model.CreateComment(db.DefaultContext, &issues_model.CreateCommentOptions{
|
|
Type: issues_model.CommentTypeComment,
|
|
Doer: doer,
|
|
Repo: repo,
|
|
Issue: issue,
|
|
Content: "Hello",
|
|
})
|
|
require.NoError(t, err)
|
|
then := time.Now().Unix()
|
|
|
|
assert.Equal(t, issues_model.CommentTypeComment, comment.Type)
|
|
assert.Equal(t, "Hello", comment.Content)
|
|
assert.Equal(t, issue.ID, comment.IssueID)
|
|
assert.Equal(t, doer.ID, comment.PosterID)
|
|
unittest.AssertInt64InRange(t, now, then, int64(comment.CreatedUnix))
|
|
unittest.AssertExistsAndLoadBean(t, comment) // assert actually added to DB
|
|
|
|
updatedIssue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: issue.ID})
|
|
unittest.AssertInt64InRange(t, now, then, int64(updatedIssue.UpdatedUnix))
|
|
}
|
|
|
|
func TestFetchCodeConversations(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
|
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
|
|
_, err := issues_model.CreateReaction(t.Context(), &issues_model.ReactionOptions{
|
|
Type: "eyes",
|
|
DoerID: 2,
|
|
IssueID: issue.ID,
|
|
CommentID: 4,
|
|
})
|
|
require.NoError(t, err)
|
|
require.NoError(t, issues_model.MarkConversation(t.Context(),
|
|
unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 4}),
|
|
user, true))
|
|
|
|
res, err := issues_model.FetchCodeConversations(db.DefaultContext, issue, user, false, "")
|
|
require.NoError(t, err)
|
|
require.Contains(t, res, "README.md")
|
|
require.Contains(t, res["README.md"], int64(4))
|
|
require.Len(t, res["README.md"][4], 1)
|
|
require.Len(t, res["README.md"][4][0], 1)
|
|
comment := res["README.md"][4][0][0]
|
|
assert.Equal(t, int64(4), comment.ID)
|
|
assert.NotNil(t, comment.ResolveDoer)
|
|
require.Len(t, comment.Reactions, 1)
|
|
r := comment.Reactions[0]
|
|
assert.NotNil(t, r.User)
|
|
|
|
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
|
res, err = issues_model.FetchCodeConversations(db.DefaultContext, issue, user2, false, "")
|
|
require.NoError(t, err)
|
|
assert.Len(t, res, 1)
|
|
}
|
|
|
|
func TestAsCommentType(t *testing.T) {
|
|
assert.Equal(t, issues_model.CommentTypeComment, issues_model.CommentType(0))
|
|
assert.Equal(t, issues_model.CommentTypeUndefined, issues_model.AsCommentType(""))
|
|
assert.Equal(t, issues_model.CommentTypeUndefined, issues_model.AsCommentType("nonsense"))
|
|
assert.Equal(t, issues_model.CommentTypeComment, issues_model.AsCommentType("comment"))
|
|
assert.Equal(t, issues_model.CommentTypePRUnScheduledToAutoMerge, issues_model.AsCommentType("pull_cancel_scheduled_merge"))
|
|
}
|
|
|
|
func TestMigrate_InsertIssueComments(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1})
|
|
_ = issue.LoadRepo(db.DefaultContext)
|
|
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: issue.Repo.OwnerID})
|
|
reaction := &issues_model.Reaction{
|
|
Type: "heart",
|
|
UserID: owner.ID,
|
|
}
|
|
|
|
comment := &issues_model.Comment{
|
|
PosterID: owner.ID,
|
|
Poster: owner,
|
|
IssueID: issue.ID,
|
|
Issue: issue,
|
|
Reactions: []*issues_model.Reaction{reaction},
|
|
}
|
|
|
|
err := issues_model.InsertIssueComments(db.DefaultContext, []*issues_model.Comment{comment})
|
|
require.NoError(t, err)
|
|
|
|
issueModified := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1})
|
|
assert.Equal(t, issue.NumComments+1, issueModified.NumComments)
|
|
|
|
unittest.CheckConsistencyFor(t, &issues_model.Issue{})
|
|
}
|
|
|
|
func TestUpdateCommentsMigrationsByType(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1})
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID})
|
|
comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 1, IssueID: issue.ID})
|
|
|
|
// Set repository to migrated from Gitea.
|
|
repo.OriginalServiceType = structs.GiteaService
|
|
repo_model.UpdateRepositoryCols(db.DefaultContext, repo, "original_service_type")
|
|
|
|
// Set comment to have an original author.
|
|
comment.OriginalAuthor = "Example User"
|
|
comment.OriginalAuthorID = 1
|
|
comment.PosterID = 0
|
|
_, err := db.GetEngine(db.DefaultContext).ID(comment.ID).Cols("original_author", "original_author_id", "poster_id").Update(comment)
|
|
require.NoError(t, err)
|
|
|
|
require.NoError(t, issues_model.UpdateCommentsMigrationsByType(db.DefaultContext, structs.GiteaService, "1", 513))
|
|
|
|
comment = unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 1, IssueID: issue.ID})
|
|
assert.Empty(t, comment.OriginalAuthor)
|
|
assert.Empty(t, comment.OriginalAuthorID)
|
|
assert.EqualValues(t, 513, comment.PosterID)
|
|
}
|
|
|
|
func Test_UpdateIssueNumComments(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
issue2 := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
|
|
|
|
require.NoError(t, issues_model.UpdateIssueNumComments(db.DefaultContext, issue2.ID))
|
|
issue2 = unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
|
|
assert.Equal(t, 1, issue2.NumComments)
|
|
}
|
|
|
|
func TestDisplayLine(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
line int64
|
|
count int64
|
|
expected int64
|
|
}{
|
|
{"positive single line", 10, 0, 10},
|
|
{"positive multi-line", 7, 2, 9},
|
|
{"positive large range", 1, 49, 50},
|
|
{"negative single line", -10, 0, -10},
|
|
{"negative multi-line", -7, 2, -9},
|
|
{"negative large range", -1, 49, -50},
|
|
}
|
|
for _, tc := range tests {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
c := &issues_model.Comment{Line: tc.line, ExtraLinesCount: tc.count}
|
|
assert.Equal(t, tc.expected, c.DisplayLine())
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestUnsignedDisplayLine(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
line int64
|
|
count int64
|
|
expected uint64
|
|
}{
|
|
{"positive single line", 10, 0, 10},
|
|
{"positive multi-line", 7, 2, 9},
|
|
{"negative single line", -10, 0, 10},
|
|
{"negative multi-line", -7, 2, 9},
|
|
}
|
|
for _, tc := range tests {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
c := &issues_model.Comment{Line: tc.line, ExtraLinesCount: tc.count}
|
|
assert.Equal(t, tc.expected, c.UnsignedDisplayLine())
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestCheckLineRangeValid_SingleLine(t *testing.T) {
|
|
// ExtraLinesCount=0 should return true immediately without any git operations
|
|
c := &issues_model.Comment{Line: 10, ExtraLinesCount: 0}
|
|
valid, err := c.CheckLineRangeValid(t.Context(), nil, "any-commit-id")
|
|
require.NoError(t, err)
|
|
assert.True(t, valid)
|
|
|
|
// Negative line, ExtraLinesCount=0
|
|
c2 := &issues_model.Comment{Line: -5, ExtraLinesCount: 0}
|
|
valid2, err := c2.CheckLineRangeValid(t.Context(), nil, "any-commit-id")
|
|
require.NoError(t, err)
|
|
assert.True(t, valid2)
|
|
}
|