 141d52cc0f
			
		
	
	
		141d52cc0f
		
			
		
	
	
	
	
		
			
			* [FEATURE] [API] Add Endpoint for Branch Creation Issue: https://github.com/go-gitea/gitea/issues/11376 This commit introduces an API endpoint for branch creation. The added route is POST /repos/{owner}/{repo}/branches. A JSON with the name of the new branch and the name of the old branch is required as parameters. Signed-off-by: Terence Le Huu Phuong <terence@qwasar.io> * Put all the logic into CreateBranch and removed CreateRepoBranch * - Added the error ErrBranchDoesNotExist in error.go - Made the CreateNewBranch function return an errBranchDoesNotExist error when the OldBranch does not exist - Made the CreateBranch API function checks that the repository is not empty and that branch exists. * - Added a resetFixtures helper function in integration_test.go to fine-tune test env resetting - Added api test for CreateBranch - Used resetFixture instead of the more general prepareTestEnv in the repo_branch_test CreateBranch tests * Moved the resetFixtures call inside the loop for APICreateBranch function * Put the prepareTestEnv back in repo_branch_test * fix import order/sort api branch test Co-authored-by: zeripath <art27@cantab.net>
		
			
				
	
	
		
			195 lines
		
	
	
	
		
			6.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			195 lines
		
	
	
	
		
			6.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2017 The Gitea Authors. All rights reserved.
 | |
| // Use of this source code is governed by a MIT-style
 | |
| // license that can be found in the LICENSE file.
 | |
| 
 | |
| package integrations
 | |
| 
 | |
| import (
 | |
| 	"net/http"
 | |
| 	"net/url"
 | |
| 	"testing"
 | |
| 
 | |
| 	api "code.gitea.io/gitea/modules/structs"
 | |
| 
 | |
| 	"github.com/stretchr/testify/assert"
 | |
| )
 | |
| 
 | |
| func testAPIGetBranch(t *testing.T, branchName string, exists bool) {
 | |
| 	session := loginUser(t, "user2")
 | |
| 	token := getTokenForLoggedInUser(t, session)
 | |
| 	req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo1/branches/%s?token=%s", branchName, token)
 | |
| 	resp := session.MakeRequest(t, req, NoExpectedStatus)
 | |
| 	if !exists {
 | |
| 		assert.EqualValues(t, http.StatusNotFound, resp.Code)
 | |
| 		return
 | |
| 	}
 | |
| 	assert.EqualValues(t, http.StatusOK, resp.Code)
 | |
| 	var branch api.Branch
 | |
| 	DecodeJSON(t, resp, &branch)
 | |
| 	assert.EqualValues(t, branchName, branch.Name)
 | |
| 	assert.True(t, branch.UserCanPush)
 | |
| 	assert.True(t, branch.UserCanMerge)
 | |
| }
 | |
| 
 | |
