mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-07-25 19:07:59 +00:00
This PR fixes the issue https://codeberg.org/forgejo/forgejo/issues/10359 ## 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... - [x] 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. - [ ] 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. - [ ] 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. <!--start release-notes-assistant--> ## Release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - Bug fixes - [PR](https://codeberg.org/forgejo/forgejo/pulls/10387): <!--number 10387 --><!--line 0 --><!--description Zml4KDEwMzU5KTogQ291bnQgcmVsZWFzZXMgY29ycmVjdGx5IHdoZW4gdXNpbmcgZmlsdGVycyAocSk=-->fix(10359): Count releases correctly when using filters (q)<!--description--> <!--end release-notes-assistant--> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/10387 Reviewed-by: Mathieu Fenniak <mfenniak@noreply.codeberg.org> Co-authored-by: Rodrigo Villablanca <villa061004@gmail.com> Co-committed-by: Rodrigo Villablanca <villa061004@gmail.com>
173 lines
4.5 KiB
Go
173 lines
4.5 KiB
Go
// Copyright 2017 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package repo
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"forgejo.org/models/db"
|
|
repo_model "forgejo.org/models/repo"
|
|
"forgejo.org/models/unit"
|
|
"forgejo.org/models/unittest"
|
|
"forgejo.org/modules/web"
|
|
"forgejo.org/services/contexttest"
|
|
"forgejo.org/services/forms"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestNewReleasePost(t *testing.T) {
|
|
for _, testCase := range []struct {
|
|
RepoID int64
|
|
UserID int64
|
|
TagName string
|
|
Form forms.NewReleaseForm
|
|
}{
|
|
{
|
|
RepoID: 1,
|
|
UserID: 2,
|
|
TagName: "v1.1", // pre-existing tag
|
|
Form: forms.NewReleaseForm{
|
|
TagName: "newtag",
|
|
Target: "master",
|
|
Title: "title",
|
|
Content: "content",
|
|
},
|
|
},
|
|
{
|
|
RepoID: 1,
|
|
UserID: 2,
|
|
TagName: "newtag",
|
|
Form: forms.NewReleaseForm{
|
|
TagName: "newtag",
|
|
Target: "master",
|
|
Title: "title",
|
|
Content: "content",
|
|
},
|
|
},
|
|
} {
|
|
unittest.PrepareTestEnv(t)
|
|
|
|
ctx, _ := contexttest.MockContext(t, "user2/repo1/releases/new")
|
|
contexttest.LoadUser(t, ctx, 2)
|
|
contexttest.LoadRepo(t, ctx, 1)
|
|
contexttest.LoadGitRepo(t, ctx)
|
|
web.SetForm(ctx, &testCase.Form)
|
|
NewReleasePost(ctx)
|
|
unittest.AssertExistsAndLoadBean(t, &repo_model.Release{
|
|
RepoID: 1,
|
|
PublisherID: 2,
|
|
TagName: testCase.Form.TagName,
|
|
Target: testCase.Form.Target,
|
|
Title: testCase.Form.Title,
|
|
Note: testCase.Form.Content,
|
|
}, unittest.Cond("is_draft=?", len(testCase.Form.Draft) > 0))
|
|
ctx.Repo.GitRepo.Close()
|
|
}
|
|
}
|
|
|
|
func TestCalReleaseNumCommitsBehind(t *testing.T) {
|
|
unittest.PrepareTestEnv(t)
|
|
ctx, _ := contexttest.MockContext(t, "user2/repo-release/releases")
|
|
contexttest.LoadUser(t, ctx, 2)
|
|
contexttest.LoadRepo(t, ctx, 57)
|
|
contexttest.LoadGitRepo(t, ctx)
|
|
t.Cleanup(func() { ctx.Repo.GitRepo.Close() })
|
|
|
|
releases, err := db.Find[repo_model.Release](ctx, repo_model.FindReleasesOptions{
|
|
IncludeDrafts: ctx.Repo.CanWrite(unit.TypeReleases),
|
|
RepoID: ctx.Repo.Repository.ID,
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
countCache := make(map[string]int64)
|
|
for _, release := range releases {
|
|
err := calReleaseNumCommitsBehind(ctx.Repo, release, countCache)
|
|
require.NoError(t, err)
|
|
}
|
|
|
|
type computedFields struct {
|
|
NumCommitsBehind int64
|
|
TargetBehind string
|
|
}
|
|
expectedComputation := map[string]computedFields{
|
|
"v1.0": {
|
|
NumCommitsBehind: 3,
|
|
TargetBehind: "main",
|
|
},
|
|
"v1.1": {
|
|
NumCommitsBehind: 1,
|
|
TargetBehind: "main",
|
|
},
|
|
"v2.0": {
|
|
NumCommitsBehind: 0,
|
|
TargetBehind: "main",
|
|
},
|
|
"non-existing-target-branch": {
|
|
NumCommitsBehind: 1,
|
|
TargetBehind: "main",
|
|
},
|
|
"empty-target-branch": {
|
|
NumCommitsBehind: 1,
|
|
TargetBehind: "main",
|
|
},
|
|
}
|
|
for _, r := range releases {
|
|
actual := computedFields{
|
|
NumCommitsBehind: r.NumCommitsBehind,
|
|
TargetBehind: r.TargetBehind,
|
|
}
|
|
assert.Equal(t, expectedComputation[r.TagName], actual, "wrong computed fields for %s: %#v", r.TagName, r)
|
|
}
|
|
}
|
|
|
|
func Test_getReleaseInfos(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
listOptions db.ListOptions
|
|
expectedRepoCount int
|
|
expectedCount int64
|
|
}{
|
|
{
|
|
name: "page 1 with page size 1",
|
|
listOptions: db.ListOptions{Page: 1, PageSize: 1},
|
|
expectedRepoCount: 1,
|
|
expectedCount: 3,
|
|
},
|
|
{
|
|
name: "page 1 with page size 10",
|
|
listOptions: db.ListOptions{Page: 1, PageSize: 10},
|
|
expectedRepoCount: 3,
|
|
expectedCount: 3,
|
|
},
|
|
{
|
|
name: "list all",
|
|
listOptions: db.ListOptions{ListAll: true},
|
|
expectedRepoCount: 3,
|
|
expectedCount: 3,
|
|
},
|
|
}
|
|
|
|
unittest.PrepareTestEnv(t)
|
|
ctx, _ := contexttest.MockContext(t, "user1/repo-release/releases")
|
|
contexttest.LoadRepo(t, ctx, 1)
|
|
contexttest.LoadGitRepo(t, ctx)
|
|
assert.NoError(t, db.Insert(ctx, &repo_model.Release{RepoID: ctx.Repo.Repository.ID, Title: "myrel 1", TagName: "myrel_v1.0"}))
|
|
assert.NoError(t, db.Insert(ctx, &repo_model.Release{RepoID: ctx.Repo.Repository.ID, Title: "myrel 2", TagName: "myrel_v2.0"}))
|
|
assert.NoError(t, db.Insert(ctx, &repo_model.Release{RepoID: ctx.Repo.Repository.ID, Title: "myrel 3", TagName: ""}))
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
repos, count, err := getReleaseInfos(ctx, &repo_model.FindReleasesOptions{
|
|
RepoID: ctx.Repo.Repository.ID,
|
|
Keyword: "myrel",
|
|
ListOptions: tc.listOptions,
|
|
})
|
|
require.NoError(t, err)
|
|
assert.Len(t, repos, tc.expectedRepoCount)
|
|
assert.Equal(t, tc.expectedCount, count)
|
|
})
|
|
}
|
|
}
|