mirror of
				https://codeberg.org/forgejo/forgejo.git
				synced 2025-11-04 00:11:04 +00:00 
			
		
		
		
	Fixes: https://github.com/go-gitea/gitea/issues/30512 I think this does mean those tools would run on a potential `vendor` directory, but I'm not sure we really support vendoring of dependencies anymore. `release` has a `vendor` prerequisite so likely the source tarballs contain vendor files? (cherry picked from commit 8e12ef911a1d10dedb03e3127c42ca76f9850aca) Conflicts: - Makefile Manually adjusted the changes.
		
			
				
	
	
		
			38 lines
		
	
	
	
		
			1.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			38 lines
		
	
	
	
		
			1.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
// Copyright 2024 The Gitea Authors. All rights reserved.
 | 
						|
// SPDX-License-Identifier: MIT
 | 
						|
 | 
						|
package integration
 | 
						|
 | 
						|
import (
 | 
						|
	"net/http"
 | 
						|
	"testing"
 | 
						|
 | 
						|
	"code.gitea.io/gitea/tests"
 | 
						|
 | 
						|
	"github.com/stretchr/testify/assert"
 | 
						|
)
 | 
						|
 | 
						|
func TestRepoMergeCommitRevert(t *testing.T) {
 | 
						|
	defer tests.PrepareTestEnv(t)()
 | 
						|
	session := loginUser(t, "user2")
 | 
						|
 | 
						|
	req := NewRequest(t, "GET", "/user2/test_commit_revert/_cherrypick/deebcbc752e540bab4ce3ee713d3fc8fdc35b2f7/main?ref=main&refType=branch&cherry-pick-type=revert")
 | 
						|
	resp := session.MakeRequest(t, req, http.StatusOK)
 | 
						|
 | 
						|
	htmlDoc := NewHTMLParser(t, resp.Body)
 | 
						|
	req = NewRequestWithValues(t, "POST", "/user2/test_commit_revert/_cherrypick/deebcbc752e540bab4ce3ee713d3fc8fdc35b2f7/main", map[string]string{
 | 
						|
		"_csrf":           htmlDoc.GetCSRF(),
 | 
						|
		"last_commit":     "deebcbc752e540bab4ce3ee713d3fc8fdc35b2f7",
 | 
						|
		"page_has_posted": "true",
 | 
						|
		"revert":          "true",
 | 
						|
		"commit_summary":  "reverting test commit",
 | 
						|
		"commit_message":  "test message",
 | 
						|
		"commit_choice":   "direct",
 | 
						|
		"new_branch_name": "test-revert-branch-1",
 | 
						|
		"commit_mail_id":  "-1",
 | 
						|
	})
 | 
						|
	resp = session.MakeRequest(t, req, http.StatusSeeOther)
 | 
						|
 | 
						|
	// A successful revert redirects to the main branch
 | 
						|
	assert.EqualValues(t, "/user2/test_commit_revert/src/branch/main", resp.Header().Get("Location"))
 | 
						|
}
 |