From d8dbf6a9e502aa835bdda57ae1a4ae3b70e10c96 Mon Sep 17 00:00:00 2001 From: Kemal Zebari Date: Tue, 5 Nov 2024 23:47:46 -0800 Subject: [PATCH 1/8] Implement rename branch API Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com> --- modules/structs/repo.go | 10 ++++ routers/api/v1/api.go | 1 + routers/api/v1/repo/branch.go | 89 ++++++++++++++++++++++++++++ routers/api/v1/swagger/options.go | 2 + templates/swagger/v1_json.tmpl | 75 +++++++++++++++++++++++ tests/integration/api_branch_test.go | 28 +++++++++ 6 files changed, 205 insertions(+) diff --git a/modules/structs/repo.go b/modules/structs/repo.go index 832ffa8bcc958..9015f6fbaa744 100644 --- a/modules/structs/repo.go +++ b/modules/structs/repo.go @@ -278,6 +278,16 @@ type CreateBranchRepoOption struct { OldRefName string `json:"old_ref_name" binding:"GitRefName;MaxSize(100)"` } +// RenameBranchOption options when rename a branch in a repository +// swagger:model +type RenameBranchRepoOption struct { + // New branch name + // + // required: true + // unique: true + NewName string `json:"new_name" binding:"Required;GitRefName;MaxSize(100)"` +} + // TransferRepoOption options when transfer a repository's ownership // swagger:model type TransferRepoOption struct { diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index f28ee980e1043..328108f2daae8 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -1195,6 +1195,7 @@ func Routes() *web.Router { m.Get("/*", repo.GetBranch) m.Delete("/*", reqToken(), reqRepoWriter(unit.TypeCode), mustNotBeArchived, repo.DeleteBranch) m.Post("", reqToken(), reqRepoWriter(unit.TypeCode), mustNotBeArchived, bind(api.CreateBranchRepoOption{}), repo.CreateBranch) + m.Post("/{name}/rename", tokenRequiresScopes(auth_model.AccessTokenScopeCategoryRepository), reqRepoWriter(unit.TypeCode), bind(api.RenameBranchRepoOption{}), repo.RenameBranch) }, context.ReferencesGitRepo(), reqRepoReader(unit.TypeCode)) m.Group("/branch_protections", func() { m.Get("", repo.ListBranchProtections) diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index 53f3b4648a592..03bc83864194d 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -386,6 +386,95 @@ func ListBranches(ctx *context.APIContext) { ctx.JSON(http.StatusOK, apiBranches) } +// RenameBranch renames a repository's branch. +func RenameBranch(ctx *context.APIContext) { + // swagger:operation POST /repos/{owner}/{repo}/branches/{name}/rename repository repoRenameBranch + // --- + // summary: Rename a branch + // consumes: + // - application/json + // produces: + // - application/json + // parameters: + // - name: owner + // in: path + // description: owner of the repo + // type: string + // required: true + // - name: repo + // in: path + // description: name of the repo + // type: string + // required: true + // - name: name + // in: path + // description: original name of the branch + // type: string + // required: true + // - name: body + // in: body + // schema: + // "$ref": "#/definitions/RenameBranchRepoOption" + // responses: + // "201": + // "$ref": "#/responses/Branch" + // "403": + // "$ref": "#/responses/forbidden" + // "404": + // "$ref": "#/responses/notFound" + // "422": + // "$ref": "#/responses/validationError" + + opt := web.GetForm(ctx).(*api.RenameBranchRepoOption) + repo := ctx.Repo.Repository + + if repo.IsEmpty { + ctx.Error(http.StatusNotFound, "", "Git Repository is empty.") + return + } + + if repo.IsMirror { + ctx.Error(http.StatusForbidden, "", "Git Repository is a mirror.") + return + } + + msg, err := repo_service.RenameBranch(ctx, repo, ctx.Doer, ctx.Repo.GitRepo, ctx.PathParam("name"), opt.NewName) + if err != nil { + ctx.Error(http.StatusInternalServerError, "RenameBranch", err) + return + } + if msg != "" { + ctx.Error(http.StatusUnprocessableEntity, "", msg) + return + } + + branch, err := ctx.Repo.GitRepo.GetBranch(opt.NewName) + if err != nil { + ctx.Error(http.StatusInternalServerError, "GetBranch", err) + return + } + + commit, err := branch.GetCommit() + if err != nil { + ctx.Error(http.StatusInternalServerError, "GetCommit", err) + return + } + + pb, err := git_model.GetFirstMatchProtectedBranchRule(ctx, repo.ID, branch.Name) + if err != nil { + ctx.Error(http.StatusInternalServerError, "GetFirstMatchProtectedBranchRule", err) + return + } + + br, err := convert.ToBranch(ctx, repo, opt.NewName, commit, pb, ctx.Doer, ctx.Repo.IsAdmin()) + if err != nil { + ctx.Error(http.StatusInternalServerError, "convert.ToBranch", err) + return + } + + ctx.JSON(http.StatusCreated, br) +} + // GetBranchProtection gets a branch protection func GetBranchProtection(ctx *context.APIContext) { // swagger:operation GET /repos/{owner}/{repo}/branch_protections/{name} repository repoGetBranchProtection diff --git a/routers/api/v1/swagger/options.go b/routers/api/v1/swagger/options.go index 39c98c666e545..5e3ba10822863 100644 --- a/routers/api/v1/swagger/options.go +++ b/routers/api/v1/swagger/options.go @@ -90,6 +90,8 @@ type swaggerParameterBodies struct { // in:body EditRepoOption api.EditRepoOption // in:body + RenameBranchReopOption api.RenameBranchRepoOption + // in:body TransferRepoOption api.TransferRepoOption // in:body CreateForkOption api.CreateForkOption diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index c06c0ad1541c2..2c3e3220e252b 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -5047,6 +5047,65 @@ } } }, + "/repos/{owner}/{repo}/branches/{name}/rename": { + "post": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "summary": "Rename a branch", + "operationId": "repoRenameBranch", + "parameters": [ + { + "type": "string", + "description": "owner of the repo", + "name": "owner", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "name of the repo", + "name": "repo", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "original name of the branch", + "name": "name", + "in": "path", + "required": true + }, + { + "name": "body", + "in": "body", + "schema": { + "$ref": "#/definitions/RenameBranchRepoOption" + } + } + ], + "responses": { + "201": { + "$ref": "#/responses/Branch" + }, + "403": { + "$ref": "#/responses/forbidden" + }, + "404": { + "$ref": "#/responses/notFound" + }, + "422": { + "$ref": "#/responses/validationError" + } + } + } + }, "/repos/{owner}/{repo}/collaborators": { "get": { "produces": [ @@ -24072,6 +24131,22 @@ }, "x-go-package": "code.gitea.io/gitea/modules/structs" }, + "RenameBranchRepoOption": { + "description": "RenameBranchOption options when rename a branch in a repository", + "type": "object", + "required": [ + "new_name" + ], + "properties": { + "new_name": { + "description": "New branch name", + "type": "string", + "uniqueItems": true, + "x-go-name": "NewName" + } + }, + "x-go-package": "code.gitea.io/gitea/modules/structs" + }, "RenameUserOption": { "description": "RenameUserOption options when renaming a user", "type": "object", diff --git a/tests/integration/api_branch_test.go b/tests/integration/api_branch_test.go index 8e49516aa7220..d4d6f850fb7fe 100644 --- a/tests/integration/api_branch_test.go +++ b/tests/integration/api_branch_test.go @@ -186,6 +186,34 @@ func testAPICreateBranch(t testing.TB, session *TestSession, user, repo, oldBran return resp.Result().StatusCode == status } +func TestAPIRenameBranch(t *testing.T) { + onGiteaRun(t, func(t *testing.T, _ *url.URL) { + t.Run("RenameBranchWithEmptyRepo", func(t *testing.T) { + testAPIRenameBranch(t, "user10", "repo6", "master", "test", http.StatusNotFound) + }) + t.Run("RenameBranchWithSameBranchNames", func(t *testing.T) { + testAPIRenameBranch(t, "user2", "repo1", "master", "master", http.StatusUnprocessableEntity) + }) + t.Run("RenameBranchWithBranchThatAlreadyExists", func(t *testing.T) { + testAPIRenameBranch(t, "user2", "repo1", "master", "branch2", http.StatusUnprocessableEntity) + }) + t.Run("RenameBranchWithNonExistentBranch", func(t *testing.T) { + testAPIRenameBranch(t, "user2", "repo1", "i-dont-exist", "branch2", http.StatusUnprocessableEntity) + }) + t.Run("RenameBranchNormalScenario", func(t *testing.T) { + testAPIRenameBranch(t, "user2", "repo1", "branch2", "new-branch-name", http.StatusCreated) + }) + }) +} + +func testAPIRenameBranch(t *testing.T, ownerName, repoName, from, to string, expectedHTTPStatus int) { + token := getUserToken(t, ownerName, auth_model.AccessTokenScopeWriteRepository) + req := NewRequestWithJSON(t, "POST", "api/v1/repos/"+ownerName+"/"+repoName+"/branches/"+from+"/rename", &api.RenameBranchRepoOption{ + NewName: to, + }).AddTokenAuth(token) + MakeRequest(t, req, expectedHTTPStatus) +} + func TestAPIBranchProtection(t *testing.T) { defer tests.PrepareTestEnv(t)() From 591580a25f4c4216a4fbd92f18d7fd50f418c50d Mon Sep 17 00:00:00 2001 From: Kemal Zebari Date: Sat, 16 Nov 2024 17:20:09 -0800 Subject: [PATCH 2/8] Move old branch name to request body --- modules/structs/repo.go | 5 ++ routers/api/v1/api.go | 2 +- routers/api/v1/repo/branch.go | 9 +-- templates/swagger/v1_json.tmpl | 92 ++++++++++++++-------------- tests/integration/api_branch_test.go | 3 +- 5 files changed, 56 insertions(+), 55 deletions(-) diff --git a/modules/structs/repo.go b/modules/structs/repo.go index 9015f6fbaa744..c06044e95e749 100644 --- a/modules/structs/repo.go +++ b/modules/structs/repo.go @@ -281,6 +281,11 @@ type CreateBranchRepoOption struct { // RenameBranchOption options when rename a branch in a repository // swagger:model type RenameBranchRepoOption struct { + // Old branch name + // + // required: true + // unique: true + OldName string `json:"old_name" binding:"Required;GitRefName;MaxSize(100)"` // New branch name // // required: true diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 328108f2daae8..215c8dba27572 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -1195,7 +1195,7 @@ func Routes() *web.Router { m.Get("/*", repo.GetBranch) m.Delete("/*", reqToken(), reqRepoWriter(unit.TypeCode), mustNotBeArchived, repo.DeleteBranch) m.Post("", reqToken(), reqRepoWriter(unit.TypeCode), mustNotBeArchived, bind(api.CreateBranchRepoOption{}), repo.CreateBranch) - m.Post("/{name}/rename", tokenRequiresScopes(auth_model.AccessTokenScopeCategoryRepository), reqRepoWriter(unit.TypeCode), bind(api.RenameBranchRepoOption{}), repo.RenameBranch) + m.Post("/rename", tokenRequiresScopes(auth_model.AccessTokenScopeCategoryRepository), reqRepoWriter(unit.TypeCode), bind(api.RenameBranchRepoOption{}), repo.RenameBranch) }, context.ReferencesGitRepo(), reqRepoReader(unit.TypeCode)) m.Group("/branch_protections", func() { m.Get("", repo.ListBranchProtections) diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index 03bc83864194d..c6d16809cd56a 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -388,7 +388,7 @@ func ListBranches(ctx *context.APIContext) { // RenameBranch renames a repository's branch. func RenameBranch(ctx *context.APIContext) { - // swagger:operation POST /repos/{owner}/{repo}/branches/{name}/rename repository repoRenameBranch + // swagger:operation POST /repos/{owner}/{repo}/branches/rename repository repoRenameBranch // --- // summary: Rename a branch // consumes: @@ -406,11 +406,6 @@ func RenameBranch(ctx *context.APIContext) { // description: name of the repo // type: string // required: true - // - name: name - // in: path - // description: original name of the branch - // type: string - // required: true // - name: body // in: body // schema: @@ -438,7 +433,7 @@ func RenameBranch(ctx *context.APIContext) { return } - msg, err := repo_service.RenameBranch(ctx, repo, ctx.Doer, ctx.Repo.GitRepo, ctx.PathParam("name"), opt.NewName) + msg, err := repo_service.RenameBranch(ctx, repo, ctx.Doer, ctx.Repo.GitRepo, opt.OldName, opt.NewName) if err != nil { ctx.Error(http.StatusInternalServerError, "RenameBranch", err) return diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 2c3e3220e252b..e320404c4d2d1 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -4957,16 +4957,19 @@ } } }, - "/repos/{owner}/{repo}/branches/{branch}": { - "get": { + "/repos/{owner}/{repo}/branches/rename": { + "post": { + "consumes": [ + "application/json" + ], "produces": [ "application/json" ], "tags": [ "repository" ], - "summary": "Retrieve a specific branch from a repository, including its effective branch protection", - "operationId": "repoGetBranch", + "summary": "Rename a branch", + "operationId": "repoRenameBranch", "parameters": [ { "type": "string", @@ -4983,31 +4986,39 @@ "required": true }, { - "type": "string", - "description": "branch to get", - "name": "branch", - "in": "path", - "required": true + "name": "body", + "in": "body", + "schema": { + "$ref": "#/definitions/RenameBranchRepoOption" + } } ], "responses": { - "200": { + "201": { "$ref": "#/responses/Branch" }, + "403": { + "$ref": "#/responses/forbidden" + }, "404": { "$ref": "#/responses/notFound" + }, + "422": { + "$ref": "#/responses/validationError" } } - }, - "delete": { + } + }, + "/repos/{owner}/{repo}/branches/{branch}": { + "get": { "produces": [ "application/json" ], "tags": [ "repository" ], - "summary": "Delete a specific branch from a repository", - "operationId": "repoDeleteBranch", + "summary": "Retrieve a specific branch from a repository, including its effective branch protection", + "operationId": "repoGetBranch", "parameters": [ { "type": "string", @@ -5025,41 +5036,30 @@ }, { "type": "string", - "description": "branch to delete", + "description": "branch to get", "name": "branch", "in": "path", "required": true } ], "responses": { - "204": { - "$ref": "#/responses/empty" - }, - "403": { - "$ref": "#/responses/error" + "200": { + "$ref": "#/responses/Branch" }, "404": { "$ref": "#/responses/notFound" - }, - "423": { - "$ref": "#/responses/repoArchivedError" } } - } - }, - "/repos/{owner}/{repo}/branches/{name}/rename": { - "post": { - "consumes": [ - "application/json" - ], + }, + "delete": { "produces": [ "application/json" ], "tags": [ "repository" ], - "summary": "Rename a branch", - "operationId": "repoRenameBranch", + "summary": "Delete a specific branch from a repository", + "operationId": "repoDeleteBranch", "parameters": [ { "type": "string", @@ -5077,31 +5077,24 @@ }, { "type": "string", - "description": "original name of the branch", - "name": "name", + "description": "branch to delete", + "name": "branch", "in": "path", "required": true - }, - { - "name": "body", - "in": "body", - "schema": { - "$ref": "#/definitions/RenameBranchRepoOption" - } } ], "responses": { - "201": { - "$ref": "#/responses/Branch" + "204": { + "$ref": "#/responses/empty" }, "403": { - "$ref": "#/responses/forbidden" + "$ref": "#/responses/error" }, "404": { "$ref": "#/responses/notFound" }, - "422": { - "$ref": "#/responses/validationError" + "423": { + "$ref": "#/responses/repoArchivedError" } } } @@ -24135,6 +24128,7 @@ "description": "RenameBranchOption options when rename a branch in a repository", "type": "object", "required": [ + "old_name", "new_name" ], "properties": { @@ -24143,6 +24137,12 @@ "type": "string", "uniqueItems": true, "x-go-name": "NewName" + }, + "old_name": { + "description": "Old branch name", + "type": "string", + "uniqueItems": true, + "x-go-name": "OldName" } }, "x-go-package": "code.gitea.io/gitea/modules/structs" diff --git a/tests/integration/api_branch_test.go b/tests/integration/api_branch_test.go index d4d6f850fb7fe..d1469035a8c52 100644 --- a/tests/integration/api_branch_test.go +++ b/tests/integration/api_branch_test.go @@ -208,7 +208,8 @@ func TestAPIRenameBranch(t *testing.T) { func testAPIRenameBranch(t *testing.T, ownerName, repoName, from, to string, expectedHTTPStatus int) { token := getUserToken(t, ownerName, auth_model.AccessTokenScopeWriteRepository) - req := NewRequestWithJSON(t, "POST", "api/v1/repos/"+ownerName+"/"+repoName+"/branches/"+from+"/rename", &api.RenameBranchRepoOption{ + req := NewRequestWithJSON(t, "POST", "api/v1/repos/"+ownerName+"/"+repoName+"/branches/rename", &api.RenameBranchRepoOption{ + OldName: from, NewName: to, }).AddTokenAuth(token) MakeRequest(t, req, expectedHTTPStatus) From 577b3dd876e1d49b25495d097375735dde9dc20c Mon Sep 17 00:00:00 2001 From: Kemal Zebari Date: Sun, 17 Nov 2024 21:11:20 -0800 Subject: [PATCH 3/8] Reimplement as PATCH /branches/* endpoint Co-authored-by: wxiaoguang --- modules/structs/repo.go | 12 +-- routers/api/v1/api.go | 2 +- routers/api/v1/repo/branch.go | 51 ++++++++---- routers/api/v1/swagger/options.go | 2 +- templates/swagger/v1_json.tmpl | 118 +++++++++++++-------------- tests/integration/api_branch_test.go | 51 ++++++++---- 6 files changed, 130 insertions(+), 106 deletions(-) diff --git a/modules/structs/repo.go b/modules/structs/repo.go index c06044e95e749..239b1e22d8b54 100644 --- a/modules/structs/repo.go +++ b/modules/structs/repo.go @@ -278,19 +278,13 @@ type CreateBranchRepoOption struct { OldRefName string `json:"old_ref_name" binding:"GitRefName;MaxSize(100)"` } -// RenameBranchOption options when rename a branch in a repository +// UpdateBranchRepoOption options when updating a branch in a repository // swagger:model -type RenameBranchRepoOption struct { - // Old branch name - // - // required: true - // unique: true - OldName string `json:"old_name" binding:"Required;GitRefName;MaxSize(100)"` +type UpdateBranchRepoOption struct { // New branch name // - // required: true // unique: true - NewName string `json:"new_name" binding:"Required;GitRefName;MaxSize(100)"` + Name string `json:"name" binding:"GitRefName;MaxSize(100)"` } // TransferRepoOption options when transfer a repository's ownership diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 215c8dba27572..96365e7c14dfc 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -1195,7 +1195,7 @@ func Routes() *web.Router { m.Get("/*", repo.GetBranch) m.Delete("/*", reqToken(), reqRepoWriter(unit.TypeCode), mustNotBeArchived, repo.DeleteBranch) m.Post("", reqToken(), reqRepoWriter(unit.TypeCode), mustNotBeArchived, bind(api.CreateBranchRepoOption{}), repo.CreateBranch) - m.Post("/rename", tokenRequiresScopes(auth_model.AccessTokenScopeCategoryRepository), reqRepoWriter(unit.TypeCode), bind(api.RenameBranchRepoOption{}), repo.RenameBranch) + m.Patch("/*", reqToken(), reqRepoWriter(unit.TypeCode), mustNotBeArchived, bind(api.UpdateBranchRepoOption{}), repo.UpdateBranch) }, context.ReferencesGitRepo(), reqRepoReader(unit.TypeCode)) m.Group("/branch_protections", func() { m.Get("", repo.ListBranchProtections) diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index c6d16809cd56a..56b20f05b1a6e 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -386,11 +386,11 @@ func ListBranches(ctx *context.APIContext) { ctx.JSON(http.StatusOK, apiBranches) } -// RenameBranch renames a repository's branch. -func RenameBranch(ctx *context.APIContext) { - // swagger:operation POST /repos/{owner}/{repo}/branches/rename repository repoRenameBranch +// UpdateBranch renames a repository's branch. +func UpdateBranch(ctx *context.APIContext) { + // swagger:operation PATCH /repos/{owner}/{repo}/branches/{branch} repository repoUpdateBranch // --- - // summary: Rename a branch + // summary: Update a branch // consumes: // - application/json // produces: @@ -406,12 +406,16 @@ func RenameBranch(ctx *context.APIContext) { // description: name of the repo // type: string // required: true + // - name: branch + // in: path + // description: name of the branch + // type: string // - name: body // in: body // schema: - // "$ref": "#/definitions/RenameBranchRepoOption" + // "$ref": "#/definitions/UpdateBranchRepoOption" // responses: - // "201": + // "200": // "$ref": "#/responses/Branch" // "403": // "$ref": "#/responses/forbidden" @@ -420,7 +424,9 @@ func RenameBranch(ctx *context.APIContext) { // "422": // "$ref": "#/responses/validationError" - opt := web.GetForm(ctx).(*api.RenameBranchRepoOption) + opt := web.GetForm(ctx).(*api.UpdateBranchRepoOption) + + oldName := ctx.PathParam("*") repo := ctx.Repo.Repository if repo.IsEmpty { @@ -433,17 +439,26 @@ func RenameBranch(ctx *context.APIContext) { return } - msg, err := repo_service.RenameBranch(ctx, repo, ctx.Doer, ctx.Repo.GitRepo, opt.OldName, opt.NewName) - if err != nil { - ctx.Error(http.StatusInternalServerError, "RenameBranch", err) - return - } - if msg != "" { - ctx.Error(http.StatusUnprocessableEntity, "", msg) - return + branchName := opt.Name + if branchName != "" { + msg, err := repo_service.RenameBranch(ctx, repo, ctx.Doer, ctx.Repo.GitRepo, oldName, branchName) + if err != nil { + ctx.Error(http.StatusInternalServerError, "RenameBranch", err) + return + } + if msg == "target_exist" { + ctx.Error(http.StatusUnprocessableEntity, "", "Cannot rename a branch using the same name or rename to a branch that already exists.") + return + } + if msg == "from_not_exist" { + ctx.Error(http.StatusUnprocessableEntity, "", "Branch doesn't exist.") + return + } + } else { + branchName = oldName } - branch, err := ctx.Repo.GitRepo.GetBranch(opt.NewName) + branch, err := ctx.Repo.GitRepo.GetBranch(branchName) if err != nil { ctx.Error(http.StatusInternalServerError, "GetBranch", err) return @@ -461,13 +476,13 @@ func RenameBranch(ctx *context.APIContext) { return } - br, err := convert.ToBranch(ctx, repo, opt.NewName, commit, pb, ctx.Doer, ctx.Repo.IsAdmin()) + br, err := convert.ToBranch(ctx, repo, branch.Name, commit, pb, ctx.Doer, ctx.Repo.IsAdmin()) if err != nil { ctx.Error(http.StatusInternalServerError, "convert.ToBranch", err) return } - ctx.JSON(http.StatusCreated, br) + ctx.JSON(http.StatusOK, br) } // GetBranchProtection gets a branch protection diff --git a/routers/api/v1/swagger/options.go b/routers/api/v1/swagger/options.go index 5e3ba10822863..125605d98f5aa 100644 --- a/routers/api/v1/swagger/options.go +++ b/routers/api/v1/swagger/options.go @@ -90,7 +90,7 @@ type swaggerParameterBodies struct { // in:body EditRepoOption api.EditRepoOption // in:body - RenameBranchReopOption api.RenameBranchRepoOption + UpdateBranchRepoOption api.UpdateBranchRepoOption // in:body TransferRepoOption api.TransferRepoOption // in:body diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index e320404c4d2d1..b7317213328c7 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -4957,19 +4957,16 @@ } } }, - "/repos/{owner}/{repo}/branches/rename": { - "post": { - "consumes": [ - "application/json" - ], + "/repos/{owner}/{repo}/branches/{branch}": { + "get": { "produces": [ "application/json" ], "tags": [ "repository" ], - "summary": "Rename a branch", - "operationId": "repoRenameBranch", + "summary": "Retrieve a specific branch from a repository, including its effective branch protection", + "operationId": "repoGetBranch", "parameters": [ { "type": "string", @@ -4986,39 +4983,31 @@ "required": true }, { - "name": "body", - "in": "body", - "schema": { - "$ref": "#/definitions/RenameBranchRepoOption" - } + "type": "string", + "description": "branch to get", + "name": "branch", + "in": "path", + "required": true } ], "responses": { - "201": { + "200": { "$ref": "#/responses/Branch" }, - "403": { - "$ref": "#/responses/forbidden" - }, "404": { "$ref": "#/responses/notFound" - }, - "422": { - "$ref": "#/responses/validationError" } } - } - }, - "/repos/{owner}/{repo}/branches/{branch}": { - "get": { + }, + "delete": { "produces": [ "application/json" ], "tags": [ "repository" ], - "summary": "Retrieve a specific branch from a repository, including its effective branch protection", - "operationId": "repoGetBranch", + "summary": "Delete a specific branch from a repository", + "operationId": "repoDeleteBranch", "parameters": [ { "type": "string", @@ -5036,30 +5025,39 @@ }, { "type": "string", - "description": "branch to get", + "description": "branch to delete", "name": "branch", "in": "path", "required": true } ], "responses": { - "200": { - "$ref": "#/responses/Branch" + "204": { + "$ref": "#/responses/empty" + }, + "403": { + "$ref": "#/responses/error" }, "404": { "$ref": "#/responses/notFound" + }, + "423": { + "$ref": "#/responses/repoArchivedError" } } }, - "delete": { + "patch": { + "consumes": [ + "application/json" + ], "produces": [ "application/json" ], "tags": [ "repository" ], - "summary": "Delete a specific branch from a repository", - "operationId": "repoDeleteBranch", + "summary": "Update a branch", + "operationId": "repoUpdateBranch", "parameters": [ { "type": "string", @@ -5077,24 +5075,30 @@ }, { "type": "string", - "description": "branch to delete", + "description": "name of the branch", "name": "branch", - "in": "path", - "required": true + "in": "path" + }, + { + "name": "body", + "in": "body", + "schema": { + "$ref": "#/definitions/UpdateBranchRepoOption" + } } ], "responses": { - "204": { - "$ref": "#/responses/empty" + "200": { + "$ref": "#/responses/Branch" }, "403": { - "$ref": "#/responses/error" + "$ref": "#/responses/forbidden" }, "404": { "$ref": "#/responses/notFound" }, - "423": { - "$ref": "#/responses/repoArchivedError" + "422": { + "$ref": "#/responses/validationError" } } } @@ -24124,29 +24128,6 @@ }, "x-go-package": "code.gitea.io/gitea/modules/structs" }, - "RenameBranchRepoOption": { - "description": "RenameBranchOption options when rename a branch in a repository", - "type": "object", - "required": [ - "old_name", - "new_name" - ], - "properties": { - "new_name": { - "description": "New branch name", - "type": "string", - "uniqueItems": true, - "x-go-name": "NewName" - }, - "old_name": { - "description": "Old branch name", - "type": "string", - "uniqueItems": true, - "x-go-name": "OldName" - } - }, - "x-go-package": "code.gitea.io/gitea/modules/structs" - }, "RenameUserOption": { "description": "RenameUserOption options when renaming a user", "type": "object", @@ -25043,6 +25024,19 @@ }, "x-go-package": "code.gitea.io/gitea/modules/structs" }, + "UpdateBranchRepoOption": { + "description": "UpdateBranchRepoOption options when updating a branch in a repository", + "type": "object", + "properties": { + "name": { + "description": "New branch name", + "type": "string", + "uniqueItems": true, + "x-go-name": "Name" + } + }, + "x-go-package": "code.gitea.io/gitea/modules/structs" + }, "UpdateFileOptions": { "description": "UpdateFileOptions options for updating files\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", "type": "object", diff --git a/tests/integration/api_branch_test.go b/tests/integration/api_branch_test.go index d1469035a8c52..37476913e3aed 100644 --- a/tests/integration/api_branch_test.go +++ b/tests/integration/api_branch_test.go @@ -5,7 +5,9 @@ package integration import ( "net/http" + "net/http/httptest" "net/url" + "slices" "testing" auth_model "code.gitea.io/gitea/models/auth" @@ -186,33 +188,52 @@ func testAPICreateBranch(t testing.TB, session *TestSession, user, repo, oldBran return resp.Result().StatusCode == status } -func TestAPIRenameBranch(t *testing.T) { +func TestAPIUpdateBranch(t *testing.T) { onGiteaRun(t, func(t *testing.T, _ *url.URL) { - t.Run("RenameBranchWithEmptyRepo", func(t *testing.T) { - testAPIRenameBranch(t, "user10", "repo6", "master", "test", http.StatusNotFound) + t.Run("UpdateBranchWithEmptyRepo", func(t *testing.T) { + testAPIUpdateBranch(t, "user10", "repo6", "master", "test", http.StatusNotFound) }) - t.Run("RenameBranchWithSameBranchNames", func(t *testing.T) { - testAPIRenameBranch(t, "user2", "repo1", "master", "master", http.StatusUnprocessableEntity) + t.Run("UpdateBranchWithSameBranchNames", func(t *testing.T) { + resp := testAPIUpdateBranch(t, "user2", "repo1", "master", "master", http.StatusUnprocessableEntity) + assert.Contains(t, resp.Body.String(), "Cannot rename a branch using the same name or rename to a branch that already exists.") }) - t.Run("RenameBranchWithBranchThatAlreadyExists", func(t *testing.T) { - testAPIRenameBranch(t, "user2", "repo1", "master", "branch2", http.StatusUnprocessableEntity) + t.Run("UpdateBranchThatAlreadyExists", func(t *testing.T) { + resp := testAPIUpdateBranch(t, "user2", "repo1", "master", "branch2", http.StatusUnprocessableEntity) + assert.Contains(t, resp.Body.String(), "Cannot rename a branch using the same name or rename to a branch that already exists.") }) - t.Run("RenameBranchWithNonExistentBranch", func(t *testing.T) { - testAPIRenameBranch(t, "user2", "repo1", "i-dont-exist", "branch2", http.StatusUnprocessableEntity) + t.Run("UpdateBranchWithNonExistentBranch", func(t *testing.T) { + resp := testAPIUpdateBranch(t, "user2", "repo1", "i-dont-exist", "new-branch-name", http.StatusUnprocessableEntity) + assert.Contains(t, resp.Body.String(), "Branch doesn't exist.") + }) + t.Run("UpdateBranchWithEmptyStringAsNewName", func(t *testing.T) { + resp := testAPIUpdateBranch(t, "user13", "repo11", "master", "", http.StatusOK) + var branch api.Branch + DecodeJSON(t, resp, &branch) + assert.EqualValues(t, "master", branch.Name) + + // Make sure the branch name did not change in the db. + branches, err := db.Find[git_model.Branch](db.DefaultContext, git_model.FindBranchOptions{ + RepoID: 11, + }) + assert.NoError(t, err) + branchWasUnchanged := slices.ContainsFunc(branches, func(b *git_model.Branch) bool { return b.Name == "master" }) + assert.True(t, branchWasUnchanged, "master branch shouldn't have been renamed") }) t.Run("RenameBranchNormalScenario", func(t *testing.T) { - testAPIRenameBranch(t, "user2", "repo1", "branch2", "new-branch-name", http.StatusCreated) + resp := testAPIUpdateBranch(t, "user2", "repo1", "branch2", "new-branch-name", http.StatusOK) + var branch api.Branch + DecodeJSON(t, resp, &branch) + assert.EqualValues(t, "new-branch-name", branch.Name) }) }) } -func testAPIRenameBranch(t *testing.T, ownerName, repoName, from, to string, expectedHTTPStatus int) { +func testAPIUpdateBranch(t *testing.T, ownerName, repoName, from, to string, expectedHTTPStatus int) *httptest.ResponseRecorder { token := getUserToken(t, ownerName, auth_model.AccessTokenScopeWriteRepository) - req := NewRequestWithJSON(t, "POST", "api/v1/repos/"+ownerName+"/"+repoName+"/branches/rename", &api.RenameBranchRepoOption{ - OldName: from, - NewName: to, + req := NewRequestWithJSON(t, "PATCH", "api/v1/repos/"+ownerName+"/"+repoName+"/branches/"+from, &api.UpdateBranchRepoOption{ + Name: to, }).AddTokenAuth(token) - MakeRequest(t, req, expectedHTTPStatus) + return MakeRequest(t, req, expectedHTTPStatus) } func TestAPIBranchProtection(t *testing.T) { From b388d018c7fcd54890d7be5d5869a606d3717d32 Mon Sep 17 00:00:00 2001 From: Kemal Zebari Date: Sun, 17 Nov 2024 21:13:55 -0800 Subject: [PATCH 4/8] Match code comment to new endpoint implementation --- routers/api/v1/repo/branch.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index 56b20f05b1a6e..adb82bf618336 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -386,7 +386,7 @@ func ListBranches(ctx *context.APIContext) { ctx.JSON(http.StatusOK, apiBranches) } -// UpdateBranch renames a repository's branch. +// UpdateBranch updates a repository's branch. func UpdateBranch(ctx *context.APIContext) { // swagger:operation PATCH /repos/{owner}/{repo}/branches/{branch} repository repoUpdateBranch // --- From 6d221ed9137f4d5f140a280b482549adff07c938 Mon Sep 17 00:00:00 2001 From: Kemal Zebari Date: Sun, 17 Nov 2024 21:27:52 -0800 Subject: [PATCH 5/8] Handle edge case and CI feedback --- routers/api/v1/repo/branch.go | 7 +++++++ templates/swagger/v1_json.tmpl | 3 ++- tests/integration/api_branch_test.go | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index adb82bf618336..5a639c485b6b9 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -410,6 +410,7 @@ func UpdateBranch(ctx *context.APIContext) { // in: path // description: name of the branch // type: string + // required: true // - name: body // in: body // schema: @@ -460,6 +461,12 @@ func UpdateBranch(ctx *context.APIContext) { branch, err := ctx.Repo.GitRepo.GetBranch(branchName) if err != nil { + if git.IsErrBranchNotExist(err) { + // This could occur if the client passes a non-existent branch and we + // skip executing the branch that contains the RenameBranch() call. + ctx.NotFound(err) + return + } ctx.Error(http.StatusInternalServerError, "GetBranch", err) return } diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index b7317213328c7..294fe2b9f9ed1 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -5077,7 +5077,8 @@ "type": "string", "description": "name of the branch", "name": "branch", - "in": "path" + "in": "path", + "required": true }, { "name": "body", diff --git a/tests/integration/api_branch_test.go b/tests/integration/api_branch_test.go index 37476913e3aed..e70c9f245be68 100644 --- a/tests/integration/api_branch_test.go +++ b/tests/integration/api_branch_test.go @@ -219,6 +219,9 @@ func TestAPIUpdateBranch(t *testing.T) { branchWasUnchanged := slices.ContainsFunc(branches, func(b *git_model.Branch) bool { return b.Name == "master" }) assert.True(t, branchWasUnchanged, "master branch shouldn't have been renamed") }) + t.Run("UpdateBranchWithNonExistentBranchAndNewNameIsTheEmptyString", func(t *testing.T) { + testAPIUpdateBranch(t, "user2", "repo1", "i-dont-exist", "", http.StatusNotFound) + }) t.Run("RenameBranchNormalScenario", func(t *testing.T) { resp := testAPIUpdateBranch(t, "user2", "repo1", "branch2", "new-branch-name", http.StatusOK) var branch api.Branch From 6a822041c897e22a0bb015d8c8f353fe76ead339 Mon Sep 17 00:00:00 2001 From: Kemal Zebari Date: Sun, 17 Nov 2024 21:34:07 -0800 Subject: [PATCH 6/8] Keep "non-existent branch" HTTP responses consistent --- routers/api/v1/repo/branch.go | 4 ++-- tests/integration/api_branch_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index 5a639c485b6b9..eda9644ed0918 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -452,7 +452,7 @@ func UpdateBranch(ctx *context.APIContext) { return } if msg == "from_not_exist" { - ctx.Error(http.StatusUnprocessableEntity, "", "Branch doesn't exist.") + ctx.Error(http.StatusNotFound, "", "Branch doesn't exist.") return } } else { @@ -464,7 +464,7 @@ func UpdateBranch(ctx *context.APIContext) { if git.IsErrBranchNotExist(err) { // This could occur if the client passes a non-existent branch and we // skip executing the branch that contains the RenameBranch() call. - ctx.NotFound(err) + ctx.Error(http.StatusNotFound, "", "Branch doesn't exist.") return } ctx.Error(http.StatusInternalServerError, "GetBranch", err) diff --git a/tests/integration/api_branch_test.go b/tests/integration/api_branch_test.go index e70c9f245be68..82da91a7d63c5 100644 --- a/tests/integration/api_branch_test.go +++ b/tests/integration/api_branch_test.go @@ -202,7 +202,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.") }) 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.") }) t.Run("UpdateBranchWithEmptyStringAsNewName", func(t *testing.T) { From 83e35284727fbb865abf3ae3d1d92b8d12b02f53 Mon Sep 17 00:00:00 2001 From: Kemal Zebari Date: Mon, 18 Nov 2024 22:07:59 -0800 Subject: [PATCH 7/8] Make the `name` PATCH field required --- modules/structs/repo.go | 3 ++- routers/api/v1/repo/branch.go | 39 ++++++++++------------------ templates/swagger/v1_json.tmpl | 3 +++ tests/integration/api_branch_test.go | 18 ------------- 4 files changed, 19 insertions(+), 44 deletions(-) diff --git a/modules/structs/repo.go b/modules/structs/repo.go index 239b1e22d8b54..fb784bd8b37f8 100644 --- a/modules/structs/repo.go +++ b/modules/structs/repo.go @@ -283,8 +283,9 @@ type CreateBranchRepoOption struct { type UpdateBranchRepoOption struct { // New branch name // + // required: true // unique: true - Name string `json:"name" binding:"GitRefName;MaxSize(100)"` + Name string `json:"name" binding:"Required;GitRefName;MaxSize(100)"` } // TransferRepoOption options when transfer a repository's ownership diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index eda9644ed0918..9699c813dec7e 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -440,33 +440,22 @@ func UpdateBranch(ctx *context.APIContext) { return } - branchName := opt.Name - if branchName != "" { - msg, err := repo_service.RenameBranch(ctx, repo, ctx.Doer, ctx.Repo.GitRepo, oldName, branchName) - if err != nil { - ctx.Error(http.StatusInternalServerError, "RenameBranch", err) - return - } - if msg == "target_exist" { - ctx.Error(http.StatusUnprocessableEntity, "", "Cannot rename a branch using the same name or rename to a branch that already exists.") - return - } - if msg == "from_not_exist" { - ctx.Error(http.StatusNotFound, "", "Branch doesn't exist.") - return - } - } else { - branchName = oldName + msg, err := repo_service.RenameBranch(ctx, repo, ctx.Doer, ctx.Repo.GitRepo, oldName, opt.Name) + if err != nil { + ctx.Error(http.StatusInternalServerError, "RenameBranch", err) + return + } + if msg == "target_exist" { + ctx.Error(http.StatusUnprocessableEntity, "", "Cannot rename a branch using the same name or rename to a branch that already exists.") + return + } + if msg == "from_not_exist" { + ctx.Error(http.StatusNotFound, "", "Branch doesn't exist.") + return } - branch, err := ctx.Repo.GitRepo.GetBranch(branchName) + branch, err := ctx.Repo.GitRepo.GetBranch(opt.Name) if err != nil { - if git.IsErrBranchNotExist(err) { - // This could occur if the client passes a non-existent branch and we - // skip executing the branch that contains the RenameBranch() call. - ctx.Error(http.StatusNotFound, "", "Branch doesn't exist.") - return - } ctx.Error(http.StatusInternalServerError, "GetBranch", err) return } @@ -485,7 +474,7 @@ func UpdateBranch(ctx *context.APIContext) { br, err := convert.ToBranch(ctx, repo, branch.Name, commit, pb, ctx.Doer, ctx.Repo.IsAdmin()) if err != nil { - ctx.Error(http.StatusInternalServerError, "convert.ToBranch", err) + ctx.Error(http.StatusInternalServerError, "ToBranch", err) return } diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 294fe2b9f9ed1..d082cf03a21de 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -25028,6 +25028,9 @@ "UpdateBranchRepoOption": { "description": "UpdateBranchRepoOption options when updating a branch in a repository", "type": "object", + "required": [ + "name" + ], "properties": { "name": { "description": "New branch name", diff --git a/tests/integration/api_branch_test.go b/tests/integration/api_branch_test.go index 82da91a7d63c5..355e56eb91430 100644 --- a/tests/integration/api_branch_test.go +++ b/tests/integration/api_branch_test.go @@ -7,7 +7,6 @@ import ( "net/http" "net/http/httptest" "net/url" - "slices" "testing" auth_model "code.gitea.io/gitea/models/auth" @@ -205,23 +204,6 @@ func TestAPIUpdateBranch(t *testing.T) { resp := testAPIUpdateBranch(t, "user2", "repo1", "i-dont-exist", "new-branch-name", http.StatusNotFound) assert.Contains(t, resp.Body.String(), "Branch doesn't exist.") }) - t.Run("UpdateBranchWithEmptyStringAsNewName", func(t *testing.T) { - resp := testAPIUpdateBranch(t, "user13", "repo11", "master", "", http.StatusOK) - var branch api.Branch - DecodeJSON(t, resp, &branch) - assert.EqualValues(t, "master", branch.Name) - - // Make sure the branch name did not change in the db. - branches, err := db.Find[git_model.Branch](db.DefaultContext, git_model.FindBranchOptions{ - RepoID: 11, - }) - assert.NoError(t, err) - branchWasUnchanged := slices.ContainsFunc(branches, func(b *git_model.Branch) bool { return b.Name == "master" }) - assert.True(t, branchWasUnchanged, "master branch shouldn't have been renamed") - }) - t.Run("UpdateBranchWithNonExistentBranchAndNewNameIsTheEmptyString", func(t *testing.T) { - testAPIUpdateBranch(t, "user2", "repo1", "i-dont-exist", "", http.StatusNotFound) - }) t.Run("RenameBranchNormalScenario", func(t *testing.T) { resp := testAPIUpdateBranch(t, "user2", "repo1", "branch2", "new-branch-name", http.StatusOK) var branch api.Branch From d90666209b30775fa66034d9329b04b11e8dcac2 Mon Sep 17 00:00:00 2001 From: Kemal Zebari Date: Wed, 11 Dec 2024 15:01:18 -0800 Subject: [PATCH 8/8] Return a 204 response instead of 200 --- routers/api/v1/repo/branch.go | 30 +++------------------------- templates/swagger/v1_json.tmpl | 4 ++-- tests/integration/api_branch_test.go | 5 +---- 3 files changed, 6 insertions(+), 33 deletions(-) diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index 9699c813dec7e..946203e97ec0a 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -416,8 +416,8 @@ func UpdateBranch(ctx *context.APIContext) { // schema: // "$ref": "#/definitions/UpdateBranchRepoOption" // responses: - // "200": - // "$ref": "#/responses/Branch" + // "204": + // "$ref": "#/responses/empty" // "403": // "$ref": "#/responses/forbidden" // "404": @@ -454,31 +454,7 @@ func UpdateBranch(ctx *context.APIContext) { return } - branch, err := ctx.Repo.GitRepo.GetBranch(opt.Name) - if err != nil { - ctx.Error(http.StatusInternalServerError, "GetBranch", err) - return - } - - commit, err := branch.GetCommit() - if err != nil { - ctx.Error(http.StatusInternalServerError, "GetCommit", err) - return - } - - pb, err := git_model.GetFirstMatchProtectedBranchRule(ctx, repo.ID, branch.Name) - if err != nil { - ctx.Error(http.StatusInternalServerError, "GetFirstMatchProtectedBranchRule", err) - return - } - - br, err := convert.ToBranch(ctx, repo, branch.Name, commit, pb, ctx.Doer, ctx.Repo.IsAdmin()) - if err != nil { - ctx.Error(http.StatusInternalServerError, "ToBranch", err) - return - } - - ctx.JSON(http.StatusOK, br) + ctx.Status(http.StatusNoContent) } // GetBranchProtection gets a branch protection diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index d082cf03a21de..82a301da2fe99 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -5089,8 +5089,8 @@ } ], "responses": { - "200": { - "$ref": "#/responses/Branch" + "204": { + "$ref": "#/responses/empty" }, "403": { "$ref": "#/responses/forbidden" diff --git a/tests/integration/api_branch_test.go b/tests/integration/api_branch_test.go index 355e56eb91430..24a041de17e1b 100644 --- a/tests/integration/api_branch_test.go +++ b/tests/integration/api_branch_test.go @@ -205,10 +205,7 @@ func TestAPIUpdateBranch(t *testing.T) { assert.Contains(t, resp.Body.String(), "Branch doesn't exist.") }) t.Run("RenameBranchNormalScenario", func(t *testing.T) { - resp := testAPIUpdateBranch(t, "user2", "repo1", "branch2", "new-branch-name", http.StatusOK) - var branch api.Branch - DecodeJSON(t, resp, &branch) - assert.EqualValues(t, "new-branch-name", branch.Name) + testAPIUpdateBranch(t, "user2", "repo1", "branch2", "new-branch-name", http.StatusNoContent) }) }) }