troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-23 11:01:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request '[BUG] Use correct SHA in GetCommitPullRequest' (#4377) from gusted/commit-to-pull into forgejo

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4377
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
This commit is contained in:
Earl Warren 2024-07-06 20:59:18 +00:00
commit 3ff661fe9e
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
routers/api/v1/repo/commits.go
View file

@ -354,7 +354,7 @@ func GetCommitPullRequest(ctx *context.APIContext) {
// "404":
// "$ref": "#/responses/notFound"
pr, err := issues_model.GetPullRequestByMergedCommit(ctx, ctx.Repo.Repository.ID, ctx.Params(":sha"))
pr, err := issues_model.GetPullRequestByMergedCommit(ctx, ctx.Repo.Repository.ID, ctx.Params("ref"))
if err != nil {
if issues_model.IsErrPullRequestNotExist(err) {
ctx.Error(http.StatusNotFound, "GetPullRequestByMergedCommit", err)

14
tests/integration/api_repo_test.go
View file

@ -749,3 +749,17 @@ func TestAPIViewRepoObjectFormat(t *testing.T) {
DecodeJSON(t, resp, &repo)
assert.EqualValues(t, "sha1", repo.ObjectFormatName)
}
func TestAPIRepoCommitPull(t *testing.T) {
defer tests.PrepareTestEnv(t)()
var pr api.PullRequest
req := NewRequest(t, "GET", "/api/v1/repos/user2/repo1/commits/1a8823cd1a9549fde083f992f6b9b87a7ab74fb3/pull")
resp := MakeRequest(t, req, http.StatusOK)
DecodeJSON(t, resp, &pr)
assert.EqualValues(t, 1, pr.ID)
req = NewRequest(t, "GET", "/api/v1/repos/user2/repo1/commits/not-a-commit/pull")
MakeRequest(t, req, http.StatusNotFound)
}