| func testAPIGetBranchProtection(t *testing.T, branchName string, expectedHTTPStatus int) {
 | |
| 	session := loginUser(t, "user2")
 | |
| 	token := getTokenForLoggedInUser(t, session)
 | |
| 	req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo1/branch_protections/%s?token=%s", branchName, token)
 | |
| 	resp := session.MakeRequest(t, req, expectedHTTPStatus)
 | |
| 
 | |
| 	if resp.Code == 200 {
 | |
| 		var branchProtection api.BranchProtection
 | |
| 		DecodeJSON(t, resp, &branchProtection)
 | |
| 		assert.EqualValues(t, branchName, branchProtection.BranchName)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func testAPICreateBranchProtection(t *testing.T, branchName string, expectedHTTPStatus int) {
 | |
| 	session := loginUser(t, "user2")
 | |
| 	token := getTokenForLoggedInUser(t, session)
 | |
| 	req := NewRequestWithJSON(t, "POST", "/api/v1/repos/user2/repo1/branch_protections?token="+token, &api.BranchProtection{
 | |
| 		BranchName: branchName,
 | |
| 	})
 | |
| 	resp := session.MakeRequest(t, req, expectedHTTPStatus)
 | |
| 
 | |
| 	if resp.Code == 201 {
 | |
| 		var branchProtection api.BranchProtection
 | |
| 		DecodeJSON(t, resp, &branchProtection)
 | |
| 		assert.EqualValues(t, branchName, branchProtection.BranchName)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func testAPIEditBranchProtection(t *testing.T, branchName string, body *api.BranchProtection, expectedHTTPStatus int) {
 | |
| 	session := loginUser(t, "user2")
 | |
| 	token := getTokenForLoggedInUser(t, session)
 | |
| 	req := NewRequestWithJSON(t, "PATCH", "/api/v1/repos/user2/repo1/branch_protections/"+branchName+"?token="+token, body)
 | |
| 	resp := session.MakeRequest(t, req, expectedHTTPStatus)
 | |
| 
 | |
| 	if resp.Code == 200 {
 | |
| 		var branchProtection api.BranchProtection
 | |
| 		DecodeJSON(t, resp, &branchProtection)
 | |
| 		assert.EqualValues(t, branchName, branchProtection.BranchName)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func testAPIDeleteBranchProtection(t *testing.T, branchName string, expectedHTTPStatus int) {
 | |
| 	session := loginUser(t, "user2")
 | |
| 	token := getTokenForLoggedInUser(t, session)
 | |
| 	req := NewRequestf(t, "DELETE", "/api/v1/repos/user2/repo1/branch_protections/%s?token=%s", branchName, token)
 | |
| 	session.MakeRequest(t, req, expectedHTTPStatus)
 | |
| }
 | |
| 
 | |
| func testAPIDeleteBranch(t *testing.T, branchName string, expectedHTTPStatus int) {
 | |
| 	session := loginUser(t, "user2")
 | |
| 	token := getTokenForLoggedInUser(t, session)
 | |
| 	req := NewRequestf(t, "DELETE", "/api/v1/repos/user2/repo1/branches/%s?token=%s", branchName, token)
 | |
| 	session.MakeRequest(t, req, expectedHTTPStatus)
 | |
| }
 | |
| 
 | |
| func TestAPIGetBranch(t *testing.T) {
 | |
| 	defer prepareTestEnv(t)()
 | |
| 	for _, test := range []struct {
 | |
| 		BranchName string
 | |
| 		Exists     bool
 | |
| 	}{
 | |
| 		{"master", true},
 | |
| 		{"master/doesnotexist", false},
 | |
| 		{"feature/1", true},
 | |
| 		{"feature/1/doesnotexist", false},
 | |
| 	} {
 | |
| 		testAPIGetBranch(t, test.BranchName, test.Exists)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestAPICreateBranch(t *testing.T) {
 | |
| 	onGiteaRun(t, testAPICreateBranches)
 | |
| }
 | |
| 
 | |
| func testAPICreateBranches(t *testing.T, giteaURL *url.URL) {
 | |
| 
 | |
| 	username := "user2"
 | |
| 	ctx := NewAPITestContext(t, username, "my-noo-repo")
 | |
| 	giteaURL.Path = ctx.GitPath()
 | |
| 
 | |
| 	t.Run("CreateRepo", doAPICreateRepository(ctx, false))
 | |
| 	tests := []struct {
 | |
| 		OldBranch          string
 | |
| 		NewBranch          string
 | |
| 		ExpectedHTTPStatus int
 | |
| 	}{
 | |
| 		// Creating branch from default branch
 | |
| 		{
 | |
| 			OldBranch:          "",
 | |
| 			NewBranch:          "new_branch_from_default_branch",
 | |
| 			ExpectedHTTPStatus: http.StatusCreated,
 | |
| 		},
 | |
| 		// Creating branch from master
 | |
| 		{
 | |
| 			OldBranch:          "master",
 | |
| 			NewBranch:          "new_branch_from_master_1",
 | |
| 			ExpectedHTTPStatus: http.StatusCreated,
 | |
| 		},
 | |
| 		// Trying to create from master but already exists
 | |
| 		{
 | |
| 			OldBranch:          "master",
 | |
| 			NewBranch:          "new_branch_from_master_1",
 | |
| 			ExpectedHTTPStatus: http.StatusConflict,
 | |
| 		},
 | |
| 		// Trying to create from other branch (not default branch)
 | |
| 		{
 | |
| 			OldBranch:          "new_branch_from_master_1",
 | |
| 			NewBranch:          "branch_2",
 | |
| 			ExpectedHTTPStatus: http.StatusCreated,
 | |
| 		},
 | |
| 		// Trying to create from a branch which does not exist
 | |
| 		{
 | |
| 			OldBranch:          "does_not_exist",
 | |
| 			NewBranch:          "new_branch_from_non_existent",
 | |
| 			ExpectedHTTPStatus: http.StatusNotFound,
 | |
| 		},
 | |
| 	}
 | |
| 	for _, test := range tests {
 | |
| 		defer resetFixtures(t)
 | |
| 		session := ctx.Session
 | |
| 		token := getTokenForLoggedInUser(t, session)
 | |
| 		req := NewRequestWithJSON(t, "POST", "/api/v1/repos/user2/my-noo-repo/branches?token="+token, &api.CreateBranchRepoOption{
 | |
| 			BranchName:    test.NewBranch,
 | |
| 			OldBranchName: test.OldBranch,
 | |
| 		})
 | |
| 		resp := session.MakeRequest(t, req, test.ExpectedHTTPStatus)
 | |
| 
 | |
| 		var branch api.Branch
 | |
| 		DecodeJSON(t, resp, &branch)
 | |
| 
 | |
| 		if test.ExpectedHTTPStatus == http.StatusCreated {
 | |
| 			assert.EqualValues(t, test.NewBranch, branch.Name)
 | |
| 		}
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestAPIBranchProtection(t *testing.T) {
 | |
| 	defer prepareTestEnv(t)()
 | |
| 
 | |
| 	// Branch protection only on branch that exist
 | |
| 	testAPICreateBranchProtection(t, "master/doesnotexist", http.StatusNotFound)
 | |
| 	// Get branch protection on branch that exist but not branch protection
 | |
| 	testAPIGetBranchProtection(t, "master", http.StatusNotFound)
 | |
| 
 | |
| 	testAPICreateBranchProtection(t, "master", http.StatusCreated)
 | |
| 	// Can only create once
 | |
| 	testAPICreateBranchProtection(t, "master", http.StatusForbidden)
 | |
| 
 | |
| 	// Can't delete a protected branch
 | |
| 	testAPIDeleteBranch(t, "master", http.StatusForbidden)
 | |
| 
 | |
| 	testAPIGetBranchProtection(t, "master", http.StatusOK)
 | |
| 	testAPIEditBranchProtection(t, "master", &api.BranchProtection{
 | |
| 		EnablePush: true,
 | |
| 	}, http.StatusOK)
 | |
| 
 | |
| 	testAPIDeleteBranchProtection(t, "master", http.StatusNoContent)
 | |
| 
 | |
| 	// Test branch deletion
 | |
| 	testAPIDeleteBranch(t, "master", http.StatusForbidden)
 | |
| 	testAPIDeleteBranch(t, "branch2", http.StatusNoContent)
 | |
| }
 |