mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-08-19 17:01:12 +00:00
Discovered that `NotifyPullRevieweDismiss` was dead code while working on another issue; it should have been `PullReviewDismiss` when originally implemented. Related fixes to the activity feed view which were incomplete as well. Dismissing a PR review now appears on the activity feed:  ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests - I added test coverage for Go changes... - [ ] in their respective `*_test.go` for unit tests. - [x] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] I do not want this change to show in the release notes. - [x] I want the title to show in the release notes with a link to this pull request. - [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8853 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Mathieu Fenniak <mathieu@fenniak.net> Co-committed-by: Mathieu Fenniak <mathieu@fenniak.net>
166 lines
5.6 KiB
Go
166 lines
5.6 KiB
Go
// Copyright 2024-2025 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
|
|
|
package integration
|
|
|
|
import (
|
|
"net/http"
|
|
"net/url"
|
|
"strconv"
|
|
"strings"
|
|
"testing"
|
|
|
|
"forgejo.org/models/issues"
|
|
unit_model "forgejo.org/models/unit"
|
|
"forgejo.org/models/unittest"
|
|
user_model "forgejo.org/models/user"
|
|
"forgejo.org/modules/gitrepo"
|
|
issue_service "forgejo.org/services/issue"
|
|
pr_service "forgejo.org/services/pull"
|
|
files_service "forgejo.org/services/repository/files"
|
|
"forgejo.org/tests"
|
|
|
|
"github.com/PuerkitoBio/goquery"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestUserDashboardFeedWelcome(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
// User2 has some activity in feed
|
|
session := loginUser(t, "user2")
|
|
page := NewHTMLParser(t, session.MakeRequest(t, NewRequest(t, "GET", "/"), http.StatusOK).Body)
|
|
testUserDashboardFeedType(t, page, false)
|
|
|
|
// User1 doesn't have any activity in feed
|
|
session = loginUser(t, "user1")
|
|
page = NewHTMLParser(t, session.MakeRequest(t, NewRequest(t, "GET", "/"), http.StatusOK).Body)
|
|
testUserDashboardFeedType(t, page, true)
|
|
}
|
|
|
|
func testUserDashboardFeedType(t *testing.T, page *HTMLDoc, isEmpty bool) {
|
|
page.AssertElement(t, "#activity-feed", !isEmpty)
|
|
page.AssertElement(t, "#empty-feed", isEmpty)
|
|
}
|
|
|
|
func TestDashboardTitleRendering(t *testing.T) {
|
|
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
|
user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
|
|
sess := loginUser(t, user4.Name)
|
|
|
|
repo, _, f := tests.CreateDeclarativeRepo(t, user4, "",
|
|
[]unit_model.Type{unit_model.TypePullRequests, unit_model.TypeIssues}, nil,
|
|
[]*files_service.ChangeRepoFile{
|
|
{
|
|
Operation: "create",
|
|
TreePath: "test.txt",
|
|
ContentReader: strings.NewReader("Just some text here"),
|
|
},
|
|
},
|
|
)
|
|
defer f()
|
|
|
|
issue := createIssue(t, user4, repo, "`:exclamation:` not rendered", "Hi there!")
|
|
pr := createPullRequest(t, user4, repo, "testing", "`:exclamation:` not rendered")
|
|
|
|
_, err := issue_service.CreateIssueComment(t.Context(), user4, repo, issue, "hi", nil)
|
|
require.NoError(t, err)
|
|
|
|
_, err = issue_service.CreateIssueComment(t.Context(), user4, repo, pr.Issue, "hi", nil)
|
|
require.NoError(t, err)
|
|
|
|
testIssueClose(t, sess, repo.OwnerName, repo.Name, strconv.Itoa(int(issue.Index)), false)
|
|
testIssueClose(t, sess, repo.OwnerName, repo.Name, strconv.Itoa(int(pr.Issue.Index)), true)
|
|
|
|
response := sess.MakeRequest(t, NewRequest(t, "GET", "/"), http.StatusOK)
|
|
htmlDoc := NewHTMLParser(t, response.Body)
|
|
|
|
count := 0
|
|
htmlDoc.doc.Find("#activity-feed .flex-item-main .title").Each(func(i int, s *goquery.Selection) {
|
|
count++
|
|
if s.IsMatcher(goquery.Single("a")) {
|
|
assert.Equal(t, "❗ not rendered", s.Text())
|
|
} else {
|
|
assert.Equal(t, ":exclamation: not rendered", s.Text())
|
|
}
|
|
})
|
|
|
|
assert.Equal(t, 6, count)
|
|
})
|
|
}
|
|
|
|
func TestDashboardActionEscaping(t *testing.T) {
|
|
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
|
user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
|
|
sess := loginUser(t, user4.Name)
|
|
|
|
repo, _, f := tests.CreateDeclarativeRepo(t, user4, "",
|
|
[]unit_model.Type{unit_model.TypePullRequests, unit_model.TypeIssues}, nil,
|
|
[]*files_service.ChangeRepoFile{},
|
|
)
|
|
defer f()
|
|
|
|
issue := createIssue(t, user4, repo, "Issue with | in title", "Hey here's a | for you")
|
|
|
|
_, err := issue_service.CreateIssueComment(t.Context(), user4, repo, issue, "Comment with a | in it", nil)
|
|
require.NoError(t, err)
|
|
|
|
testIssueClose(t, sess, repo.OwnerName, repo.Name, strconv.Itoa(int(issue.Index)), false)
|
|
|
|
response := sess.MakeRequest(t, NewRequest(t, "GET", "/"), http.StatusOK)
|
|
htmlDoc := NewHTMLParser(t, response.Body)
|
|
|
|
count := 0
|
|
htmlDoc.doc.Find("#activity-feed .flex-item-main .title").Each(func(i int, s *goquery.Selection) {
|
|
count++
|
|
assert.Equal(t, "Issue with | in title", s.Text())
|
|
})
|
|
htmlDoc.doc.Find("#activity-feed .flex-item-main .markup").Each(func(i int, s *goquery.Selection) {
|
|
count++
|
|
assert.Equal(t, "Comment with a | in it\n", s.Text())
|
|
})
|
|
|
|
assert.Equal(t, 4, count)
|
|
})
|
|
}
|
|
|
|
func TestDashboardReviewWorkflows(t *testing.T) {
|
|
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
|
user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
|
|
sess := loginUser(t, user4.Name)
|
|
|
|
repo, _, f := tests.CreateDeclarativeRepo(t, user4, "",
|
|
[]unit_model.Type{unit_model.TypePullRequests, unit_model.TypeIssues}, nil,
|
|
[]*files_service.ChangeRepoFile{},
|
|
)
|
|
defer f()
|
|
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
|
|
require.NoError(t, err)
|
|
|
|
pr := createPullRequest(t, user4, repo, "testing", "My very first PR!")
|
|
|
|
review, _, err := pr_service.SubmitReview(t.Context(), user4, gitRepo, pr.Issue, issues.ReviewTypeReject, "This isn't good enough!", "HEAD", []string{})
|
|
require.NoError(t, err)
|
|
|
|
_, err = pr_service.DismissReview(t.Context(), review.ID, repo.ID, "Come on, give the newbie a break!", user4, true, true)
|
|
require.NoError(t, err)
|
|
|
|
response := sess.MakeRequest(t, NewRequest(t, "GET", "/"), http.StatusOK)
|
|
htmlDoc := NewHTMLParser(t, response.Body)
|
|
|
|
count := 0
|
|
htmlDoc.doc.Find("#activity-feed .flex-item-main .title").Each(func(i int, s *goquery.Selection) {
|
|
count++
|
|
assert.Equal(t, "My very first PR!", s.Text())
|
|
})
|
|
htmlDoc.doc.Find("#activity-feed .flex-item-main .flex-item-body").Each(func(i int, s *goquery.Selection) {
|
|
count++
|
|
if s.Text() != "Reason:" && s.Text() != "Come on, give the newbie a break!" {
|
|
assert.Fail(t, "Unexpected feed text", "Expected 'Reason:' and reason explanation, but found: %q", s.Text())
|
|
}
|
|
})
|
|
|
|
assert.Equal(t, 4, count)
|
|
})
|
|
}
|