2019-05-11 11:29:17 -04:00
|
|
|
// Copyright 2019 The Gitea Authors. All rights reserved.
|
2022-11-27 13:20:29 -05:00
|
|
|
// SPDX-License-Identifier: MIT
|
2019-05-11 11:29:17 -04:00
|
|
|
|
2022-09-02 15:18:23 -04:00
|
|
|
package integration
|
2019-05-11 11:29:17 -04:00
|
|
|
|
|
|
|
import (
|
|
|
|
"net/url"
|
2019-06-29 16:51:10 -04:00
|
|
|
"path/filepath"
|
2023-07-18 14:14:47 -04:00
|
|
|
"strings"
|
2019-05-11 11:29:17 -04:00
|
|
|
"testing"
|
|
|
|
"time"
|
|
|
|
|
2021-12-09 20:27:50 -05:00
|
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
2023-05-29 05:41:35 -04:00
|
|
|
"code.gitea.io/gitea/models/unittest"
|
2024-08-26 02:03:48 -04:00
|
|
|
user_model "code.gitea.io/gitea/models/user"
|
2019-05-11 11:29:17 -04:00
|
|
|
"code.gitea.io/gitea/modules/git"
|
Simplify how git repositories are opened (#28937)
## Purpose
This is a refactor toward building an abstraction over managing git
repositories.
Afterwards, it does not matter anymore if they are stored on the local
disk or somewhere remote.
## What this PR changes
We used `git.OpenRepository` everywhere previously.
Now, we should split them into two distinct functions:
Firstly, there are temporary repositories which do not change:
```go
git.OpenRepository(ctx, diskPath)
```
Gitea managed repositories having a record in the database in the
`repository` table are moved into the new package `gitrepo`:
```go
gitrepo.OpenRepository(ctx, repo_model.Repo)
```
Why is `repo_model.Repository` the second parameter instead of file
path?
Because then we can easily adapt our repository storage strategy.
The repositories can be stored locally, however, they could just as well
be stored on a remote server.
## Further changes in other PRs
- A Git Command wrapper on package `gitrepo` could be created. i.e.
`NewCommand(ctx, repo_model.Repository, commands...)`. `git.RunOpts{Dir:
repo.RepoPath()}`, the directory should be empty before invoking this
method and it can be filled in the function only. #28940
- Remove the `RepoPath()`/`WikiPath()` functions to reduce the
possibility of mistakes.
---------
Co-authored-by: delvh <dev.lh@web.de>
2024-01-27 15:09:51 -05:00
|
|
|
"code.gitea.io/gitea/modules/gitrepo"
|
2019-05-11 11:29:17 -04:00
|
|
|
"code.gitea.io/gitea/modules/setting"
|
|
|
|
api "code.gitea.io/gitea/modules/structs"
|
2021-11-24 02:56:24 -05:00
|
|
|
files_service "code.gitea.io/gitea/services/repository/files"
|
2024-11-10 12:25:41 -05:00
|
|
|
"code.gitea.io/gitea/tests"
|
2019-05-11 11:29:17 -04:00
|
|
|
|
|
|
|
"github.com/stretchr/testify/assert"
|
2024-07-30 15:41:10 -04:00
|
|
|
"github.com/stretchr/testify/require"
|
2019-05-11 11:29:17 -04:00
|
|
|
)
|
|
|
|
|
2023-05-29 05:41:35 -04:00
|
|
|
func getCreateRepoFilesOptions(repo *repo_model.Repository) *files_service.ChangeRepoFilesOptions {
|
|
|
|
return &files_service.ChangeRepoFilesOptions{
|
|
|
|
Files: []*files_service.ChangeRepoFile{
|
|
|
|
{
|
2023-07-18 14:14:47 -04:00
|
|
|
Operation: "create",
|
|
|
|
TreePath: "new/file.txt",
|
|
|
|
ContentReader: strings.NewReader("This is a NEW file"),
|
2023-05-29 05:41:35 -04:00
|
|
|
},
|
|
|
|
},
|
2019-05-11 11:29:17 -04:00
|
|
|
OldBranch: repo.DefaultBranch,
|
|
|
|
NewBranch: repo.DefaultBranch,
|
|
|
|
Message: "Creates new/file.txt",
|
|
|
|
Author: nil,
|
|
|
|
Committer: nil,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-05-29 05:41:35 -04:00
|
|
|
func getUpdateRepoFilesOptions(repo *repo_model.Repository) *files_service.ChangeRepoFilesOptions {
|
|
|
|
return &files_service.ChangeRepoFilesOptions{
|
|
|
|
Files: []*files_service.ChangeRepoFile{
|
|
|
|
{
|
2023-07-18 14:14:47 -04:00
|
|
|
Operation: "update",
|
|
|
|
TreePath: "README.md",
|
|
|
|
SHA: "4b4851ad51df6a7d9f25c979345979eaeb5b349f",
|
|
|
|
ContentReader: strings.NewReader("This is UPDATED content for the README file"),
|
2023-05-29 05:41:35 -04:00
|
|
|
},
|
|
|
|
},
|
2019-05-11 11:29:17 -04:00
|
|
|
OldBranch: repo.DefaultBranch,
|
|
|
|
NewBranch: repo.DefaultBranch,
|
|
|
|
Message: "Updates README.md",
|
|
|
|
Author: nil,
|
|
|
|
Committer: nil,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-05-29 05:41:35 -04:00
|
|
|
func getDeleteRepoFilesOptions(repo *repo_model.Repository) *files_service.ChangeRepoFilesOptions {
|
|
|
|
return &files_service.ChangeRepoFilesOptions{
|
|
|
|
Files: []*files_service.ChangeRepoFile{
|
|
|
|
{
|
|
|
|
Operation: "delete",
|
2024-11-10 12:25:41 -05:00
|
|
|
TreePath: "README_new.md",
|
|
|
|
SHA: "dbf8d00e022e05b7e5cf7e535de857de57925647",
|
2023-05-29 05:41:35 -04:00
|
|
|
},
|
|
|
|
},
|
|
|
|
LastCommitID: "",
|
|
|
|
OldBranch: repo.DefaultBranch,
|
|
|
|
NewBranch: repo.DefaultBranch,
|
|
|
|
Message: "Deletes README.md",
|
|
|
|
Author: &files_service.IdentityOptions{
|
|
|
|
Name: "Bob Smith",
|
|
|
|
Email: "bob@smith.com",
|
|
|
|
},
|
|
|
|
Committer: nil,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-04-29 04:47:56 -04:00
|
|
|
func getExpectedFileResponseForRepofilesDelete() *api.FileResponse {
|
2023-05-29 05:41:35 -04:00
|
|
|
// Just returns fields that don't change, i.e. fields with commit SHAs and dates can't be determined
|
|
|
|
return &api.FileResponse{
|
|
|
|
Content: nil,
|
|
|
|
Commit: &api.FileCommitResponse{
|
|
|
|
Author: &api.CommitUser{
|
|
|
|
Identity: api.Identity{
|
|
|
|
Name: "Bob Smith",
|
|
|
|
Email: "bob@smith.com",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Committer: &api.CommitUser{
|
|
|
|
Identity: api.Identity{
|
|
|
|
Name: "Bob Smith",
|
|
|
|
Email: "bob@smith.com",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Message: "Deletes README.md\n",
|
|
|
|
},
|
|
|
|
Verification: &api.PayloadCommitVerification{
|
|
|
|
Verified: false,
|
|
|
|
Reason: "gpg.error.not_signed_commit",
|
|
|
|
Signature: "",
|
|
|
|
Payload: "",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-07-30 04:09:04 -04:00
|
|
|
func getExpectedFileResponseForRepofilesCreate(commitID, lastCommitSHA string) *api.FileResponse {
|
2019-06-29 16:51:10 -04:00
|
|
|
treePath := "new/file.txt"
|
|
|
|
encoding := "base64"
|
|
|
|
content := "VGhpcyBpcyBhIE5FVyBmaWxl"
|
|
|
|
selfURL := setting.AppURL + "api/v1/repos/user2/repo1/contents/" + treePath + "?ref=master"
|
|
|
|
htmlURL := setting.AppURL + "user2/repo1/src/branch/master/" + treePath
|
|
|
|
gitURL := setting.AppURL + "api/v1/repos/user2/repo1/git/blobs/103ff9234cefeee5ec5361d22b49fbb04d385885"
|
|
|
|
downloadURL := setting.AppURL + "user2/repo1/raw/branch/master/" + treePath
|
2019-05-11 11:29:17 -04:00
|
|
|
return &api.FileResponse{
|
2019-06-29 16:51:10 -04:00
|
|
|
Content: &api.ContentsResponse{
|
2022-07-30 04:09:04 -04:00
|
|
|
Name: filepath.Base(treePath),
|
|
|
|
Path: treePath,
|
|
|
|
SHA: "103ff9234cefeee5ec5361d22b49fbb04d385885",
|
|
|
|
LastCommitSHA: lastCommitSHA,
|
|
|
|
Type: "file",
|
|
|
|
Size: 18,
|
|
|
|
Encoding: &encoding,
|
|
|
|
Content: &content,
|
|
|
|
URL: &selfURL,
|
|
|
|
HTMLURL: &htmlURL,
|
|
|
|
GitURL: &gitURL,
|
|
|
|
DownloadURL: &downloadURL,
|
2019-05-11 11:29:17 -04:00
|
|
|
Links: &api.FileLinksResponse{
|
2019-06-29 16:51:10 -04:00
|
|
|
Self: &selfURL,
|
|
|
|
GitURL: &gitURL,
|
|
|
|
HTMLURL: &htmlURL,
|
2019-05-11 11:29:17 -04:00
|
|
|
},
|
|
|
|
},
|
|
|
|
Commit: &api.FileCommitResponse{
|
|
|
|
CommitMeta: api.CommitMeta{
|
|
|
|
URL: setting.AppURL + "api/v1/repos/user2/repo1/git/commits/" + commitID,
|
|
|
|
SHA: commitID,
|
|
|
|
},
|
|
|
|
HTMLURL: setting.AppURL + "user2/repo1/commit/" + commitID,
|
|
|
|
Author: &api.CommitUser{
|
|
|
|
Identity: api.Identity{
|
|
|
|
Name: "User Two",
|
|
|
|
Email: "user2@noreply.example.org",
|
|
|
|
},
|
|
|
|
Date: time.Now().UTC().Format(time.RFC3339),
|
|
|
|
},
|
|
|
|
Committer: &api.CommitUser{
|
|
|
|
Identity: api.Identity{
|
|
|
|
Name: "User Two",
|
|
|
|
Email: "user2@noreply.example.org",
|
|
|
|
},
|
|
|
|
Date: time.Now().UTC().Format(time.RFC3339),
|
|
|
|
},
|
|
|
|
Parents: []*api.CommitMeta{
|
|
|
|
{
|
|
|
|
URL: setting.AppURL + "api/v1/repos/user2/repo1/git/commits/65f1bf27bc3bf70f64657658635e66094edbcb4d",
|
|
|
|
SHA: "65f1bf27bc3bf70f64657658635e66094edbcb4d",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Message: "Updates README.md\n",
|
|
|
|
Tree: &api.CommitMeta{
|
|
|
|
URL: setting.AppURL + "api/v1/repos/user2/repo1/git/trees/f93e3a1a1525fb5b91020da86e44810c87a2d7bc",
|
|
|
|
SHA: "f93e3a1a1525fb5b91020git dda86e44810c87a2d7bc",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Verification: &api.PayloadCommitVerification{
|
|
|
|
Verified: false,
|
2019-10-16 09:42:42 -04:00
|
|
|
Reason: "gpg.error.not_signed_commit",
|
2019-05-11 11:29:17 -04:00
|
|
|
Signature: "",
|
|
|
|
Payload: "",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-07-30 04:09:04 -04:00
|
|
|
func getExpectedFileResponseForRepofilesUpdate(commitID, filename, lastCommitSHA string) *api.FileResponse {
|
2019-06-29 16:51:10 -04:00
|
|
|
encoding := "base64"
|
|
|
|
content := "VGhpcyBpcyBVUERBVEVEIGNvbnRlbnQgZm9yIHRoZSBSRUFETUUgZmlsZQ=="
|
|
|
|
selfURL := setting.AppURL + "api/v1/repos/user2/repo1/contents/" + filename + "?ref=master"
|
|
|
|
htmlURL := setting.AppURL + "user2/repo1/src/branch/master/" + filename
|
|
|
|
gitURL := setting.AppURL + "api/v1/repos/user2/repo1/git/blobs/dbf8d00e022e05b7e5cf7e535de857de57925647"
|
|
|
|
downloadURL := setting.AppURL + "user2/repo1/raw/branch/master/" + filename
|
2019-05-11 11:29:17 -04:00
|
|
|
return &api.FileResponse{
|
2019-06-29 16:51:10 -04:00
|
|
|
Content: &api.ContentsResponse{
|
2022-07-30 04:09:04 -04:00
|
|
|
Name: filename,
|
|
|
|
Path: filename,
|
|
|
|
SHA: "dbf8d00e022e05b7e5cf7e535de857de57925647",
|
|
|
|
LastCommitSHA: lastCommitSHA,
|
|
|
|
Type: "file",
|
|
|
|
Size: 43,
|
|
|
|
Encoding: &encoding,
|
|
|
|
Content: &content,
|
|
|
|
URL: &selfURL,
|
|
|
|
HTMLURL: &htmlURL,
|
|
|
|
GitURL: &gitURL,
|
|
|
|
DownloadURL: &downloadURL,
|
2019-05-11 11:29:17 -04:00
|
|
|
Links: &api.FileLinksResponse{
|
2019-06-29 16:51:10 -04:00
|
|
|
Self: &selfURL,
|
|
|
|
GitURL: &gitURL,
|
|
|
|
HTMLURL: &htmlURL,
|
2019-05-11 11:29:17 -04:00
|
|
|
},
|
|
|
|
},
|
|
|
|
Commit: &api.FileCommitResponse{
|
|
|
|
CommitMeta: api.CommitMeta{
|
|
|
|
URL: setting.AppURL + "api/v1/repos/user2/repo1/git/commits/" + commitID,
|
|
|
|
SHA: commitID,
|
|
|
|
},
|
|
|
|
HTMLURL: setting.AppURL + "user2/repo1/commit/" + commitID,
|
|
|
|
Author: &api.CommitUser{
|
|
|
|
Identity: api.Identity{
|
|
|
|
Name: "User Two",
|
|
|
|
Email: "user2@noreply.example.org",
|
|
|
|
},
|
|
|
|
Date: time.Now().UTC().Format(time.RFC3339),
|
|
|
|
},
|
|
|
|
Committer: &api.CommitUser{
|
|
|
|
Identity: api.Identity{
|
|
|
|
Name: "User Two",
|
|
|
|
Email: "user2@noreply.example.org",
|
|
|
|
},
|
|
|
|
Date: time.Now().UTC().Format(time.RFC3339),
|
|
|
|
},
|
|
|
|
Parents: []*api.CommitMeta{
|
|
|
|
{
|
|
|
|
URL: setting.AppURL + "api/v1/repos/user2/repo1/git/commits/65f1bf27bc3bf70f64657658635e66094edbcb4d",
|
|
|
|
SHA: "65f1bf27bc3bf70f64657658635e66094edbcb4d",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Message: "Updates README.md\n",
|
|
|
|
Tree: &api.CommitMeta{
|
|
|
|
URL: setting.AppURL + "api/v1/repos/user2/repo1/git/trees/f93e3a1a1525fb5b91020da86e44810c87a2d7bc",
|
|
|
|
SHA: "f93e3a1a1525fb5b91020da86e44810c87a2d7bc",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Verification: &api.PayloadCommitVerification{
|
|
|
|
Verified: false,
|
2019-10-16 09:42:42 -04:00
|
|
|
Reason: "gpg.error.not_signed_commit",
|
2019-05-11 11:29:17 -04:00
|
|
|
Signature: "",
|
|
|
|
Payload: "",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-11-10 12:25:41 -05:00
|
|
|
func TestChangeRepoFiles(t *testing.T) {
|
2019-05-11 11:29:17 -04:00
|
|
|
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
2024-08-26 02:03:48 -04:00
|
|
|
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
|
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
2019-05-11 11:29:17 -04:00
|
|
|
|
2024-11-10 12:25:41 -05:00
|
|
|
gitRepo, err := gitrepo.OpenRepository(git.DefaultContext, repo)
|
2024-07-30 15:41:10 -04:00
|
|
|
require.NoError(t, err)
|
2019-11-13 02:01:19 -05:00
|
|
|
defer gitRepo.Close()
|
|
|
|
|
2024-11-10 12:25:41 -05:00
|
|
|
t.Run("Create", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
opts := getCreateRepoFilesOptions(repo)
|
|
|
|
filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
commitID, err := gitRepo.GetBranchCommitID(opts.NewBranch)
|
|
|
|
require.NoError(t, err)
|
|
|
|
lastCommit, err := gitRepo.GetCommitByPath("new/file.txt")
|
|
|
|
require.NoError(t, err)
|
|
|
|
expectedFileResponse := getExpectedFileResponseForRepofilesCreate(commitID, lastCommit.ID.String())
|
2023-05-29 05:41:35 -04:00
|
|
|
assert.EqualValues(t, expectedFileResponse.Content, filesResponse.Files[0])
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA)
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL)
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Commit.Author.Email, filesResponse.Commit.Author.Email)
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Commit.Author.Name, filesResponse.Commit.Author.Name)
|
2024-11-10 12:25:41 -05:00
|
|
|
})
|
2019-05-11 11:29:17 -04:00
|
|
|
|
2024-11-10 12:25:41 -05:00
|
|
|
t.Run("Update", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
opts := getUpdateRepoFilesOptions(repo)
|
|
|
|
filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
|
|
|
|
require.NoError(t, err)
|
2019-11-13 02:01:19 -05:00
|
|
|
|
2024-11-10 12:25:41 -05:00
|
|
|
commit, err := gitRepo.GetBranchCommit(opts.NewBranch)
|
|
|
|
require.NoError(t, err)
|
|
|
|
lastCommit, err := commit.GetCommitByPath(opts.Files[0].TreePath)
|
|
|
|
require.NoError(t, err)
|
|
|
|
expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String())
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Content, filesResponse.Files[0])
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA)
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL)
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Commit.Author.Email, filesResponse.Commit.Author.Email)
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Commit.Author.Name, filesResponse.Commit.Author.Name)
|
|
|
|
})
|
2023-05-29 05:41:35 -04:00
|
|
|
|
2024-11-10 12:25:41 -05:00
|
|
|
t.Run("Update and move", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
opts := getUpdateRepoFilesOptions(repo)
|
|
|
|
opts.Files[0].SHA = "dbf8d00e022e05b7e5cf7e535de857de57925647"
|
|
|
|
opts.Files[0].FromTreePath = "README.md"
|
|
|
|
opts.Files[0].TreePath = "README_new.md" // new file name, README_new.md
|
|
|
|
filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
commit, err := gitRepo.GetBranchCommit(opts.NewBranch)
|
|
|
|
require.NoError(t, err)
|
|
|
|
lastCommit, err := commit.GetCommitByPath(opts.Files[0].TreePath)
|
|
|
|
require.NoError(t, err)
|
|
|
|
expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String())
|
|
|
|
|
|
|
|
// assert that the old file no longer exists in the last commit of the branch
|
|
|
|
fromEntry, err := commit.GetTreeEntryByPath(opts.Files[0].FromTreePath)
|
|
|
|
switch err.(type) {
|
|
|
|
case git.ErrNotExist:
|
|
|
|
// correct, continue
|
|
|
|
default:
|
|
|
|
t.Fatalf("expected git.ErrNotExist, got:%v", err)
|
|
|
|
}
|
|
|
|
toEntry, err := commit.GetTreeEntryByPath(opts.Files[0].TreePath)
|
|
|
|
require.NoError(t, err)
|
|
|
|
assert.Nil(t, fromEntry) // Should no longer exist here
|
|
|
|
assert.NotNil(t, toEntry) // Should exist here
|
|
|
|
// assert SHA has remained the same but paths use the new file name
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Content.SHA, filesResponse.Files[0].SHA)
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Content.Name, filesResponse.Files[0].Name)
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Content.Path, filesResponse.Files[0].Path)
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Content.URL, filesResponse.Files[0].URL)
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA)
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL)
|
|
|
|
})
|
2023-05-29 05:41:35 -04:00
|
|
|
|
2024-11-10 12:25:41 -05:00
|
|
|
t.Run("Change without branch names", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
opts := getUpdateRepoFilesOptions(repo)
|
|
|
|
opts.OldBranch = ""
|
|
|
|
opts.NewBranch = ""
|
|
|
|
opts.Files[0].TreePath = "README_new.md"
|
|
|
|
opts.Files[0].SHA = "dbf8d00e022e05b7e5cf7e535de857de57925647"
|
2023-05-29 05:41:35 -04:00
|
|
|
|
2024-11-10 12:25:41 -05:00
|
|
|
filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
|
|
|
|
require.NoError(t, err)
|
2023-05-29 05:41:35 -04:00
|
|
|
|
2024-11-10 12:25:41 -05:00
|
|
|
commit, _ := gitRepo.GetBranchCommit(repo.DefaultBranch)
|
|
|
|
lastCommit, _ := commit.GetCommitByPath(opts.Files[0].TreePath)
|
|
|
|
expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String())
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Content, filesResponse.Files[0])
|
|
|
|
})
|
2019-05-11 11:29:17 -04:00
|
|
|
|
2024-11-10 12:25:41 -05:00
|
|
|
t.Run("Delete files", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
opts := getDeleteRepoFilesOptions(repo)
|
2023-05-29 05:41:35 -04:00
|
|
|
|
2024-11-10 12:25:41 -05:00
|
|
|
filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
|
|
|
|
require.NoError(t, err)
|
|
|
|
expectedFileResponse := getExpectedFileResponseForRepofilesDelete()
|
|
|
|
assert.NotNil(t, filesResponse)
|
|
|
|
assert.Nil(t, filesResponse.Files[0])
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Commit.Message, filesResponse.Commit.Message)
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Commit.Author.Identity, filesResponse.Commit.Author.Identity)
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Commit.Committer.Identity, filesResponse.Commit.Committer.Identity)
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Verification, filesResponse.Verification)
|
|
|
|
|
|
|
|
filesResponse, err = files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
|
|
|
|
assert.Nil(t, filesResponse)
|
|
|
|
expectedError := "repository file does not exist [path: " + opts.Files[0].TreePath + "]"
|
|
|
|
assert.EqualError(t, err, expectedError)
|
|
|
|
})
|
2024-08-26 02:03:48 -04:00
|
|
|
|
2024-11-10 12:25:41 -05:00
|
|
|
t.Run("Delete without branch name", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
opts := getDeleteRepoFilesOptions(repo)
|
|
|
|
opts.OldBranch = ""
|
|
|
|
opts.NewBranch = ""
|
|
|
|
opts.Files[0].SHA = "103ff9234cefeee5ec5361d22b49fbb04d385885"
|
|
|
|
opts.Files[0].TreePath = "new/file.txt"
|
2023-05-29 05:41:35 -04:00
|
|
|
|
2024-11-10 12:25:41 -05:00
|
|
|
filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
|
|
|
|
require.NoError(t, err)
|
|
|
|
expectedFileResponse := getExpectedFileResponseForRepofilesDelete()
|
|
|
|
assert.NotNil(t, filesResponse)
|
|
|
|
assert.Nil(t, filesResponse.Files[0])
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Commit.Message, filesResponse.Commit.Message)
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Commit.Author.Identity, filesResponse.Commit.Author.Identity)
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Commit.Committer.Identity, filesResponse.Commit.Committer.Identity)
|
|
|
|
assert.EqualValues(t, expectedFileResponse.Verification, filesResponse.Verification)
|
|
|
|
})
|
2023-05-29 05:41:35 -04:00
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestChangeRepoFilesErrors(t *testing.T) {
|
2019-05-11 11:29:17 -04:00
|
|
|
// setup
|
|
|
|
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
2024-08-26 02:03:48 -04:00
|
|
|
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
|
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
2019-05-11 11:29:17 -04:00
|
|
|
|
|
|
|
t.Run("bad branch", func(t *testing.T) {
|
2023-05-29 05:41:35 -04:00
|
|
|
opts := getUpdateRepoFilesOptions(repo)
|
2019-05-11 11:29:17 -04:00
|
|
|
opts.OldBranch = "bad_branch"
|
2023-05-29 05:41:35 -04:00
|
|
|
filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
|
2024-07-30 15:41:10 -04:00
|
|
|
require.Error(t, err)
|
2023-05-29 05:41:35 -04:00
|
|
|
assert.Nil(t, filesResponse)
|
2019-05-11 11:29:17 -04:00
|
|
|
expectedError := "branch does not exist [name: " + opts.OldBranch + "]"
|
|
|
|
assert.EqualError(t, err, expectedError)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("bad SHA", func(t *testing.T) {
|
2023-05-29 05:41:35 -04:00
|
|
|
opts := getUpdateRepoFilesOptions(repo)
|
|
|
|
origSHA := opts.Files[0].SHA
|
|
|
|
opts.Files[0].SHA = "bad_sha"
|
|
|
|
filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
|
|
|
|
assert.Nil(t, filesResponse)
|
2024-07-30 15:41:10 -04:00
|
|
|
require.Error(t, err)
|
2023-05-29 05:41:35 -04:00
|
|
|
expectedError := "sha does not match [given: " + opts.Files[0].SHA + ", expected: " + origSHA + "]"
|
2019-05-11 11:29:17 -04:00
|
|
|
assert.EqualError(t, err, expectedError)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("new branch already exists", func(t *testing.T) {
|
2023-05-29 05:41:35 -04:00
|
|
|
opts := getUpdateRepoFilesOptions(repo)
|
2019-05-11 11:29:17 -04:00
|
|
|
opts.NewBranch = "develop"
|
2023-05-29 05:41:35 -04:00
|
|
|
filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
|
|
|
|
assert.Nil(t, filesResponse)
|
2024-07-30 15:41:10 -04:00
|
|
|
require.Error(t, err)
|
2019-05-11 11:29:17 -04:00
|
|
|
expectedError := "branch already exists [name: " + opts.NewBranch + "]"
|
|
|
|
assert.EqualError(t, err, expectedError)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("treePath is empty:", func(t *testing.T) {
|
2023-05-29 05:41:35 -04:00
|
|
|
opts := getUpdateRepoFilesOptions(repo)
|
|
|
|
opts.Files[0].TreePath = ""
|
|
|
|
filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
|
|
|
|
assert.Nil(t, filesResponse)
|
2024-07-30 15:41:10 -04:00
|
|
|
require.Error(t, err)
|
2019-05-11 11:29:17 -04:00
|
|
|
expectedError := "path contains a malformed path component [path: ]"
|
|
|
|
assert.EqualError(t, err, expectedError)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("treePath is a git directory:", func(t *testing.T) {
|
2023-05-29 05:41:35 -04:00
|
|
|
opts := getUpdateRepoFilesOptions(repo)
|
|
|
|
opts.Files[0].TreePath = ".git"
|
|
|
|
filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
|
|
|
|
assert.Nil(t, filesResponse)
|
2024-07-30 15:41:10 -04:00
|
|
|
require.Error(t, err)
|
2023-05-29 05:41:35 -04:00
|
|
|
expectedError := "path contains a malformed path component [path: " + opts.Files[0].TreePath + "]"
|
2019-05-11 11:29:17 -04:00
|
|
|
assert.EqualError(t, err, expectedError)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("create file that already exists", func(t *testing.T) {
|
2023-05-29 05:41:35 -04:00
|
|
|
opts := getCreateRepoFilesOptions(repo)
|
|
|
|
opts.Files[0].TreePath = "README.md" // already exists
|
|
|
|
fileResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
|
2019-05-11 11:29:17 -04:00
|
|
|
assert.Nil(t, fileResponse)
|
2024-07-30 15:41:10 -04:00
|
|
|
require.Error(t, err)
|
2023-05-29 05:41:35 -04:00
|
|
|
expectedError := "repository file already exists [path: " + opts.Files[0].TreePath + "]"
|
2019-05-11 11:29:17 -04:00
|
|
|
assert.EqualError(t, err, expectedError)
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}
|