mirror of
				https://codeberg.org/forgejo/forgejo.git
				synced 2025-10-31 06:21:11 +00:00 
			
		
		
		
	* Fix indention Signed-off-by: kolaente <k@knt.li> * Add option to merge a pr right now without waiting for the checks to succeed Signed-off-by: kolaente <k@knt.li> * Fix lint Signed-off-by: kolaente <k@knt.li> * Add scheduled pr merge to tables used for testing Signed-off-by: kolaente <k@knt.li> * Add status param to make GetPullRequestByHeadBranch reusable Signed-off-by: kolaente <k@knt.li> * Move "Merge now" to a seperate button to make the ui clearer Signed-off-by: kolaente <k@knt.li> * Update models/scheduled_pull_request_merge.go Co-authored-by: 赵智超 <1012112796@qq.com> * Update web_src/js/index.js Co-authored-by: 赵智超 <1012112796@qq.com> * Update web_src/js/index.js Co-authored-by: 赵智超 <1012112796@qq.com> * Re-add migration after merge * Fix frontend lint * Fix version compare * Add vendored dependencies * Add basic tets * Make sure the api route is capable of scheduling PRs for merging * Fix comparing version * make vendor * adopt refactor * apply suggestion: User -> Doer * init var once * Fix Test * Update templates/repo/issue/view_content/comments.tmpl * adopt * nits * next * code format * lint * use same name schema; rm CreateUnScheduledPRToAutoMergeComment * API: can not create schedule twice * Add TestGetBranchNamesForSha * nits * new go routine for each pull to merge * Update models/pull.go Co-authored-by: a1012112796 <1012112796@qq.com> * Update models/scheduled_pull_request_merge.go Co-authored-by: a1012112796 <1012112796@qq.com> * fix & add renaming sugestions * Update services/automerge/pull_auto_merge.go Co-authored-by: a1012112796 <1012112796@qq.com> * fix conflict relicts * apply latest refactors * fix: migration after merge * Update models/error.go Co-authored-by: delvh <dev.lh@web.de> * Update options/locale/locale_en-US.ini Co-authored-by: delvh <dev.lh@web.de> * Update options/locale/locale_en-US.ini Co-authored-by: delvh <dev.lh@web.de> * adapt latest refactors * fix test * use more context * skip potential edgecases * document func usage * GetBranchNamesForSha() -> GetRefsBySha() * start refactoring * ajust to new changes * nit * docu nit * the great check move * move checks for branchprotection into own package * resolve todo now ... * move & rename * unexport if posible * fix * check if merge is allowed before merge on scheduled pull * debugg * wording * improve SetDefaults & nits * NotAllowedToMerge -> DisallowedToMerge * fix test * merge files * use package "errors" * merge files * add string names * other implementation for gogit * adapt refactor * more context for models/pull.go * GetUserRepoPermission use context * more ctx * use context for loading pull head/base-repo * more ctx * more ctx * models.LoadIssueCtx() * models.LoadIssueCtx() * Handle pull_service.Merge in one DB transaction * add TODOs * next * next * next * more ctx * more ctx * Start refactoring structure of old pull code ... * move code into new packages * shorter names ... and finish **restructure** * Update models/branches.go Co-authored-by: zeripath <art27@cantab.net> * finish UpdateProtectBranch * more and fix * update datum * template: use "svg" helper * rename prQueue 2 prPatchCheckerQueue * handle automerge in queue * lock pull on git&db actions ... * lock pull on git&db actions ... * add TODO notes * the regex * transaction in tests * GetRepositoryByIDCtx * shorter table name and lint fix * close transaction bevore notify * Update models/pull.go * next * CheckPullMergable check all branch protections! * Update routers/web/repo/pull.go * CheckPullMergable check all branch protections! * Revert "PullService lock via pullID (#19520)" (for now...) This reverts commit 6cde7c9159a5ea75a10356feb7b8c7ad4c434a9a. * Update services/pull/check.go * Use for a repo action one database transaction * Apply suggestions from code review * Apply suggestions from code review Co-authored-by: delvh <dev.lh@web.de> * Update services/issue/status.go Co-authored-by: delvh <dev.lh@web.de> * Update services/issue/status.go Co-authored-by: delvh <dev.lh@web.de> * use db.WithTx() * gofmt * make pr.GetDefaultMergeMessage() context aware * make MergePullRequestForm.SetDefaults context aware * use db.WithTx() * pull.SetMerged only with context * fix deadlock in `test-sqlite\#TestAPIBranchProtection` * dont forget templates * db.WithTx allow to set the parentCtx * handle db transaction in service packages but not router * issue_service.ChangeStatus just had caused another deadlock :/ it has to do something with how notification package is handled * if we merge a pull in one database transaktion, we get a lock, because merge infoce internal api that cant handle open db sessions to the same repo * ajust to current master * Apply suggestions from code review Co-authored-by: delvh <dev.lh@web.de> * dont open db transaction in router * make generate-swagger * one _success less * wording nit * rm * adapt * remove not needed test files * rm less diff & use attr in JS * ... * Update services/repository/files/commit.go Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> * ajust db schema for PullAutoMerge * skip broken pull refs * more context in error messages * remove webUI part for another pull * remove more WebUI only parts * API: add CancleAutoMergePR * Apply suggestions from code review Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> * fix lint * Apply suggestions from code review * cancle -> cancel Co-authored-by: delvh <dev.lh@web.de> * change queue identifyer * fix swagger * prevent nil issue * fix and dont drop error * as per @zeripath * Update integrations/git_test.go Co-authored-by: delvh <dev.lh@web.de> * Update integrations/git_test.go Co-authored-by: delvh <dev.lh@web.de> * more declarative integration tests (dedup code) * use assert.False/True helper Co-authored-by: 赵智超 <1012112796@qq.com> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: delvh <dev.lh@web.de> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
		
			
				
	
	
		
			464 lines
		
	
	
	
		
			14 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			464 lines
		
	
	
	
		
			14 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2019 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 (
 | |
| 	"context"
 | |
| 	"fmt"
 | |
| 	"net/http"
 | |
| 	"net/http/httptest"
 | |
| 	"net/url"
 | |
| 	"os"
 | |
| 	"testing"
 | |
| 	"time"
 | |
| 
 | |
| 	"code.gitea.io/gitea/models/perm"
 | |
| 	repo_model "code.gitea.io/gitea/models/repo"
 | |
| 	"code.gitea.io/gitea/modules/json"
 | |
| 	"code.gitea.io/gitea/modules/queue"
 | |
| 	api "code.gitea.io/gitea/modules/structs"
 | |
| 	"code.gitea.io/gitea/services/forms"
 | |
| 
 | |
| 	"github.com/stretchr/testify/assert"
 | |
| )
 | |
