Merge pull request 'Fix conversation template' (#4691) from 0ko/forgejo:ui-roles-reviews into forgejo

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4691
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
This commit is contained in:
Earl Warren 2024-07-25 20:46:11 +00:00
commit 90f80be3f0
2 changed files with 114 additions and 60 deletions

View file

@ -77,7 +77,7 @@
</span> </span>
</div> </div>
<div class="comment-header-right actions tw-flex tw-items-center"> <div class="comment-header-right actions tw-flex tw-items-center">
{{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole "IsPull" .Issue.IsPull}} {{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole "IsPull" $.Issue.IsPull}}
{{if not $.Repository.IsArchived}} {{if not $.Repository.IsArchived}}
{{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}} {{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
{{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" . "delete" true "issue" true "diff" true "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}} {{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" . "delete" true "issue" true "diff" true "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}

View file

@ -15,40 +15,112 @@ import (
) )
// TestIssuesCommentLabels is a test for user (role) labels in comment headers in PRs and issues. // TestIssuesCommentLabels is a test for user (role) labels in comment headers in PRs and issues.
// It covers a few labels and combinations.
func TestIssuesCommentLabels(t *testing.T) { func TestIssuesCommentLabels(t *testing.T) {
user := "user2"
repo := "repo1"
ownerTooltip := "This user is the owner of this repository."
authorTooltipPR := "This user is the author of this pull request."
authorTooltipIssue := "This user is the author of this issue."
contributorTooltip := "This user has previously committed in this repository."
newContributorTooltip := "This is the first contribution of this user to the repository."
// Test pulls
onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
user := "user2"
repo := "repo1"
compareLink := path.Join(user, repo, "compare", "master...comment-labels")
sessionUser1 := loginUser(t, "user1") sessionUser1 := loginUser(t, "user1")
sessionUser2 := loginUser(t, "user2") sessionUser2 := loginUser(t, "user2")
sessionUser5 := loginUser(t, "user5") sessionUser11 := loginUser(t, "user11")
ownerTooltip := "This user is the owner of this repository."
authorTooltipPR := "This user is the author of this pull request."
authorTooltipIssue := "This user is the author of this issue."
firstTooltip := "This is the first contribution of this user to the repository."
// Open a new PR as user2 // Open a new PR as user2
testEditFileToNewBranch(t, sessionUser2, user, repo, "master", "comment-labels", "README.md", "test of comment labels") testEditFileToNewBranch(t, sessionUser2, user, repo, "master", "comment-labels", "README.md", "test of comment labels\naline")
sessionUser2.MakeRequest(t, NewRequestWithValues(t, "POST", compareLink, sessionUser2.MakeRequest(t, NewRequestWithValues(t, "POST", path.Join(user, repo, "compare", "master...comment-labels"),
map[string]string{ map[string]string{
"_csrf": GetCSRF(t, sessionUser2, compareLink), "_csrf": GetCSRF(t, sessionUser2, path.Join(user, repo, "compare", "master...comment-labels")),
"title": "Pull used for testing commit labels", "title": "Pull used for testing commit labels",
}, },
), http.StatusOK) ), http.StatusOK)
// Pull number, expected to be 6 // Pull number, expected to be 6
testID := "6" testID := "6"
// Add a few comments // Add a few comments
// (first: Owner) // (first: Owner)
testEasyLeavePRComment(t, sessionUser2, user, repo, testID, "New comment from user2 on this PR") // Author, Owner testEasyLeavePRReviewComment(t, sessionUser2, user, repo, testID, "README.md", "1", "New review comment from user2 on this line", "")
testEasyLeavePRComment(t, sessionUser1, user, repo, testID, "New comment from user1 on this PR") // First-time contributor
testEasyLeavePRComment(t, sessionUser5, user, repo, testID, "New comment from user5 on this PR") // no labels // Have to fetch reply ID for reviews
response := sessionUser2.MakeRequest(t, NewRequest(t, "GET", path.Join(user, repo, "pulls", testID)), http.StatusOK)
page := NewHTMLParser(t, response.Body)
replyID, _ := page.Find(".comment-form input[name='reply']").Attr("value")
testEasyLeavePRReviewComment(t, sessionUser2, user, repo, testID, "README.md", "1", "Another review comment from user2 on this line", replyID)
testEasyLeavePRComment(t, sessionUser2, user, repo, testID, "New comment from user2 on this PR") // Author, Owner
testEasyLeavePRComment(t, sessionUser1, user, repo, testID, "New comment from user1 on this PR") // Contributor
testEasyLeavePRComment(t, sessionUser11, user, repo, testID, "New comment from user11 on this PR") // First-time contributor
// Fetch the PR page // Fetch the PR page
response := sessionUser2.MakeRequest(t, NewRequest(t, "GET", path.Join(user, repo, "pulls", testID)), http.StatusOK) response = sessionUser2.MakeRequest(t, NewRequest(t, "GET", path.Join(user, repo, "pulls", testID)), http.StatusOK)
page = NewHTMLParser(t, response.Body)
commentHeads := page.Find(".timeline .comment .comment-header .comment-header-right")
assert.EqualValues(t, 6, commentHeads.Length())
// Test the first comment and it's label "Owner"
labels := commentHeads.Eq(0).Find(".role-label")
assert.EqualValues(t, 1, labels.Length())
testIssueCommentUserLabel(t, labels.Eq(0), "Owner", ownerTooltip)
// Test the second (review) comment and it's labels "Author" and "Owner"
labels = commentHeads.Eq(1).Find(".role-label")
assert.EqualValues(t, 2, labels.Length())
testIssueCommentUserLabel(t, labels.Eq(0), "Author", authorTooltipPR)
testIssueCommentUserLabel(t, labels.Eq(1), "Owner", ownerTooltip)
// Test the third (review) comment and it's labels "Author" and "Owner"
labels = commentHeads.Eq(2).Find(".role-label")
assert.EqualValues(t, 2, labels.Length())
testIssueCommentUserLabel(t, labels.Eq(0), "Author", authorTooltipPR)
testIssueCommentUserLabel(t, labels.Eq(1), "Owner", ownerTooltip)
// Test the fourth comment and it's labels "Author" and "Owner"
labels = commentHeads.Eq(3).Find(".role-label")
assert.EqualValues(t, 2, labels.Length())
testIssueCommentUserLabel(t, labels.Eq(0), "Author", authorTooltipPR)
testIssueCommentUserLabel(t, labels.Eq(1), "Owner", ownerTooltip)
// Test the fivth comment and it's label "Contributor"
labels = commentHeads.Eq(4).Find(".role-label")
assert.EqualValues(t, 1, labels.Length())
testIssueCommentUserLabel(t, labels.Eq(0), "Contributor", contributorTooltip)
// Test the sixth comment and it's label "First-time contributor"
labels = commentHeads.Eq(5).Find(".role-label")
assert.EqualValues(t, 1, labels.Length())
testIssueCommentUserLabel(t, labels.Eq(0), "First-time contributor", newContributorTooltip)
})
// Test issues
onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
sessionUser1 := loginUser(t, "user1")
sessionUser2 := loginUser(t, "user2")
sessionUser5 := loginUser(t, "user5")
// Open a new issue in the same repo
sessionUser2.MakeRequest(t, NewRequestWithValues(t, "POST", path.Join(user, repo, "issues/new"),
map[string]string{
"_csrf": GetCSRF(t, sessionUser2, path.Join(user, repo)),
"title": "Issue used for testing commit labels",
},
), http.StatusOK)
// Issue number, expected to be 6
testID := "6"
// Add a few comments
// (first: Owner)
testEasyLeaveIssueComment(t, sessionUser2, user, repo, testID, "New comment from user2 on this issue") // Author, Owner
testEasyLeaveIssueComment(t, sessionUser1, user, repo, testID, "New comment from user1 on this issue") // Contributor
testEasyLeaveIssueComment(t, sessionUser5, user, repo, testID, "New comment from user5 on this issue") // no labels
// Fetch the issue page
response := sessionUser2.MakeRequest(t, NewRequest(t, "GET", path.Join(user, repo, "issues", testID)), http.StatusOK)
page := NewHTMLParser(t, response.Body) page := NewHTMLParser(t, response.Body)
commentHeads := page.Find(".timeline .comment .comment-header .comment-header-right") commentHeads := page.Find(".timeline .comment .comment-header .comment-header-right")
assert.EqualValues(t, 4, commentHeads.Length()) assert.EqualValues(t, 4, commentHeads.Length())
@ -58,54 +130,18 @@ func TestIssuesCommentLabels(t *testing.T) {
assert.EqualValues(t, 1, labels.Length()) assert.EqualValues(t, 1, labels.Length())
testIssueCommentUserLabel(t, labels.Eq(0), "Owner", ownerTooltip) testIssueCommentUserLabel(t, labels.Eq(0), "Owner", ownerTooltip)
// Test the second comment and it's labels "Author" and "Owner"
labels = commentHeads.Eq(1).Find(".role-label")
assert.EqualValues(t, 2, labels.Length())
testIssueCommentUserLabel(t, labels.Eq(0), "Author", authorTooltipPR)
testIssueCommentUserLabel(t, labels.Eq(1), "Owner", ownerTooltip)
// Test the third comment and it's label "First-time contributor"
labels = commentHeads.Eq(3).Find(".role-label")
assert.EqualValues(t, 1, labels.Length())
testIssueCommentUserLabel(t, labels.Eq(0), "First-time contributor", firstTooltip)
// Test the fourth comment and it's lack of labels
labels = commentHeads.Eq(4).Find(".role-label")
assert.EqualValues(t, 0, labels.Length())
// Open a new issue in the same repo
sessionUser2.MakeRequest(t, NewRequestWithValues(t, "POST", path.Join(user, repo, "issues/new"),
map[string]string{
"_csrf": GetCSRF(t, sessionUser2, compareLink),
"title": "Issue used for testing commit labels",
},
), http.StatusOK)
// Issue number, expected to be 7 after the PR
testID = "7"
// Add a few comments
// (first: Owner)
testEasyLeaveIssueComment(t, sessionUser2, user, repo, testID, "New comment from user2 on this issue") // Author, Owner
testEasyLeaveIssueComment(t, sessionUser5, user, repo, testID, "New comment from user5 on this issue") // no labels
// Fetch the issue page
response = sessionUser2.MakeRequest(t, NewRequest(t, "GET", path.Join(user, repo, "issues", testID)), http.StatusOK)
page = NewHTMLParser(t, response.Body)
commentHeads = page.Find(".timeline .comment .comment-header .comment-header-right")
assert.EqualValues(t, 3, commentHeads.Length())
// Test the first comment and it's label "Owner"
labels = commentHeads.Eq(0).Find(".role-label")
assert.EqualValues(t, 1, labels.Length())
testIssueCommentUserLabel(t, labels.Eq(0), "Owner", ownerTooltip)
// Test the second comment and it's labels "Author" and "Owner" // Test the second comment and it's labels "Author" and "Owner"
labels = commentHeads.Eq(1).Find(".role-label") labels = commentHeads.Eq(1).Find(".role-label")
assert.EqualValues(t, 2, labels.Length()) assert.EqualValues(t, 2, labels.Length())
testIssueCommentUserLabel(t, labels.Eq(0), "Author", authorTooltipIssue) testIssueCommentUserLabel(t, labels.Eq(0), "Author", authorTooltipIssue)
testIssueCommentUserLabel(t, labels.Eq(1), "Owner", ownerTooltip) testIssueCommentUserLabel(t, labels.Eq(1), "Owner", ownerTooltip)
// Test the third comment and it's lack of labels // Test the third comment and it's label "Contributor"
labels = commentHeads.Eq(2).Find(".role-label")
assert.EqualValues(t, 1, labels.Length())
testIssueCommentUserLabel(t, labels.Eq(0), "Contributor", contributorTooltip)
// Test the fifth comment and it's lack of labels
labels = commentHeads.Eq(3).Find(".role-label") labels = commentHeads.Eq(3).Find(".role-label")
assert.EqualValues(t, 0, labels.Length()) assert.EqualValues(t, 0, labels.Length())
}) })
@ -141,3 +177,21 @@ func testEasyLeavePRComment(t *testing.T, session *TestSession, user, repo, id,
"status": "", "status": "",
}), 200) }), 200)
} }
// testEasyLeavePRReviewComment is used to add review comments to specific lines of changed files in the diff of the PR.
func testEasyLeavePRReviewComment(t *testing.T, session *TestSession, user, repo, id, file, line, message, replyID string) {
t.Helper()
values := map[string]string{
"_csrf": GetCSRF(t, session, path.Join(user, repo, "pulls", id, "files")),
"origin": "diff",
"side": "proposed",
"line": line,
"path": file,
"content": message,
"single_review": "true",
}
if len(replyID) > 0 {
values["reply"] = replyID
}
session.MakeRequest(t, NewRequestWithValues(t, "POST", path.Join(user, repo, "pulls", id, "files/reviews/comments"), values), http.StatusOK)
}