 6433ba0ec3
			
		
	
	
		6433ba0ec3
		
			
		
	
	
	
	
		
			
			Use [chi](https://github.com/go-chi/chi) instead of the forked [macaron](https://gitea.com/macaron/macaron). Since macaron and chi have conflicts with session share, this big PR becomes a have-to thing. According my previous idea, we can replace macaron step by step but I'm wrong. :( Below is a list of big changes on this PR. - [x] Define `context.ResponseWriter` interface with an implementation `context.Response`. - [x] Use chi instead of macaron, and also a customize `Route` to wrap chi so that the router usage is similar as before. - [x] Create different routers for `web`, `api`, `internal` and `install` so that the codes will be more clear and no magic . - [x] Use https://github.com/unrolled/render instead of macaron's internal render - [x] Use https://github.com/NYTimes/gziphandler instead of https://gitea.com/macaron/gzip - [x] Use https://gitea.com/go-chi/session which is a modified version of https://gitea.com/macaron/session and removed `nodb` support since it will not be maintained. **BREAK** - [x] Use https://gitea.com/go-chi/captcha which is a modified version of https://gitea.com/macaron/captcha - [x] Use https://gitea.com/go-chi/cache which is a modified version of https://gitea.com/macaron/cache - [x] Use https://gitea.com/go-chi/binding which is a modified version of https://gitea.com/macaron/binding - [x] Use https://github.com/go-chi/cors instead of https://gitea.com/macaron/cors - [x] Dropped https://gitea.com/macaron/i18n and make a new one in `code.gitea.io/gitea/modules/translation` - [x] Move validation form structs from `code.gitea.io/gitea/modules/auth` to `code.gitea.io/gitea/modules/forms` to avoid dependency cycle. - [x] Removed macaron log service because it's not need any more. **BREAK** - [x] All form structs have to be get by `web.GetForm(ctx)` in the route function but not as a function parameter on routes definition. - [x] Move Git HTTP protocol implementation to use routers directly. - [x] Fix the problem that chi routes don't support trailing slash but macaron did. - [x] `/api/v1/swagger` now will be redirect to `/api/swagger` but not render directly so that `APIContext` will not create a html render. Notices: - Chi router don't support request with trailing slash - Integration test `TestUserHeatmap` maybe mysql version related. It's failed on my macOS(mysql 5.7.29 installed via brew) but succeed on CI. Co-authored-by: 6543 <6543@obermui.de>
		
			
				
	
	
		
			110 lines
		
	
	
	
		
			4.5 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			110 lines
		
	
	
	
		
			4.5 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 (
 | |
| 	"fmt"
 | |
| 	"net/http"
 | |
| 	"testing"
 | |
| 
 | |
| 	"code.gitea.io/gitea/models"
 | |
| 	auth "code.gitea.io/gitea/modules/forms"
 | |
| 	"code.gitea.io/gitea/modules/setting"
 | |
| 	api "code.gitea.io/gitea/modules/structs"
 | |
| 	issue_service "code.gitea.io/gitea/services/issue"
 | |
| 
 | |
| 	"github.com/stretchr/testify/assert"
 | |
| )
 | |
| 
 | |
| func TestAPIViewPulls(t *testing.T) {
 | |
| 	defer prepareTestEnv(t)()
 | |
| 	repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
 | |
| 	owner := models.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
 | |
| 
 | |
| 	session := loginUser(t, "user2")
 | |
| 	token := getTokenForLoggedInUser(t, session)
 | |
| 	req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/pulls?state=all&token="+token, owner.Name, repo.Name)
 | |
| 	resp := session.MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 	var pulls []*api.PullRequest
 | |
| 	DecodeJSON(t, resp, &pulls)
 | |
| 	expectedLen := models.GetCount(t, &models.Issue{RepoID: repo.ID}, models.Cond("is_pull = ?", true))
 | |
| 	assert.Len(t, pulls, expectedLen)
 | |
| }
 | |
| 
 | |
| // TestAPIMergePullWIP ensures that we can't merge a WIP pull request
 | |
| func TestAPIMergePullWIP(t *testing.T) {
 | |
| 	defer prepareTestEnv(t)()
 | |
| 	repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
 | |
| 	owner := models.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
 | |
| 	pr := models.AssertExistsAndLoadBean(t, &models.PullRequest{Status: models.PullRequestStatusMergeable}, models.Cond("has_merged = ?", false)).(*models.PullRequest)
 | |
| 	pr.LoadIssue()
 | |
| 	issue_service.ChangeTitle(pr.Issue, owner, setting.Repository.PullRequest.WorkInProgressPrefixes[0]+" "+pr.Issue.Title)
 | |
| 
 | |
| 	// force reload
 | |
| 	pr.LoadAttributes()
 | |
| 
 | |
| 	assert.Contains(t, pr.Issue.Title, setting.Repository.PullRequest.WorkInProgressPrefixes[0])
 | |
| 
 | |
| 	session := loginUser(t, owner.Name)
 | |
| 	token := getTokenForLoggedInUser(t, session)
 | |
| 	req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s", owner.Name, repo.Name, pr.Index, token), &auth.MergePullRequestForm{
 | |
| 		MergeMessageField: pr.Issue.Title,
 | |
| 		Do:                string(models.MergeStyleMerge),
 | |
| 	})
 | |