| 
 | |
| type APITestContext struct {
 | |
| 	Reponame     string
 | |
| 	Session      *TestSession
 | |
| 	Token        string
 | |
| 	Username     string
 | |
| 	ExpectedCode int
 | |
| }
 | |
| 
 | |
| func NewAPITestContext(t *testing.T, username, reponame string) APITestContext {
 | |
| 	session := loginUser(t, username)
 | |
| 	token := getTokenForLoggedInUser(t, session)
 | |
| 	return APITestContext{
 | |
| 		Session:  session,
 | |
| 		Token:    token,
 | |
| 		Username: username,
 | |
| 		Reponame: reponame,
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func (ctx APITestContext) GitPath() string {
 | |
| 	return fmt.Sprintf("%s/%s.git", ctx.Username, ctx.Reponame)
 | |
| }
 | |
| 
 | |
| func doAPICreateRepository(ctx APITestContext, empty bool, callback ...func(*testing.T, api.Repository)) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		createRepoOption := &api.CreateRepoOption{
 | |
| 			AutoInit:    !empty,
 | |
| 			Description: "Temporary repo",
 | |
| 			Name:        ctx.Reponame,
 | |
| 			Private:     true,
 | |
| 			Template:    true,
 | |
| 			Gitignores:  "",
 | |
| 			License:     "WTFPL",
 | |
| 			Readme:      "Default",
 | |
| 		}
 | |
| 		req := NewRequestWithJSON(t, "POST", "/api/v1/user/repos?token="+ctx.Token, createRepoOption)
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		resp := ctx.Session.MakeRequest(t, req, http.StatusCreated)
 | |
| 
 | |
| 		var repository api.Repository
 | |
| 		DecodeJSON(t, resp, &repository)
 | |
| 		if len(callback) > 0 {
 | |
| 			callback[0](t, repository)
 | |
| 		}
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPIEditRepository(ctx APITestContext, editRepoOption *api.EditRepoOption, callback ...func(*testing.T, api.Repository)) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		req := NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", url.PathEscape(ctx.Username), url.PathEscape(ctx.Reponame), ctx.Token), editRepoOption)
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		resp := ctx.Session.MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 		var repository api.Repository
 | |
| 		DecodeJSON(t, resp, &repository)
 | |
| 		if len(callback) > 0 {
 | |
| 			callback[0](t, repository)
 | |
| 		}
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPIAddCollaborator(ctx APITestContext, username string, mode perm.AccessMode) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		permission := "read"
 | |
| 
 | |
| 		if mode == perm.AccessModeAdmin {
 | |
| 			permission = "admin"
 | |
| 		} else if mode > perm.AccessModeRead {
 | |
| 			permission = "write"
 | |
| 		}
 | |
| 		addCollaboratorOption := &api.AddCollaboratorOption{
 | |
| 			Permission: &permission,
 | |
| 		}
 | |
| 		req := NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/collaborators/%s?token=%s", ctx.Username, ctx.Reponame, username, ctx.Token), addCollaboratorOption)
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		ctx.Session.MakeRequest(t, req, http.StatusNoContent)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPIForkRepository(ctx APITestContext, username string, callback ...func(*testing.T, api.Repository)) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		createForkOption := &api.CreateForkOption{}
 | |
| 		req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/forks?token=%s", username, ctx.Reponame, ctx.Token), createForkOption)
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		resp := ctx.Session.MakeRequest(t, req, http.StatusAccepted)
 | |
| 		var repository api.Repository
 | |
| 		DecodeJSON(t, resp, &repository)
 | |
| 		if len(callback) > 0 {
 | |
| 			callback[0](t, repository)
 | |
| 		}
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPIGetRepository(ctx APITestContext, callback ...func(*testing.T, api.Repository)) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		urlStr := fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", ctx.Username, ctx.Reponame, ctx.Token)
 | |
| 
 | |
| 		req := NewRequest(t, "GET", urlStr)
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		resp := ctx.Session.MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 		var repository api.Repository
 | |
| 		DecodeJSON(t, resp, &repository)
 | |
| 		if len(callback) > 0 {
 | |
| 			callback[0](t, repository)
 | |
| 		}
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPIDeleteRepository(ctx APITestContext) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		urlStr := fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", ctx.Username, ctx.Reponame, ctx.Token)
 | |
| 
 | |
| 		req := NewRequest(t, "DELETE", urlStr)
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		ctx.Session.MakeRequest(t, req, http.StatusNoContent)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPICreateUserKey(ctx APITestContext, keyname, keyFile string, callback ...func(*testing.T, api.PublicKey)) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		urlStr := fmt.Sprintf("/api/v1/user/keys?token=%s", ctx.Token)
 | |
| 
 | |
| 		dataPubKey, err := os.ReadFile(keyFile + ".pub")
 | |
| 		assert.NoError(t, err)
 | |
| 		req := NewRequestWithJSON(t, "POST", urlStr, &api.CreateKeyOption{
 | |
| 			Title: keyname,
 | |
| 			Key:   string(dataPubKey),
 | |
| 		})
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		resp := ctx.Session.MakeRequest(t, req, http.StatusCreated)
 | |
| 		var publicKey api.PublicKey
 | |
| 		DecodeJSON(t, resp, &publicKey)
 | |
| 		if len(callback) > 0 {
 | |
| 			callback[0](t, publicKey)
 | |
| 		}
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPIDeleteUserKey(ctx APITestContext, keyID int64) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		urlStr := fmt.Sprintf("/api/v1/user/keys/%d?token=%s", keyID, ctx.Token)
 | |
| 
 | |
| 		req := NewRequest(t, "DELETE", urlStr)
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		ctx.Session.MakeRequest(t, req, http.StatusNoContent)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPICreateDeployKey(ctx APITestContext, keyname, keyFile string, readOnly bool) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/keys?token=%s", ctx.Username, ctx.Reponame, ctx.Token)
 | |
| 
 | |
| 		dataPubKey, err := os.ReadFile(keyFile + ".pub")
 | |
| 		assert.NoError(t, err)
 | |
| 		req := NewRequestWithJSON(t, "POST", urlStr, api.CreateKeyOption{
 | |
| 			Title:    keyname,
 | |
| 			Key:      string(dataPubKey),
 | |
| 			ReadOnly: readOnly,
 | |
| 		})
 | |
| 
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		ctx.Session.MakeRequest(t, req, http.StatusCreated)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPICreatePullRequest(ctx APITestContext, owner, repo, baseBranch, headBranch string) func(*testing.T) (api.PullRequest, error) {
 | |
| 	return func(t *testing.T) (api.PullRequest, error) {
 | |
| 		urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls?token=%s",
 | |
| 			owner, repo, ctx.Token)
 | |
| 		req := NewRequestWithJSON(t, http.MethodPost, urlStr, &api.CreatePullRequestOption{
 | |
| 			Head:  headBranch,
 | |
| 			Base:  baseBranch,
 | |
| 			Title: fmt.Sprintf("create a pr from %s to %s", headBranch, baseBranch),
 | |
| 		})
 | |
| 
 | |
| 		expected := http.StatusCreated
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			expected = ctx.ExpectedCode
 | |
| 		}
 | |
| 		resp := ctx.Session.MakeRequest(t, req, expected)
 | |
| 
 | |
| 		decoder := json.NewDecoder(resp.Body)
 | |
| 		pr := api.PullRequest{}
 | |
| 		err := decoder.Decode(&pr)
 | |
| 		return pr, err
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPIGetPullRequest(ctx APITestContext, owner, repo string, index int64) func(*testing.T) (api.PullRequest, error) {
 | |
| 	return func(t *testing.T) (api.PullRequest, error) {
 | |
| 		urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d?token=%s",
 | |
| 			owner, repo, index, ctx.Token)
 | |
| 		req := NewRequest(t, http.MethodGet, urlStr)
 | |
| 
 | |
| 		expected := http.StatusOK
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			expected = ctx.ExpectedCode
 | |
| 		}
 | |
| 		resp := ctx.Session.MakeRequest(t, req, expected)
 | |
| 
 | |
| 		decoder := json.NewDecoder(resp.Body)
 | |
| 		pr := api.PullRequest{}
 | |
| 		err := decoder.Decode(&pr)
 | |
| 		return pr, err
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPIMergePullRequest(ctx APITestContext, owner, repo string, index int64) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s",
 | |
| 			owner, repo, index, ctx.Token)
 | |
| 
 | |
| 		var req *http.Request
 | |
| 		var resp *httptest.ResponseRecorder
 | |
| 
 | |
| 		for i := 0; i < 6; i++ {
 | |
| 			req = NewRequestWithJSON(t, http.MethodPost, urlStr, &forms.MergePullRequestForm{
 | |
| 				MergeMessageField: "doAPIMergePullRequest Merge",
 | |
| 				Do:                string(repo_model.MergeStyleMerge),
 | |
| 			})
 | |
| 
 | |
| 			resp = ctx.Session.MakeRequest(t, req, NoExpectedStatus)
 | |
| 
 | |
| 			if resp.Code != http.StatusMethodNotAllowed {
 | |
| 				break
 | |
| 			}
 | |
| 			err := api.APIError{}
 | |
| 			DecodeJSON(t, resp, &err)
 | |
| 			assert.EqualValues(t, "Please try again later", err.Message)
 | |
| 			queue.GetManager().FlushAll(context.Background(), 5*time.Second)
 | |
| 			<-time.After(1 * time.Second)
 | |
| 		}
 | |
| 
 | |
| 		expected := ctx.ExpectedCode
 | |
| 		if expected == 0 {
 | |
| 			expected = http.StatusOK
 | |
| 		}
 | |
| 
 | |
| 		if !assert.EqualValues(t, expected, resp.Code,
 | |
| 			"Request: %s %s", req.Method, req.URL.String()) {
 | |
| 			logUnexpectedResponse(t, resp)
 | |
| 		}
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPIManuallyMergePullRequest(ctx APITestContext, owner, repo, commitID string, index int64) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s",
 | |
| 			owner, repo, index, ctx.Token)
 | |
