mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-25 14:55:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request '[v7.0/forgejo] test: coverage for /repos/{owner}/{repo}/issues?project=' (#4219) from bp-v7.0/forgejo-b18ba81 into v7.0/forgejo

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4219
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
This commit is contained in:
Earl Warren 2024-06-23 20:20:04 +00:00
commit 637d6d5c5f
2 changed files with 58 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/indexer/issues/dboptions.go
View file

@ -38,6 +38,12 @@ func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOp
searchOpt.MilestoneIDs = opts.MilestoneIDs
}
if opts.ProjectID > 0 {
searchOpt.ProjectID = optional.Some(opts.ProjectID)
} else if opts.ProjectID == -1 { // FIXME: this is inconsistent from other places
searchOpt.ProjectID = optional.Some[int64](0) // Those issues with no project(projectid==0)
}
// See the comment of issues_model.SearchOptions for the reason why we need to convert
convertID := func(id int64) optional.Option[int64] {
if id > 0 {
@ -49,7 +55,6 @@ func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOp
return nil
}
searchOpt.ProjectID = convertID(opts.ProjectID)
searchOpt.ProjectBoardID = convertID(opts.ProjectBoardID)
searchOpt.PosterID = convertID(opts.PosterID)
searchOpt.AssigneeID = convertID(opts.AssigneeID)

52
tests/integration/issue_test.go
View file

@ -17,6 +17,7 @@ import (
"code.gitea.io/gitea/models/db"
issues_model "code.gitea.io/gitea/models/issues"
project_model "code.gitea.io/gitea/models/project"
repo_model "code.gitea.io/gitea/models/repo"
unit_model "code.gitea.io/gitea/models/unit"
"code.gitea.io/gitea/models/unittest"
@ -121,6 +122,57 @@ func TestViewIssuesKeyword(t *testing.T) {
})
}
func TestViewIssuesSearchOptions(t *testing.T) {
defer tests.PrepareTestEnv(t)()
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
// there are two issues in repo1, both bound to a project. Add one
// that is not bound to any project.
_, issueNoProject := testIssueWithBean(t, "user2", 1, "Title", "Description")
t.Run("All issues", func(t *testing.T) {
req := NewRequestf(t, "GET", "%s/issues?state=all", repo.Link())
resp := MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
issuesSelection := getIssuesSelection(t, htmlDoc)
assert.EqualValues(t, 3, issuesSelection.Length())
})
t.Run("Issues with no project", func(t *testing.T) {
req := NewRequestf(t, "GET", "%s/issues?state=all&project=-1", repo.Link())
resp := MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
issuesSelection := getIssuesSelection(t, htmlDoc)
assert.EqualValues(t, 1, issuesSelection.Length())
issuesSelection.Each(func(_ int, selection *goquery.Selection) {
issue := getIssue(t, repo.ID, selection)
assert.Equal(t, issueNoProject.ID, issue.ID)
})
})
t.Run("Issues with a specific project", func(t *testing.T) {
project := unittest.AssertExistsAndLoadBean(t, &project_model.Project{ID: 1})
req := NewRequestf(t, "GET", "%s/issues?state=all&project=%d", repo.Link(), project.ID)
resp := MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
issuesSelection := getIssuesSelection(t, htmlDoc)
assert.EqualValues(t, 2, issuesSelection.Length())
found := map[int64]bool{
1: false,
5: false,
}
issuesSelection.Each(func(_ int, selection *goquery.Selection) {
issue := getIssue(t, repo.ID, selection)
found[issue.ID] = true
})
assert.EqualValues(t, 2, len(found))
assert.True(t, found[1])
assert.True(t, found[5])
})
}
func TestNoLoginViewIssue(t *testing.T) {
defer tests.PrepareTestEnv(t)()