| 
 | |
| 	session.MakeRequest(t, req, http.StatusMethodNotAllowed)
 | |
| }
 | |
| 
 | |
| func TestAPICreatePullSuccess(t *testing.T) {
 | |
| 	defer prepareTestEnv(t)()
 | |
| 	repo10 := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 10}).(*models.Repository)
 | |
| 	// repo10 have code, pulls units.
 | |
| 	repo11 := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 11}).(*models.Repository)
 | |
| 	// repo11 only have code unit but should still create pulls
 | |
| 	owner10 := models.AssertExistsAndLoadBean(t, &models.User{ID: repo10.OwnerID}).(*models.User)
 | |
| 	owner11 := models.AssertExistsAndLoadBean(t, &models.User{ID: repo11.OwnerID}).(*models.User)
 | |
| 
 | |
| 	session := loginUser(t, owner11.Name)
 | |
| 	token := getTokenForLoggedInUser(t, session)
 | |
| 	req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls?token=%s", owner10.Name, repo10.Name, token), &api.CreatePullRequestOption{
 | |
| 		Head:  fmt.Sprintf("%s:master", owner11.Name),
 | |
| 		Base:  "master",
 | |
| 		Title: "create a failure pr",
 | |
| 	})
 | |
| 
 | |
| 	session.MakeRequest(t, req, 201)
 | |
| }
 | |
| 
 | |
| func TestAPIEditPull(t *testing.T) {
 | |
| 	defer prepareTestEnv(t)()
 | |
| 	repo10 := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 10}).(*models.Repository)
 | |
| 	owner10 := models.AssertExistsAndLoadBean(t, &models.User{ID: repo10.OwnerID}).(*models.User)
 | |
| 
 | |
| 	session := loginUser(t, owner10.Name)
 | |
| 	token := getTokenForLoggedInUser(t, session)
 | |
| 	req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls?token=%s", owner10.Name, repo10.Name, token), &api.CreatePullRequestOption{
 | |
| 		Head:  "develop",
 | |
| 		Base:  "master",
 | |
| 		Title: "create a success pr",
 | |
| 	})
 | |
| 	pull := new(api.PullRequest)
 | |
| 	resp := session.MakeRequest(t, req, 201)
 | |
| 	DecodeJSON(t, resp, pull)
 | |
| 	assert.EqualValues(t, "master", pull.Base.Name)
 | |
| 
 | |
| 	req = NewRequestWithJSON(t, http.MethodPatch, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d?token=%s", owner10.Name, repo10.Name, pull.Index, token), &api.EditPullRequestOption{
 | |
| 		Base:  "feature/1",
 | |
| 		Title: "edit a this pr",
 | |
| 	})
 | |
| 	resp = session.MakeRequest(t, req, 201)
 | |
| 	DecodeJSON(t, resp, pull)
 | |
| 	assert.EqualValues(t, "feature/1", pull.Base.Name)
 | |
| 
 | |
| 	req = NewRequestWithJSON(t, http.MethodPatch, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d?token=%s", owner10.Name, repo10.Name, pull.Index, token), &api.EditPullRequestOption{
 | |
| 		Base: "not-exist",
 | |
| 	})
 | |
| 	session.MakeRequest(t, req, 404)
 | |
| }
 |