| 		req := NewRequestWithJSON(t, http.MethodPost, urlStr, &forms.MergePullRequestForm{
 | |
| 			Do:            string(repo_model.MergeStyleManuallyMerged),
 | |
| 			MergeCommitID: commitID,
 | |
| 		})
 | |
| 
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		ctx.Session.MakeRequest(t, req, http.StatusOK)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPIAutoMergePullRequest(ctx APITestContext, owner, repo string, index int64) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s",
 | |
| 			owner, repo, index, ctx.Token)
 | |
| 		req := NewRequestWithJSON(t, http.MethodPost, urlStr, &forms.MergePullRequestForm{
 | |
| 			MergeMessageField:      "doAPIMergePullRequest Merge",
 | |
| 			Do:                     string(repo_model.MergeStyleMerge),
 | |
| 			MergeWhenChecksSucceed: true,
 | |
| 		})
 | |
| 
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		ctx.Session.MakeRequest(t, req, 200)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPICancelAutoMergePullRequest(ctx APITestContext, owner, repo string, index int64) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s",
 | |
| 			owner, repo, index, ctx.Token)
 | |
| 		req := NewRequest(t, http.MethodDelete, urlStr)
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		ctx.Session.MakeRequest(t, req, 204)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPIGetBranch(ctx APITestContext, branch string, callback ...func(*testing.T, api.Branch)) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/branches/%s?token=%s", ctx.Username, ctx.Reponame, branch, ctx.Token)
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		resp := ctx.Session.MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 		var branch api.Branch
 | |
