Gitea-John71/Gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-08-03 12:34:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove Ctx field from git.Repository (#38500)

Browse Source
This commit is contained in:
wxiaoguang
2026-07-17 18:44:31 +08:00
committed by GitHub
parent 2c8e99bbf7
commit 5b078f72aa
235 changed files with 1234 additions and 1258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration/actions_trigger_test.go
+22 -16
View File
@@ -477,14 +477,14 @@ jobs:
assert.NotEmpty(t, addWorkflowToBaseResp)
// Get the commit ID of the default branch
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, err := gitrepo.OpenRepository(repo)
assert.NoError(t, err)
defer gitRepo.Close()
branch, err := git_model.GetBranch(t.Context(), repo.ID, repo.DefaultBranch)
assert.NoError(t, err)
// create a branch
err = repo_service.CreateNewBranchFromCommit(t.Context(), user2, repo, branch.CommitID, "test-create-branch")
err = repo_service.CreateNewBranchFromCommit(t.Context(), user2, repo, gitRepo, branch.CommitID, "test-create-branch")
assert.NoError(t, err)
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
Title: "add workflow",
@@ -602,8 +602,7 @@ jobs:
// create a new branch
testBranch := "test-branch"
err = repo_service.CreateNewBranch(t.Context(), user2, repo, "main", testBranch)
assert.NoError(t, err)
testCreateBranch(t, ctx.Session, repo.OwnerName, repo.Name, "branch/main", testBranch, http.StatusSeeOther)
// create Pull
pullIssue := &issues_model.Issue{
@@ -830,8 +829,7 @@ jobs:
// create a branch and a PR
testBranch := "test-review-branch"
err = repo_service.CreateNewBranch(t.Context(), user2, repo, "main", testBranch)
assert.NoError(t, err)
testCreateBranch(t, ctx.Session, repo.OwnerName, repo.Name, "branch/main", testBranch, http.StatusSeeOther)
// add a file on the test branch so the PR has changes
addFileResp, err := files_service.ChangeRepoFiles(t.Context(), repo, user2, &files_service.ChangeRepoFilesOptions{
@@ -883,7 +881,7 @@ jobs:
assert.NoError(t, err)
// submit an approval review as user4
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, err := gitrepo.OpenRepository(repo)
assert.NoError(t, err)
defer gitRepo.Close()
@@ -963,7 +961,7 @@ jobs:
assert.NotEmpty(t, addWorkflowToBaseResp)
// Get the commit ID of the default branch
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, err := gitrepo.OpenRepository(repo)
assert.NoError(t, err)
defer gitRepo.Close()
branch, err := git_model.GetBranch(t.Context(), repo.ID, repo.DefaultBranch)
@@ -1134,7 +1132,7 @@ jobs:
assert.NotEmpty(t, addWorkflowToBaseResp)
// Get the commit ID of the default branch
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, err := gitrepo.OpenRepository(repo)
assert.NoError(t, err)
defer gitRepo.Close()
branch, err := git_model.GetBranch(t.Context(), repo.ID, repo.DefaultBranch)
@@ -1225,7 +1223,7 @@ jobs:
assert.NotEmpty(t, addWorkflowToBaseResp)
// Get the commit ID of the default branch
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, err := gitrepo.OpenRepository(repo)
assert.NoError(t, err)
defer gitRepo.Close()
branch, err := git_model.GetBranch(t.Context(), repo.ID, repo.DefaultBranch)
@@ -1311,7 +1309,7 @@ jobs:
assert.NotEmpty(t, addWorkflowToBaseResp)
// Get the commit ID of the default branch
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, err := gitrepo.OpenRepository(repo)
assert.NoError(t, err)
defer gitRepo.Close()
branch, err := git_model.GetBranch(t.Context(), repo.ID, repo.DefaultBranch)
@@ -1441,10 +1439,10 @@ jobs:
assert.NotEmpty(t, addWorkflowToBaseResp)
// Get the commit ID of the dispatch branch
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, err := gitrepo.OpenRepository(repo)
assert.NoError(t, err)
defer gitRepo.Close()
commit, err := gitRepo.GetBranchCommit("dispatch")
commit, err := gitRepo.GetBranchCommit(t.Context(), "dispatch")
assert.NoError(t, err)
inputs := &api.CreateActionWorkflowDispatch{
Ref: "refs/heads/dispatch",
@@ -1639,7 +1637,7 @@ jobs:
assert.Equal(t, workflows.Workflows[0].State, workflow.State)
// Get the commit ID of the default branch
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, err := gitrepo.OpenRepository(repo)
assert.NoError(t, err)
defer gitRepo.Close()
branch, err := git_model.GetBranch(t.Context(), repo.ID, repo.DefaultBranch)
@@ -1808,12 +1806,16 @@ jobs:
assert.NoError(t, err)
assert.NotEmpty(t, addWorkflowToBaseResp)
gitRepo, err := gitrepo.OpenRepository(repo)
assert.NoError(t, err)
defer gitRepo.Close()
// Get the commit ID of the default branch
branch, err := git_model.GetBranch(t.Context(), repo.ID, repo.DefaultBranch)
assert.NoError(t, err)
// create a branch
err = repo_service.CreateNewBranchFromCommit(t.Context(), user2, repo, branch.CommitID, "test-action-run-name-with-variables")
err = repo_service.CreateNewBranchFromCommit(t.Context(), user2, repo, gitRepo, branch.CommitID, "test-action-run-name-with-variables")
assert.NoError(t, err)
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
Title: user2.LoginName + " is running this workflow",
@@ -1882,12 +1884,16 @@ jobs:
assert.NoError(t, err)
assert.NotEmpty(t, addWorkflowToBaseResp)
gitRepo, err := gitrepo.OpenRepository(repo)
assert.NoError(t, err)
defer gitRepo.Close()
// Get the commit ID of the default branch
branch, err := git_model.GetBranch(t.Context(), repo.ID, repo.DefaultBranch)
assert.NoError(t, err)
// create a branch
err = repo_service.CreateNewBranchFromCommit(t.Context(), user2, repo, branch.CommitID, "test-action-run-name")
err = repo_service.CreateNewBranchFromCommit(t.Context(), user2, repo, gitRepo, branch.CommitID, "test-action-run-name")
assert.NoError(t, err)
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
Title: "run name without variables",
tests/integration/api_packages_cargo_test.go
+3 -3
View File
@@ -76,17 +76,17 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) {
assert.NoError(t, err)
readGitContent := func(t *testing.T, path string) string {
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, err := gitrepo.OpenRepository(repo)
assert.NoError(t, err)
defer gitRepo.Close()
commit, err := gitRepo.GetBranchCommit(repo.DefaultBranch)
commit, err := gitRepo.GetBranchCommit(t.Context(), repo.DefaultBranch)
assert.NoError(t, err)
blob, err := commit.GetBlobByPath(t.Context(), gitRepo, path)
assert.NoError(t, err)
content, err := blob.GetBlobContent(1024)
content, err := blob.GetBlobContent(t.Context(), 1024)
assert.NoError(t, err)
return content
tests/integration/api_pull_review_test.go
+4 -4
View File
@@ -375,11 +375,11 @@ func TestAPIPullReviewCommentResolveEndpoints(t *testing.T) {
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: pullIssue.PosterID})
require.NoError(t, pullIssue.LoadPullRequest(ctx))
gitRepo, err := gitrepo.OpenRepository(ctx, repo)
gitRepo, err := gitrepo.OpenRepository(repo)
require.NoError(t, err)
defer gitRepo.Close()
latestCommitID, err := gitRepo.GetRefCommitID(pullIssue.PullRequest.GetGitHeadRefName())
latestCommitID, err := gitRepo.GetRefCommitID(t.Context(), pullIssue.PullRequest.GetGitHeadRefName())
require.NoError(t, err)
codeComment, err := pull_service.CreateCodeComment(ctx, doer, gitRepo, pullIssue, 1, "resolve comment", "README.md", false, 0, latestCommitID, nil)
@@ -536,11 +536,11 @@ func testAPIPullReviewCommentReply(t *testing.T) {
require.NoError(t, pullIssue.LoadRepo(t.Context()))
require.NoError(t, pullIssue.LoadPullRequest(t.Context()))
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
gitRepo, err := gitrepo.OpenRepository(t.Context(), pullIssue.Repo)
gitRepo, err := gitrepo.OpenRepository(pullIssue.Repo)
require.NoError(t, err)
defer gitRepo.Close()
commitID, err := gitRepo.GetRefCommitID(pullIssue.PullRequest.GetGitHeadRefName())
commitID, err := gitRepo.GetRefCommitID(t.Context(), pullIssue.PullRequest.GetGitHeadRefName())
require.NoError(t, err)
parent, err := pull_service.CreateCodeComment(t.Context(), doer, gitRepo, pullIssue, 1, "parent comment", "README.md", false, 0, commitID, nil)
tests/integration/api_releases_test.go
+7 -7
View File
@@ -186,14 +186,14 @@ func TestAPICreateAndUpdateRelease(t *testing.T) {
session := loginUser(t, owner.LowerName)
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, err := gitrepo.OpenRepository(repo)
assert.NoError(t, err)
defer gitRepo.Close()
err = gitRepo.CreateTag("v0.0.1", "master")
err = gitRepo.CreateTag(t.Context(), "v0.0.1", "master")
assert.NoError(t, err)
target, err := gitRepo.GetTagCommitID("v0.0.1")
target, err := gitRepo.GetTagCommitID(t.Context(), "v0.0.1")
assert.NoError(t, err)
newRelease := createNewReleaseUsingAPI(t, token, owner, repo, "v0.0.1", target, "v0.0.1", "test")
@@ -237,11 +237,11 @@ func TestAPICreateProtectedTagRelease(t *testing.T) {
session := loginUser(t, writer.LowerName)
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, err := gitrepo.OpenRepository(repo)
assert.NoError(t, err)
defer gitRepo.Close()
commit, err := gitRepo.GetBranchCommit("master")
commit, err := gitRepo.GetBranchCommit(t.Context(), "master")
assert.NoError(t, err)
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/releases", repo.OwnerName, repo.Name), &api.CreateReleaseOption{
@@ -273,11 +273,11 @@ func TestAPICreateReleaseToDefaultBranchOnExistingTag(t *testing.T) {
session := loginUser(t, owner.LowerName)
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, err := gitrepo.OpenRepository(repo)
assert.NoError(t, err)
defer gitRepo.Close()
err = gitRepo.CreateTag("v0.0.1", "master")
err = gitRepo.CreateTag(t.Context(), "v0.0.1", "master")
assert.NoError(t, err)
createNewReleaseUsingAPI(t, token, owner, repo, "v0.0.1", "", "v0.0.1", "test")
tests/integration/api_repo_file_create_test.go
+6 -6
View File
@@ -153,10 +153,10 @@ func TestAPICreateFile(t *testing.T) {
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &createFileOptions).
AddTokenAuth(token2)
resp := MakeRequest(t, req, http.StatusCreated)
gitRepo, _ := gitrepo.OpenRepository(t.Context(), repo1)
gitRepo, _ := gitrepo.OpenRepository(repo1)
defer gitRepo.Close()
commitID, _ := gitRepo.GetBranchCommitID(createFileOptions.NewBranchName)
lastCommit, _ := gitRepo.GetCommitByPath(treePath)
commitID, _ := gitRepo.GetBranchCommitID(t.Context(), createFileOptions.NewBranchName)
lastCommit, _ := gitRepo.GetCommitByPath(t.Context(), treePath)
expectedFileResponse := getExpectedFileResponseForCreate(apiFileResponseInfo{
repoFullName: "user2/repo1",
commitID: commitID,
@@ -276,10 +276,10 @@ func TestAPICreateFile(t *testing.T) {
AddTokenAuth(token2)
resp = MakeRequest(t, req, http.StatusCreated)
emptyRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user2", Name: "empty-repo"}) // public repo
gitRepo, _ := gitrepo.OpenRepository(t.Context(), emptyRepo)
gitRepo, _ := gitrepo.OpenRepository(emptyRepo)
defer gitRepo.Close()
commitID, _ := gitRepo.GetBranchCommitID(createFileOptions.NewBranchName)
latestCommit, _ := gitRepo.GetCommitByPath(treePath)
commitID, _ := gitRepo.GetBranchCommitID(t.Context(), createFileOptions.NewBranchName)
latestCommit, _ := gitRepo.GetCommitByPath(t.Context(), treePath)
expectedFileResponse := getExpectedFileResponseForCreate(apiFileResponseInfo{
repoFullName: "user2/empty-repo",
commitID: commitID,
tests/integration/api_repo_file_update_test.go
+3 -3
View File
@@ -136,10 +136,10 @@ func TestAPIUpdateFile(t *testing.T) {
req := NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &updateFileOptions).
AddTokenAuth(token2)
resp := MakeRequest(t, req, http.StatusOK)
gitRepo, _ := gitrepo.OpenRepository(t.Context(), repo1)
gitRepo, _ := gitrepo.OpenRepository(repo1)
defer gitRepo.Close()
commitID, _ := gitRepo.GetBranchCommitID(updateFileOptions.NewBranchName)
lasCommit, _ := gitRepo.GetCommitByPath(treePath)
commitID, _ := gitRepo.GetBranchCommitID(t.Context(), updateFileOptions.NewBranchName)
lasCommit, _ := gitRepo.GetCommitByPath(t.Context(), treePath)
expectedFileResponse := getExpectedFileResponseForUpdate(apiFileResponseInfo{
commitID: commitID,
treePath: treePath,
tests/integration/api_repo_files_change_test.go
+4 -4
View File
@@ -93,11 +93,11 @@ func TestAPIChangeFiles(t *testing.T) {
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents", user2.Name, repo1.Name), &changeFilesOptions).
AddTokenAuth(token2)
resp := MakeRequest(t, req, http.StatusCreated)
gitRepo, _ := gitrepo.OpenRepository(t.Context(), repo1)
gitRepo, _ := gitrepo.OpenRepository(repo1)
defer gitRepo.Close()
commitID, _ := gitRepo.GetBranchCommitID(changeFilesOptions.NewBranchName)
createLasCommit, _ := gitRepo.GetCommitByPath(createTreePath)
updateLastCommit, _ := gitRepo.GetCommitByPath(updateTreePath)
commitID, _ := gitRepo.GetBranchCommitID(t.Context(), changeFilesOptions.NewBranchName)
createLasCommit, _ := gitRepo.GetCommitByPath(t.Context(), createTreePath)
updateLastCommit, _ := gitRepo.GetCommitByPath(t.Context(), updateTreePath)
expectedCreateFileResponse := getExpectedFileResponseForCreate(apiFileResponseInfo{
repoFullName: fmt.Sprintf("%s/%s", user2.Name, repo1.Name),
commitID: commitID,
tests/integration/api_repo_files_get_test.go
+2 -2
View File
@@ -42,10 +42,10 @@ func TestAPIGetRequestedFiles(t *testing.T) {
session = loginUser(t, user4.Name)
token4 := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo1)
gitRepo, err := gitrepo.OpenRepository(repo1)
assert.NoError(t, err)
defer gitRepo.Close()
lastCommit, _ := gitRepo.GetCommitByPath("README.md")
lastCommit, _ := gitRepo.GetCommitByPath(t.Context(), "README.md")
requestFiles := func(t *testing.T, url string, files []string, expectedStatusCode ...int) (ret []*api.ContentsResponse) {
req := NewRequestWithJSON(t, "POST", url, &api.GetFilesOptions{Files: files})
tests/integration/api_repo_get_contents_list_test.go
+9 -9
View File
@@ -73,19 +73,19 @@ func testAPIGetContentsList(t *testing.T, u *url.URL) {
token4 := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository)
// Get the commit ID of the default branch
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo1)
gitRepo, err := gitrepo.OpenRepository(repo1)
assert.NoError(t, err)
defer gitRepo.Close()
// Make a new branch in repo1
newBranch := "test_branch"
err = repo_service.CreateNewBranch(t.Context(), user2, repo1, repo1.DefaultBranch, newBranch)
err = repo_service.CreateNewBranch(t.Context(), user2, repo1, gitRepo, repo1.DefaultBranch, newBranch)
assert.NoError(t, err)
commitID, _ := gitRepo.GetBranchCommitID(repo1.DefaultBranch)
commitID, _ := gitRepo.GetBranchCommitID(t.Context(), repo1.DefaultBranch)
// Make a new tag in repo1
newTag := "test_tag"
err = gitRepo.CreateTag(newTag, commitID)
err = gitRepo.CreateTag(t.Context(), newTag, commitID)
assert.NoError(t, err)
/*** END SETUP ***/
@@ -96,7 +96,7 @@ func testAPIGetContentsList(t *testing.T, u *url.URL) {
resp := MakeRequest(t, req, http.StatusOK)
contentsListResponse := DecodeJSON(t, resp, []*api.ContentsResponse{})
assert.NotNil(t, contentsListResponse)
lastCommit, err := gitRepo.GetCommitByPath("README.md")
lastCommit, err := gitRepo.GetCommitByPath(t.Context(), "README.md")
assert.NoError(t, err)
expectedContentsListResponse := getExpectedContentsListResponseForContents(ref, refType, lastCommit.ID.String())
assert.Equal(t, expectedContentsListResponse, contentsListResponse)
@@ -118,9 +118,9 @@ func testAPIGetContentsList(t *testing.T, u *url.URL) {
resp = MakeRequest(t, req, http.StatusOK)
contentsListResponse = DecodeJSON(t, resp, []*api.ContentsResponse{})
assert.NotNil(t, contentsListResponse)
branchCommit, err := gitRepo.GetBranchCommit(ref)
branchCommit, err := gitRepo.GetBranchCommit(t.Context(), ref)
assert.NoError(t, err)
lastCommit, err = branchCommit.GetCommitByPath(gitRepo, "README.md")
lastCommit, err = branchCommit.GetCommitByPath(t.Context(), gitRepo, "README.md")
assert.NoError(t, err)
expectedContentsListResponse = getExpectedContentsListResponseForContents(ref, refType, lastCommit.ID.String())
assert.Equal(t, expectedContentsListResponse, contentsListResponse)
@@ -132,9 +132,9 @@ func testAPIGetContentsList(t *testing.T, u *url.URL) {
resp = MakeRequest(t, req, http.StatusOK)
contentsListResponse = DecodeJSON(t, resp, []*api.ContentsResponse{})
assert.NotNil(t, contentsListResponse)
tagCommit, err := gitRepo.GetTagCommit(ref)
tagCommit, err := gitRepo.GetTagCommit(t.Context(), ref)
assert.NoError(t, err)
lastCommit, err = tagCommit.GetCommitByPath(gitRepo, "README.md")
lastCommit, err = tagCommit.GetCommitByPath(t.Context(), gitRepo, "README.md")
assert.NoError(t, err)
expectedContentsListResponse = getExpectedContentsListResponseForContents(ref, refType, lastCommit.ID.String())
assert.Equal(t, expectedContentsListResponse, contentsListResponse)
tests/integration/api_repo_get_contents_test.go
+9 -9
View File
@@ -78,20 +78,20 @@ func testAPIGetContents(t *testing.T, _ *url.URL) {
token4 := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository)
// Get the commit ID of the default branch
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo1)
gitRepo, err := gitrepo.OpenRepository(repo1)
require.NoError(t, err)
defer gitRepo.Close()
// Make a new branch in repo1
newBranch := "test_branch"
err = repo_service.CreateNewBranch(t.Context(), user2, repo1, repo1.DefaultBranch, newBranch)
err = repo_service.CreateNewBranch(t.Context(), user2, repo1, gitRepo, repo1.DefaultBranch, newBranch)
require.NoError(t, err)
commitID, err := gitRepo.GetBranchCommitID(repo1.DefaultBranch)
commitID, err := gitRepo.GetBranchCommitID(t.Context(), repo1.DefaultBranch)
require.NoError(t, err)
// Make a new tag in repo1
newTag := "test_tag"
err = gitRepo.CreateTag(newTag, commitID)
err = gitRepo.CreateTag(t.Context(), newTag, commitID)
require.NoError(t, err)
/*** END SETUP ***/
@@ -106,7 +106,7 @@ func testAPIGetContents(t *testing.T, _ *url.URL) {
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/%s?ref=%s", user2.Name, repo1.Name, treePath, ref)
resp = MakeRequest(t, req, http.StatusOK)
contentsResponse := DecodeJSON(t, resp, &api.ContentsResponse{})
lastCommit, _ := gitRepo.GetCommitByPath("README.md")
lastCommit, _ := gitRepo.GetCommitByPath(t.Context(), "README.md")
expectedContentsResponse := getExpectedContentsResponseForContents(ref, refType, lastCommit.ID.String())
assert.Equal(t, *expectedContentsResponse, *contentsResponse)
@@ -124,8 +124,8 @@ func testAPIGetContents(t *testing.T, _ *url.URL) {
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/%s?ref=%s", user2.Name, repo1.Name, treePath, ref)
resp = MakeRequest(t, req, http.StatusOK)
contentsResponse = DecodeJSON(t, resp, &api.ContentsResponse{})
branchCommit, _ := gitRepo.GetBranchCommit(ref)
lastCommit, _ = branchCommit.GetCommitByPath(gitRepo, "README.md")
branchCommit, _ := gitRepo.GetBranchCommit(t.Context(), ref)
lastCommit, _ = branchCommit.GetCommitByPath(t.Context(), gitRepo, "README.md")
expectedContentsResponse = getExpectedContentsResponseForContents(ref, refType, lastCommit.ID.String())
assert.Equal(t, *expectedContentsResponse, *contentsResponse)
@@ -135,8 +135,8 @@ func testAPIGetContents(t *testing.T, _ *url.URL) {
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/%s?ref=%s", user2.Name, repo1.Name, treePath, ref)
resp = MakeRequest(t, req, http.StatusOK)
contentsResponse = DecodeJSON(t, resp, &api.ContentsResponse{})
tagCommit, _ := gitRepo.GetTagCommit(ref)
lastCommit, _ = tagCommit.GetCommitByPath(gitRepo, "README.md")
tagCommit, _ := gitRepo.GetTagCommit(t.Context(), ref)
lastCommit, _ = tagCommit.GetCommitByPath(t.Context(), gitRepo, "README.md")
expectedContentsResponse = getExpectedContentsResponseForContents(ref, refType, lastCommit.ID.String())
assert.Equal(t, *expectedContentsResponse, *contentsResponse)
tests/integration/api_repo_git_tags_test.go
+5 -5
View File
@@ -31,17 +31,17 @@ func TestAPIGitTags(t *testing.T) {
_ = gitrepo.GitConfigSet(t.Context(), repo, "user.name", user.Name)
_ = gitrepo.GitConfigSet(t.Context(), repo, "user.email", user.Email)
gitRepo, _ := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, _ := gitrepo.OpenRepository(repo)
defer gitRepo.Close()
commit, _ := gitRepo.GetBranchCommit("master")
commit, _ := gitRepo.GetBranchCommit(t.Context(), "master")
lTagName := "lightweightTag"
gitRepo.CreateTag(lTagName, commit.ID.String())
gitRepo.CreateTag(t.Context(), lTagName, commit.ID.String())
aTagName := "annotatedTag"
aTagMessage := "my annotated message"
gitRepo.CreateAnnotatedTag(aTagName, aTagMessage, commit.ID.String())
aTag, _ := gitRepo.GetTag(aTagName)
gitRepo.CreateAnnotatedTag(t.Context(), aTagName, aTagMessage, commit.ID.String())
aTag, _ := gitRepo.GetTag(t.Context(), aTagName)
// SHOULD work for annotated tags
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/git/tags/%s", user.Name, repo.Name, aTag.ID.String()).
tests/integration/compare_test.go
+3 -3
View File
@@ -182,12 +182,12 @@ func TestResolveRefWithSuffixContract(t *testing.T) {
defer tests.PrepareTestEnv(t)()
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 31})
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, err := gitrepo.OpenRepository(repo)
require.NoError(t, err)
defer gitRepo.Close()
// a nil error guarantees a usable RefName
ref, err := common.ResolveRefWithSuffix(gitRepo, "add-csv", "^")
ref, err := common.ResolveRefWithSuffix(t.Context(), gitRepo, "add-csv", "^")
require.NoError(t, err)
assert.NotEmpty(t, ref)
// a ref resolved with a suffix must be a commit SHA, not a branch ref
@@ -199,7 +199,7 @@ func TestResolveRefWithSuffixContract(t *testing.T) {
{"does-not-exist", ""},
{"add-csv", "~50"},
} {
ref, err := common.ResolveRefWithSuffix(gitRepo, tc.oriRef, tc.suffix)
ref, err := common.ResolveRefWithSuffix(t.Context(), gitRepo, tc.oriRef, tc.suffix)
assert.ErrorIs(t, err, util.ErrNotExist, "ref %q suffix %q", tc.oriRef, tc.suffix)
assert.Empty(t, ref, "ref %q suffix %q", tc.oriRef, tc.suffix)
}
tests/integration/editor_test.go
+4 -4
View File
@@ -221,10 +221,10 @@ func testEditorWebGitCommitEmail(t *testing.T) {
require.True(t, user.KeepEmailPrivate)
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
gitRepo, _ := gitrepo.OpenRepository(t.Context(), repo1)
gitRepo, _ := gitrepo.OpenRepository(repo1)
defer gitRepo.Close()
getLastCommit := func(t *testing.T) *git.Commit {
c, err := gitRepo.GetBranchCommit("master")
c, err := gitRepo.GetBranchCommit(t.Context(), "master")
require.NoError(t, err)
return c
}
@@ -349,9 +349,9 @@ index 0000000000..bbbbbbbbbb
},
)
commit1, err := gitRepo.GetCommitByPath("patch-file-1.txt")
commit1, err := gitRepo.GetCommitByPath(t.Context(), "patch-file-1.txt")
require.NoError(t, err)
commit2, err := gitRepo.GetCommitByPath("patch-file-2.txt")
commit2, err := gitRepo.GetCommitByPath(t.Context(), "patch-file-2.txt")
require.NoError(t, err)
resp1, _ := testWebGit(t,
"/user2/repo1/_cherrypick/"+commit1.ID.String()+"/master", map[string]string{"revert": "true"},
tests/integration/git_general_test.go
+3 -3
View File
@@ -811,7 +811,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, headBranch string
return
}
gitRepo, err := git.OpenRepository(t.Context(), dstPath)
gitRepo, err := git.OpenRepository(dstPath)
require.NoError(t, err)
defer gitRepo.Close()
@@ -848,7 +848,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, headBranch string
Message: "Testing commit 1",
})
assert.NoError(t, err)
commit, err = gitRepo.GetRefCommitID("HEAD")
commit, err = gitRepo.GetRefCommitID(t.Context(), "HEAD")
assert.NoError(t, err)
})
@@ -920,7 +920,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, headBranch string
Message: "Testing commit 2",
})
assert.NoError(t, err)
commit, err = gitRepo.GetRefCommitID("HEAD")
commit, err = gitRepo.GetRefCommitID(t.Context(), "HEAD")
assert.NoError(t, err)
})
tests/integration/git_misc_test.go
+8 -8
View File
@@ -44,20 +44,20 @@ func TestDataAsyncDoubleRead_Issue29101(t *testing.T) {
sha := resp.Commit.SHA
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, err := gitrepo.OpenRepository(repo)
assert.NoError(t, err)
commit, err := gitRepo.GetCommit(sha)
commit, err := gitRepo.GetCommit(t.Context(), sha)
assert.NoError(t, err)
entry, err := commit.GetTreeEntryByPath(t.Context(), gitRepo, "test.txt")
assert.NoError(t, err)
b := entry.Blob(gitRepo)
r1, err := b.DataAsync()
r1, err := b.DataAsync(t.Context())
assert.NoError(t, err)
defer r1.Close()
r2, err := b.DataAsync()
r2, err := b.DataAsync(t.Context())
assert.NoError(t, err)
defer r2.Close()
@@ -87,7 +87,7 @@ func TestAgitPullPush(t *testing.T) {
dstPath := t.TempDir()
doGitClone(dstPath, u)(t)
gitRepo, err := git.OpenRepository(t.Context(), dstPath)
gitRepo, err := git.OpenRepository(dstPath)
assert.NoError(t, err)
defer gitRepo.Close()
@@ -150,7 +150,7 @@ func TestAgitReviewStaleness(t *testing.T) {
dstPath := t.TempDir()
doGitClone(dstPath, u)(t)
gitRepo, err := git.OpenRepository(t.Context(), dstPath)
gitRepo, err := git.OpenRepository(dstPath)
assert.NoError(t, err)
defer gitRepo.Close()
@@ -219,11 +219,11 @@ func TestAgitReviewStaleness(t *testing.T) {
// For AGit PRs, HeadCommitID must be loaded from git references
baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
baseGitRepo, err := gitrepo.OpenRepository(t.Context(), baseRepo)
baseGitRepo, err := gitrepo.OpenRepository(baseRepo)
assert.NoError(t, err)
defer baseGitRepo.Close()
updatedCommitID, err := baseGitRepo.GetRefCommitID(pr.GetGitHeadRefName())
updatedCommitID, err := baseGitRepo.GetRefCommitID(t.Context(), pr.GetGitHeadRefName())
assert.NoError(t, err)
t.Logf("Updated commit ID: %s", updatedCommitID)
tests/integration/git_push_test.go
+2 -2
View File
@@ -205,7 +205,7 @@ func runTestGitPush(t *testing.T, u *url.URL, gitOperation func(t *testing.T, gi
doGitAddRemote(gitPath, "origin", u)(t)
gitRepo, err := git.OpenRepository(t.Context(), gitPath)
gitRepo, err := git.OpenRepository(gitPath)
require.NoError(t, err)
defer gitRepo.Close()
@@ -229,7 +229,7 @@ func runTestGitPush(t *testing.T, u *url.URL, gitOperation func(t *testing.T, gi
deleted := deletedBranchesMap[branchName]
assert.True(t, ok, "branch %s not found in database", branchName)
assert.Equal(t, deleted, branch.IsDeleted, "IsDeleted of %s is %v, but it's expected to be %v", branchName, branch.IsDeleted, deleted)
commitID, err := gitRepo.GetBranchCommitID(branchName)
commitID, err := gitRepo.GetBranchCommitID(t.Context(), branchName)
require.NoError(t, err)
assert.Equal(t, commitID, branch.CommitID)
}
tests/integration/migrate_test.go
+3 -3
View File
@@ -336,11 +336,11 @@ func Test_MigrateFromGiteaToGitea(t *testing.T) {
assert.False(t, pr13.HasMerged)
assert.True(t, pr13.Issue.IsLocked)
gitRepo, err := gitrepo.OpenRepository(t.Context(), migratedRepo)
gitRepo, err := gitrepo.OpenRepository(migratedRepo)
require.NoError(t, err)
defer gitRepo.Close()
branches, _, err := gitRepo.GetBranchNames(0, 0)
branches, _, err := gitRepo.GetBranchNames(t.Context(), 0, 0)
require.NoError(t, err)
assert.ElementsMatch(t, []string{"6543-patch-1", "master", "6543-forks/add-xkcd-2199"}, branches) // last branch comes from the pull request
@@ -350,7 +350,7 @@ func Test_MigrateFromGiteaToGitea(t *testing.T) {
require.NoError(t, err)
assert.ElementsMatch(t, []string{"6543-patch-1", "master", "6543-forks/add-xkcd-2199"}, branchNames)
tags, _, err := gitRepo.GetTagInfos(0, 0)
tags, _, err := gitRepo.GetTagInfos(t.Context(), 0, 0)
require.NoError(t, err)
tagNames := make([]string, 0, len(tags))
for _, tag := range tags {
tests/integration/mirror_pull_test.go
+2 -2
View File
@@ -66,7 +66,7 @@ func TestMirrorPull(t *testing.T) {
assert.True(t, slices.ContainsFunc(mirrorRepo.Units, func(u *repo_model.RepoUnit) bool { return u.Type == unit.TypeReleases }))
assert.True(t, slices.ContainsFunc(mirrorRepo.Units, func(u *repo_model.RepoUnit) bool { return u.Type == unit.TypeWiki }))
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, err := gitrepo.OpenRepository(repo)
assert.NoError(t, err)
defer gitRepo.Close()
@@ -79,7 +79,7 @@ func TestMirrorPull(t *testing.T) {
assert.NoError(t, err)
assert.Zero(t, initCount) // no sync yet, so even though there is a tag in source repo, the mirror's release table is still empty
assert.NoError(t, release_service.CreateRelease(gitRepo, &repo_model.Release{
assert.NoError(t, release_service.CreateRelease(ctx, gitRepo, &repo_model.Release{
RepoID: repo.ID,
Repo: repo,
PublisherID: user.ID,
tests/integration/mirror_push_test.go
+4 -4
View File
@@ -60,18 +60,18 @@ func testMirrorPush(t *testing.T, u *url.URL) {
ok := mirror_service.SyncPushMirror(t.Context(), mirrors[0].ID)
assert.True(t, ok)
srcGitRepo, err := gitrepo.OpenRepository(t.Context(), srcRepo)
srcGitRepo, err := gitrepo.OpenRepository(srcRepo)
assert.NoError(t, err)
defer srcGitRepo.Close()
srcCommit, err := srcGitRepo.GetBranchCommit("master")
srcCommit, err := srcGitRepo.GetBranchCommit(t.Context(), "master")
assert.NoError(t, err)
mirrorGitRepo, err := gitrepo.OpenRepository(t.Context(), mirrorRepo)
mirrorGitRepo, err := gitrepo.OpenRepository(mirrorRepo)
assert.NoError(t, err)
defer mirrorGitRepo.Close()
mirrorCommit, err := mirrorGitRepo.GetBranchCommit("master")
mirrorCommit, err := mirrorGitRepo.GetBranchCommit(t.Context(), "master")
assert.NoError(t, err)
assert.Equal(t, srcCommit.ID, mirrorCommit.ID)
tests/integration/pull_merge_test.go
+7 -7
View File
@@ -838,11 +838,11 @@ func TestPullAutoMergeAfterCommitStatusSucceed(t *testing.T) {
assert.Empty(t, pr.MergedCommitID)
// update commit status to success, then it should be merged automatically
baseGitRepo, err := gitrepo.OpenRepository(t.Context(), baseRepo)
baseGitRepo, err := gitrepo.OpenRepository(baseRepo)
assert.NoError(t, err)
sha, err := baseGitRepo.GetRefCommitID(pr.GetGitHeadRefName())
sha, err := baseGitRepo.GetRefCommitID(t.Context(), pr.GetGitHeadRefName())
assert.NoError(t, err)
branches, _, err := baseGitRepo.GetBranchNames(0, 100)
branches, _, err := baseGitRepo.GetBranchNames(t.Context(), 0, 100)
assert.NoError(t, err)
assert.ElementsMatch(t, []string{"sub-home-md-img-check", "home-md-img-check", "pr-to-update", "branch2", "DefaultBranch", "develop", "feature/1", "master"}, branches)
baseGitRepo.Close()
@@ -910,9 +910,9 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApproval(t *testing.T) {
assert.Empty(t, pr.MergedCommitID)
// update commit status to success, then it should be merged automatically
baseGitRepo, err := gitrepo.OpenRepository(t.Context(), baseRepo)
baseGitRepo, err := gitrepo.OpenRepository(baseRepo)
assert.NoError(t, err)
sha, err := baseGitRepo.GetRefCommitID(pr.GetGitHeadRefName())
sha, err := baseGitRepo.GetRefCommitID(t.Context(), pr.GetGitHeadRefName())
assert.NoError(t, err)
baseGitRepo.Close()
@@ -1023,9 +1023,9 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApprovalForAgitFlow(t *testing.
assert.Empty(t, pr.MergedCommitID)
// update commit status to success, then it should be merged automatically
baseGitRepo, err := gitrepo.OpenRepository(t.Context(), baseRepo)
baseGitRepo, err := gitrepo.OpenRepository(baseRepo)
assert.NoError(t, err)
sha, err := baseGitRepo.GetRefCommitID(pr.GetGitHeadRefName())
sha, err := baseGitRepo.GetRefCommitID(t.Context(), pr.GetGitHeadRefName())
assert.NoError(t, err)
baseGitRepo.Close()
err = commitstatus_service.CreateCommitStatus(t.Context(), baseRepo, user1, sha, &git_model.CommitStatus{
tests/integration/pull_review_test.go
+3 -3
View File
@@ -100,10 +100,10 @@ func TestPullView_CodeOwner(t *testing.T) {
// capture the current PR head ref so we can wait for the async
// refs/pull/N/head sync triggered by the next push to complete
baseGitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
baseGitRepo, err := gitrepo.OpenRepository(repo)
require.NoError(t, err)
defer baseGitRepo.Close()
headRefBefore, err := baseGitRepo.GetRefCommitID(pr.GetGitHeadRefName())
headRefBefore, err := baseGitRepo.GetRefCommitID(t.Context(), pr.GetGitHeadRefName())
require.NoError(t, err)
// update the file on the pr branch
@@ -123,7 +123,7 @@ func TestPullView_CodeOwner(t *testing.T) {
// it before evaluating code owners, otherwise the changed-file set may not
// yet include user8-file.md and the review request would be missed
require.Eventually(t, func() bool {
headRefAfter, err := baseGitRepo.GetRefCommitID(pr.GetGitHeadRefName())
headRefAfter, err := baseGitRepo.GetRefCommitID(t.Context(), pr.GetGitHeadRefName())
return err == nil && headRefAfter != headRefBefore
}, 30*time.Second, 100*time.Millisecond)
tests/integration/repo_webhook_test.go
+20 -20
View File
@@ -410,17 +410,17 @@ func Test_WebhookPushDevBranch(t *testing.T) {
assert.Empty(t, payloads)
repo1 := unittest.AssertExistsAndLoadBean(t, &repo.Repository{ID: 1})
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo1)
gitRepo, err := gitrepo.OpenRepository(repo1)
assert.NoError(t, err)
defer gitRepo.Close()
beforeCommitID, err := gitRepo.GetBranchCommitID("develop")
beforeCommitID, err := gitRepo.GetBranchCommitID(t.Context(), "develop")
assert.NoError(t, err)
// 3. trigger the webhook
testCreateFile(t, session, "user2", "repo1", "develop", "", "test_webhook_push.md", "# a test file for webhook push")
afterCommitID, err := gitRepo.GetBranchCommitID("develop")
afterCommitID, err := gitRepo.GetBranchCommitID(t.Context(), "develop")
assert.NoError(t, err)
// 4. validate the webhook is triggered
@@ -461,17 +461,17 @@ func Test_WebhookPushToNewBranch(t *testing.T) {
testAPICreateWebhookForRepo(t, session, "user2", "repo1", provider.URL(), "push", "new_branch")
repo1 := unittest.AssertExistsAndLoadBean(t, &repo.Repository{ID: 1})
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo1)
gitRepo, err := gitrepo.OpenRepository(repo1)
assert.NoError(t, err)
defer gitRepo.Close()
beforeCommitID, err := gitRepo.GetBranchCommitID("master")
beforeCommitID, err := gitRepo.GetBranchCommitID(t.Context(), "master")
assert.NoError(t, err)
// 2. trigger the webhook
testCreateFile(t, session, "user2", "repo1", "master", "new_branch", "test_webhook_push.md", "# a new push from new branch")
afterCommitID, err := gitRepo.GetBranchCommitID("new_branch")
afterCommitID, err := gitRepo.GetBranchCommitID(t.Context(), "new_branch")
assert.NoError(t, err)
emptyCommitID := git.Sha1ObjectFormat.EmptyObjectID().String()
@@ -926,9 +926,9 @@ func Test_WebhookStatus(t *testing.T) {
repo1 := unittest.AssertExistsAndLoadBean(t, &repo.Repository{ID: 1})
gitRepo1, err := gitrepo.OpenRepository(t.Context(), repo1)
gitRepo1, err := gitrepo.OpenRepository(repo1)
assert.NoError(t, err)
commitID, err := gitRepo1.GetBranchCommitID(repo1.DefaultBranch)
commitID, err := gitRepo1.GetBranchCommitID(t.Context(), repo1.DefaultBranch)
assert.NoError(t, err)
// 2. trigger the webhook
@@ -999,7 +999,7 @@ func Test_WebhookWorkflowJob(t *testing.T) {
repo1 := unittest.AssertExistsAndLoadBean(t, &repo.Repository{ID: 1})
gitRepo1, err := gitrepo.OpenRepository(t.Context(), repo1)
gitRepo1, err := gitrepo.OpenRepository(repo1)
assert.NoError(t, err)
runner := newMockRunner()
@@ -1027,7 +1027,7 @@ jobs:
opts := getWorkflowCreateFileOptions(user2, repo1.DefaultBranch, "create "+wfTreePath, wfFileContent)
createWorkflowFile(t, token, "user2", "repo1", wfTreePath, opts)
commitID, err := gitRepo1.GetBranchCommitID(repo1.DefaultBranch)
commitID, err := gitRepo1.GetBranchCommitID(t.Context(), repo1.DefaultBranch)
assert.NoError(t, err)
// 3. validate the webhook is triggered
@@ -1191,7 +1191,7 @@ func testWorkflowRunEvents(t *testing.T, webhookData *workflowRunWebhook) {
repo1 := unittest.AssertExistsAndLoadBean(t, &repo.Repository{ID: 1})
gitRepo1, err := gitrepo.OpenRepository(t.Context(), repo1)
gitRepo1, err := gitrepo.OpenRepository(repo1)
assert.NoError(t, err)
// 2.2 trigger the webhooks
@@ -1268,7 +1268,7 @@ jobs:
opts := getWorkflowCreateFileOptions(user2, repo1.DefaultBranch, "create "+wfTreePath, wfFileContent)
createWorkflowFile(t, token, "user2", "repo1", wfTreePath, opts)
commitID, err := gitRepo1.GetBranchCommitID(repo1.DefaultBranch)
commitID, err := gitRepo1.GetBranchCommitID(t.Context(), repo1.DefaultBranch)
assert.NoError(t, err)
// 3. validate the webhook is triggered
@@ -1316,7 +1316,7 @@ func testWorkflowRunEventsOnRerun(t *testing.T, webhookData *workflowRunWebhook)
repo1 := unittest.AssertExistsAndLoadBean(t, &repo.Repository{ID: 1})
gitRepo1, err := gitrepo.OpenRepository(t.Context(), repo1)
gitRepo1, err := gitrepo.OpenRepository(repo1)
assert.NoError(t, err)
// 2.2 trigger the webhooks
@@ -1393,7 +1393,7 @@ jobs:
opts := getWorkflowCreateFileOptions(user2, repo1.DefaultBranch, "create "+wfTreePath, wfFileContent)
createWorkflowFile(t, token, "user2", "repo1", wfTreePath, opts)
commitID, err := gitRepo1.GetBranchCommitID(repo1.DefaultBranch)
commitID, err := gitRepo1.GetBranchCommitID(t.Context(), repo1.DefaultBranch)
assert.NoError(t, err)
// 3. validate the webhook is triggered
@@ -1486,7 +1486,7 @@ func testWorkflowRunEventsOnCancellingAbandonedRun(t *testing.T, webhookData *wo
testAPICreateWebhookForRepo(t, session, "user2", repoName, webhookData.URL, "workflow_run")
ctx := t.Context()
gitRepo, err := gitrepo.OpenRepository(ctx, testRepo)
gitRepo, err := gitrepo.OpenRepository(testRepo)
assert.NoError(t, err)
// 2.2 trigger the webhooks
@@ -1565,7 +1565,7 @@ jobs:
opts := getWorkflowCreateFileOptions(user2, testRepo.DefaultBranch, "create "+wfTreePath, wfFileContent)
createWorkflowFile(t, token, "user2", repoName, wfTreePath, opts)
commitID, err := gitRepo.GetBranchCommitID(testRepo.DefaultBranch)
commitID, err := gitRepo.GetBranchCommitID(t.Context(), testRepo.DefaultBranch)
assert.NoError(t, err)
// 3. validate the webhook is triggered
@@ -1704,7 +1704,7 @@ func testWebhookWorkflowRun(t *testing.T, webhookData *workflowRunWebhook) {
repo1 := unittest.AssertExistsAndLoadBean(t, &repo.Repository{ID: 1})
gitRepo1, err := gitrepo.OpenRepository(t.Context(), repo1)
gitRepo1, err := gitrepo.OpenRepository(repo1)
assert.NoError(t, err)
runner := newMockRunner()
@@ -1748,7 +1748,7 @@ jobs:
opts = getWorkflowCreateFileOptions(user2, repo1.DefaultBranch, "create "+wfTreePath, wfFileContent)
createWorkflowFile(t, token, "user2", "repo1", wfTreePath, opts)
commitID, err := gitRepo1.GetBranchCommitID(repo1.DefaultBranch)
commitID, err := gitRepo1.GetBranchCommitID(t.Context(), repo1.DefaultBranch)
assert.NoError(t, err)
// 3. validate the webhook is triggered
@@ -1805,7 +1805,7 @@ func testWebhookWorkflowRunDepthLimit(t *testing.T, webhookData *workflowRunWebh
repo1 := unittest.AssertExistsAndLoadBean(t, &repo.Repository{ID: 1})
gitRepo1, err := gitrepo.OpenRepository(t.Context(), repo1)
gitRepo1, err := gitrepo.OpenRepository(repo1)
assert.NoError(t, err)
// 2. trigger the webhooks
@@ -1828,7 +1828,7 @@ jobs:
opts := getWorkflowCreateFileOptions(user2, repo1.DefaultBranch, "create "+wfTreePath, wfFileContent)
createWorkflowFile(t, token, "user2", "repo1", wfTreePath, opts)
commitID, err := gitRepo1.GetBranchCommitID(repo1.DefaultBranch)
commitID, err := gitRepo1.GetBranchCommitID(t.Context(), repo1.DefaultBranch)
assert.NoError(t, err)
// 3. validate the webhook is triggered
tests/integration/repofiles_change_test.go
+15 -15
View File
@@ -362,11 +362,11 @@ func TestChangeRepoFilesForCreate(t *testing.T) {
// asserts
assert.NoError(t, err)
gitRepo, _ := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, _ := gitrepo.OpenRepository(repo)
defer gitRepo.Close()
commitID, _ := gitRepo.GetBranchCommitID(opts.NewBranch)
lastCommit, _ := gitRepo.GetCommitByPath("new/file.txt")
commitID, _ := gitRepo.GetBranchCommitID(t.Context(), opts.NewBranch)
lastCommit, _ := gitRepo.GetCommitByPath(t.Context(), "new/file.txt")
expectedFileResponse := getExpectedFileResponseForRepoFilesCreate(commitID, lastCommit)
assert.NotNil(t, expectedFileResponse)
if expectedFileResponse != nil {
@@ -399,11 +399,11 @@ func TestChangeRepoFilesForUpdate(t *testing.T) {
// asserts
assert.NoError(t, err)
gitRepo, _ := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, _ := gitrepo.OpenRepository(repo)
defer gitRepo.Close()
commit, _ := gitRepo.GetBranchCommit(opts.NewBranch)
lastCommit, _ := commit.GetCommitByPath(gitRepo, opts.Files[0].TreePath)
commit, _ := gitRepo.GetBranchCommit(t.Context(), opts.NewBranch)
lastCommit, _ := commit.GetCommitByPath(t.Context(), gitRepo, opts.Files[0].TreePath)
expectedFileResponse := getExpectedFileResponseForRepoFilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String(), lastCommit.Committer.When, lastCommit.Author.When)
assert.Equal(t, expectedFileResponse.Content, filesResponse.Files[0])
assert.Equal(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA)
@@ -435,11 +435,11 @@ func TestChangeRepoFilesForUpdateWithFileMove(t *testing.T) {
// asserts
assert.NoError(t, err)
gitRepo, _ := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, _ := gitrepo.OpenRepository(repo)
defer gitRepo.Close()
commit, _ := gitRepo.GetBranchCommit(opts.NewBranch)
lastCommit, _ := commit.GetCommitByPath(gitRepo, opts.Files[0].TreePath)
commit, _ := gitRepo.GetBranchCommit(t.Context(), opts.NewBranch)
lastCommit, _ := commit.GetCommitByPath(t.Context(), gitRepo, opts.Files[0].TreePath)
expectedFileResponse := getExpectedFileResponseForRepoFilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String(), lastCommit.Committer.When, lastCommit.Author.When)
// assert that the old file no longer exists in the last commit of the branch
fromEntry, err := commit.GetTreeEntryByPath(ctx, gitRepo, opts.Files[0].FromTreePath)
@@ -481,11 +481,11 @@ func TestChangeRepoFilesForUpdateWithFileRename(t *testing.T) {
// asserts
assert.NoError(t, err)
gitRepo, _ := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, _ := gitrepo.OpenRepository(repo)
defer gitRepo.Close()
commit, _ := gitRepo.GetBranchCommit(repo.DefaultBranch)
lastCommit, _ := commit.GetCommitByPath(gitRepo, opts.Files[0].TreePath)
commit, _ := gitRepo.GetBranchCommit(t.Context(), repo.DefaultBranch)
lastCommit, _ := commit.GetCommitByPath(t.Context(), gitRepo, opts.Files[0].TreePath)
expectedFileResponse := getExpectedFileResponseForRepoFilesUpdateRename(commit.ID.String(), lastCommit.ID.String())
for _, file := range filesResponse.Files {
file.LastCommitterDate, file.LastAuthorDate = nil, nil // there might be different time in one operation, so we ignore them
@@ -518,11 +518,11 @@ func TestChangeRepoFilesWithoutBranchNames(t *testing.T) {
// asserts
assert.NoError(t, err)
gitRepo, _ := gitrepo.OpenRepository(t.Context(), repo)
gitRepo, _ := gitrepo.OpenRepository(repo)
defer gitRepo.Close()
commit, _ := gitRepo.GetBranchCommit(repo.DefaultBranch)
lastCommit, _ := commit.GetCommitByPath(gitRepo, opts.Files[0].TreePath)
commit, _ := gitRepo.GetBranchCommit(t.Context(), repo.DefaultBranch)
lastCommit, _ := commit.GetCommitByPath(t.Context(), gitRepo, opts.Files[0].TreePath)
expectedFileResponse := getExpectedFileResponseForRepoFilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String(), lastCommit.Committer.When, lastCommit.Author.When)
assert.Equal(t, expectedFileResponse.Content, filesResponse.Files[0])
})