Mirrors
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Keep "non-existent branch" HTTP responses consistent

This commit is contained in:
Kemal Zebari 2024-11-17 21:34:07 -08:00
parent 1ad8de7ac7
commit e4f7307511
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
routers/api/v1/repo/branch.go
View File

@ -462,7 +462,7 @@ func UpdateBranch(ctx *context.APIContext) {
return return
} }
if msg == "from_not_exist" { if msg == "from_not_exist" {
ctx.Error(http.StatusUnprocessableEntity, "", "Branch doesn't exist.") ctx.Error(http.StatusNotFound, "", "Branch doesn't exist.")
return return
} }
} else { } else {
@ -474,7 +474,7 @@ func UpdateBranch(ctx *context.APIContext) {
if git.IsErrBranchNotExist(err) { if git.IsErrBranchNotExist(err) {
// This could occur if the client passes a non-existent branch and we // This could occur if the client passes a non-existent branch and we
// skip executing the branch that contains the RenameBranch() call. // skip executing the branch that contains the RenameBranch() call.
ctx.NotFound(err) ctx.Error(http.StatusNotFound, "", "Branch doesn't exist.")
return return
} }
ctx.Error(http.StatusInternalServerError, "GetBranch", err) ctx.Error(http.StatusInternalServerError, "GetBranch", err)

2
tests/integration/api_branch_test.go
View File

@ -201,7 +201,7 @@ func TestAPIUpdateBranch(t *testing.T) {
assert.Contains(t, resp.Body.String(), "Cannot rename a branch using the same name or rename to a branch that already exists.") assert.Contains(t, resp.Body.String(), "Cannot rename a branch using the same name or rename to a branch that already exists.")
}) })
t.Run("UpdateBranchWithNonExistentBranch", func(t *testing.T) { t.Run("UpdateBranchWithNonExistentBranch", func(t *testing.T) {
resp := testAPIUpdateBranch(t, "user2", "repo1", "i-dont-exist", "new-branch-name", http.StatusUnprocessableEntity) resp := testAPIUpdateBranch(t, "user2", "repo1", "i-dont-exist", "new-branch-name", http.StatusNotFound)
assert.Contains(t, resp.Body.String(), "Branch doesn't exist.") assert.Contains(t, resp.Body.String(), "Branch doesn't exist.")
}) })
t.Run("UpdateBranchWithEmptyStringAsNewName", func(t *testing.T) { t.Run("UpdateBranchWithEmptyStringAsNewName", func(t *testing.T) {