| 		DecodeJSON(t, resp, &branch)
 | |
| 		if len(callback) > 0 {
 | |
| 			callback[0](t, branch)
 | |
| 		}
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPICreateFile(ctx APITestContext, treepath string, options *api.CreateFileOptions, callback ...func(*testing.T, api.FileResponse)) func(*testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		url := fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", ctx.Username, ctx.Reponame, treepath, ctx.Token)
 | |
| 		req := NewRequestWithJSON(t, "POST", url, &options)
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		resp := ctx.Session.MakeRequest(t, req, http.StatusCreated)
 | |
| 
 | |
| 		var contents api.FileResponse
 | |
| 		DecodeJSON(t, resp, &contents)
 | |
| 		if len(callback) > 0 {
 | |
| 			callback[0](t, contents)
 | |
| 		}
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPICreateOrganization(ctx APITestContext, options *api.CreateOrgOption, callback ...func(*testing.T, api.Organization)) func(t *testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		url := fmt.Sprintf("/api/v1/orgs?token=%s", ctx.Token)
 | |
| 
 | |
| 		req := NewRequestWithJSON(t, "POST", url, &options)
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		resp := ctx.Session.MakeRequest(t, req, http.StatusCreated)
 | |
| 
 | |
| 		var contents api.Organization
 | |
| 		DecodeJSON(t, resp, &contents)
 | |
| 		if len(callback) > 0 {
 | |
| 			callback[0](t, contents)
 | |
| 		}
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPICreateOrganizationRepository(ctx APITestContext, orgName string, options *api.CreateRepoOption, callback ...func(*testing.T, api.Repository)) func(t *testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		url := fmt.Sprintf("/api/v1/orgs/%s/repos?token=%s", orgName, ctx.Token)
 | |
| 
 | |
| 		req := NewRequestWithJSON(t, "POST", url, &options)
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		resp := ctx.Session.MakeRequest(t, req, http.StatusCreated)
 | |
| 
 | |
| 		var contents api.Repository
 | |
| 		DecodeJSON(t, resp, &contents)
 | |
| 		if len(callback) > 0 {
 | |
| 			callback[0](t, contents)
 | |
| 		}
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPICreateOrganizationTeam(ctx APITestContext, orgName string, options *api.CreateTeamOption, callback ...func(*testing.T, api.Team)) func(t *testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		url := fmt.Sprintf("/api/v1/orgs/%s/teams?token=%s", orgName, ctx.Token)
 | |
| 
 | |
| 		req := NewRequestWithJSON(t, "POST", url, &options)
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		resp := ctx.Session.MakeRequest(t, req, http.StatusCreated)
 | |
| 
 | |
| 		var contents api.Team
 | |
| 		DecodeJSON(t, resp, &contents)
 | |
| 		if len(callback) > 0 {
 | |
| 			callback[0](t, contents)
 | |
| 		}
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPIAddUserToOrganizationTeam(ctx APITestContext, teamID int64, username string) func(t *testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		url := fmt.Sprintf("/api/v1/teams/%d/members/%s?token=%s", teamID, username, ctx.Token)
 | |
| 
 | |
| 		req := NewRequest(t, "PUT", url)
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		ctx.Session.MakeRequest(t, req, http.StatusNoContent)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func doAPIAddRepoToOrganizationTeam(ctx APITestContext, teamID int64, orgName, repoName string) func(t *testing.T) {
 | |
| 	return func(t *testing.T) {
 | |
| 		url := fmt.Sprintf("/api/v1/teams/%d/repos/%s/%s?token=%s", teamID, orgName, repoName, ctx.Token)
 | |
| 
 | |
| 		req := NewRequest(t, "PUT", url)
 | |
| 		if ctx.ExpectedCode != 0 {
 | |
| 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 | |
| 			return
 | |
| 		}
 | |
| 		ctx.Session.MakeRequest(t, req, http.StatusNoContent)
 | |
| 	}
 | |
| }
 |