mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-06 23:16:52 +02:00
refactor: update tests
use the correct number of arguments when calling certain functions which take a group ID like `RepoPath`
This commit is contained in:
1 parent
2cbb62c302
commit
e07ebf71c3
6 files changed
+19
-19
No files matched your search
@@ -71,7 +71,7 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) {
|
|||||||
err := cargo_service.InitializeIndexRepository(t.Context(), user, user)
|
err := cargo_service.InitializeIndexRepository(t.Context(), user, user)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
|
|
||||||
repo, err := repo_model.GetRepositoryByOwnerAndName(t.Context(), user.Name, cargo_service.IndexRepositoryName)
|
repo, err := repo_model.GetRepositoryByOwnerAndName(t.Context(), user.Name, cargo_service.IndexRepositoryName, 0)
|
||||||
assert.NotNil(t, repo)
|
assert.NotNil(t, repo)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ func TestAPIPrivateServ(t *testing.T) {
|
|||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
// Can push to a repo we own
|
// Can push to a repo we own
|
||||||
results, extra := private.ServCommand(ctx, 1, "user2", "repo1", perm.AccessModeWrite, "git-upload-pack", "")
|
results, extra := private.ServCommand(ctx, 1, "user2", "repo1", 0, perm.AccessModeWrite, "git-upload-pack", "")
|
||||||
assert.NoError(t, extra.Error)
|
assert.NoError(t, extra.Error)
|
||||||
assert.False(t, results.IsWiki)
|
assert.False(t, results.IsWiki)
|
||||||
assert.Zero(t, results.DeployKeyID)
|
assert.Zero(t, results.DeployKeyID)
|
||||||
@@ -56,17 +56,17 @@ func TestAPIPrivateServ(t *testing.T) {
|
|||||||
assert.Equal(t, int64(1), results.RepoID)
|
assert.Equal(t, int64(1), results.RepoID)
|
||||||
|
|
||||||
// Cannot push to a private repo we're not associated with
|
// Cannot push to a private repo we're not associated with
|
||||||
results, extra = private.ServCommand(ctx, 1, "user15", "big_test_private_1", perm.AccessModeWrite, "git-upload-pack", "")
|
results, extra = private.ServCommand(ctx, 1, "user15", "big_test_private_1", 0, perm.AccessModeWrite, "git-upload-pack", "")
|
||||||
assert.Error(t, extra.Error)
|
assert.Error(t, extra.Error)
|
||||||
assert.Empty(t, results)
|
assert.Empty(t, results)
|
||||||
|
|
||||||
// Cannot pull from a private repo we're not associated with
|
// Cannot pull from a private repo we're not associated with
|
||||||
results, extra = private.ServCommand(ctx, 1, "user15", "big_test_private_1", perm.AccessModeRead, "git-upload-pack", "")
|
results, extra = private.ServCommand(ctx, 1, "user15", "big_test_private_1", 0, perm.AccessModeRead, "git-upload-pack", "")
|
||||||
assert.Error(t, extra.Error)
|
assert.Error(t, extra.Error)
|
||||||
assert.Empty(t, results)
|
assert.Empty(t, results)
|
||||||
|
|
||||||
// Can pull from a public repo we're not associated with
|
// Can pull from a public repo we're not associated with
|
||||||
results, extra = private.ServCommand(ctx, 1, "user15", "big_test_public_1", perm.AccessModeRead, "git-upload-pack", "")
|
results, extra = private.ServCommand(ctx, 1, "user15", "big_test_public_1", 0, perm.AccessModeRead, "git-upload-pack", "")
|
||||||
assert.NoError(t, extra.Error)
|
assert.NoError(t, extra.Error)
|
||||||
assert.False(t, results.IsWiki)
|
assert.False(t, results.IsWiki)
|
||||||
assert.Zero(t, results.DeployKeyID)
|
assert.Zero(t, results.DeployKeyID)
|
||||||
@@ -79,7 +79,7 @@ func TestAPIPrivateServ(t *testing.T) {
|
|||||||
assert.Equal(t, int64(17), results.RepoID)
|
assert.Equal(t, int64(17), results.RepoID)
|
||||||
|
|
||||||
// Cannot push to a public repo we're not associated with
|
// Cannot push to a public repo we're not associated with
|
||||||
results, extra = private.ServCommand(ctx, 1, "user15", "big_test_public_1", perm.AccessModeWrite, "git-upload-pack", "")
|
results, extra = private.ServCommand(ctx, 1, "user15", "big_test_public_1", 0, perm.AccessModeWrite, "git-upload-pack", "")
|
||||||
assert.Error(t, extra.Error)
|
assert.Error(t, extra.Error)
|
||||||
assert.Empty(t, results)
|
assert.Empty(t, results)
|
||||||
|
|
||||||
@@ -88,7 +88,7 @@ func TestAPIPrivateServ(t *testing.T) {
|
|||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
|
|
||||||
// Can pull from repo we're a deploy key for
|
// Can pull from repo we're a deploy key for
|
||||||
results, extra = private.ServCommand(ctx, deployKey.KeyID, "user15", "big_test_private_1", perm.AccessModeRead, "git-upload-pack", "")
|
results, extra = private.ServCommand(ctx, deployKey.KeyID, "user15", "big_test_private_1", 0, perm.AccessModeRead, "git-upload-pack", "")
|
||||||
assert.NoError(t, extra.Error)
|
assert.NoError(t, extra.Error)
|
||||||
assert.False(t, results.IsWiki)
|
assert.False(t, results.IsWiki)
|
||||||
assert.NotZero(t, results.DeployKeyID)
|
assert.NotZero(t, results.DeployKeyID)
|
||||||
@@ -101,17 +101,17 @@ func TestAPIPrivateServ(t *testing.T) {
|
|||||||
assert.Equal(t, int64(19), results.RepoID)
|
assert.Equal(t, int64(19), results.RepoID)
|
||||||
|
|
||||||
// Cannot push to a private repo with reading key
|
// Cannot push to a private repo with reading key
|
||||||
results, extra = private.ServCommand(ctx, deployKey.KeyID, "user15", "big_test_private_1", perm.AccessModeWrite, "git-upload-pack", "")
|
results, extra = private.ServCommand(ctx, deployKey.KeyID, "user15", "big_test_private_1", 0, perm.AccessModeWrite, "git-upload-pack", "")
|
||||||
assert.Error(t, extra.Error)
|
assert.Error(t, extra.Error)
|
||||||
assert.Empty(t, results)
|
assert.Empty(t, results)
|
||||||
|
|
||||||
// Cannot pull from a private repo we're not associated with
|
// Cannot pull from a private repo we're not associated with
|
||||||
results, extra = private.ServCommand(ctx, deployKey.ID, "user15", "big_test_private_2", perm.AccessModeRead, "git-upload-pack", "")
|
results, extra = private.ServCommand(ctx, deployKey.ID, "user15", "big_test_private_2", 0, perm.AccessModeRead, "git-upload-pack", "")
|
||||||
assert.Error(t, extra.Error)
|
assert.Error(t, extra.Error)
|
||||||
assert.Empty(t, results)
|
assert.Empty(t, results)
|
||||||
|
|
||||||
// Cannot pull from a public repo we're not associated with
|
// Cannot pull from a public repo we're not associated with
|
||||||
results, extra = private.ServCommand(ctx, deployKey.ID, "user15", "big_test_public_1", perm.AccessModeRead, "git-upload-pack", "")
|
results, extra = private.ServCommand(ctx, deployKey.ID, "user15", "big_test_public_1", 0, perm.AccessModeRead, "git-upload-pack", "")
|
||||||
assert.Error(t, extra.Error)
|
assert.Error(t, extra.Error)
|
||||||
assert.Empty(t, results)
|
assert.Empty(t, results)
|
||||||
|
|
||||||
@@ -120,12 +120,12 @@ func TestAPIPrivateServ(t *testing.T) {
|
|||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
|
|
||||||
// Cannot push to a private repo with reading key
|
// Cannot push to a private repo with reading key
|
||||||
results, extra = private.ServCommand(ctx, deployKey.KeyID, "user15", "big_test_private_1", perm.AccessModeWrite, "git-upload-pack", "")
|
results, extra = private.ServCommand(ctx, deployKey.KeyID, "user15", "big_test_private_1", 0, perm.AccessModeWrite, "git-upload-pack", "")
|
||||||
assert.Error(t, extra.Error)
|
assert.Error(t, extra.Error)
|
||||||
assert.Empty(t, results)
|
assert.Empty(t, results)
|
||||||
|
|
||||||
// Can pull from repo we're a writing deploy key for
|
// Can pull from repo we're a writing deploy key for
|
||||||
results, extra = private.ServCommand(ctx, deployKey.KeyID, "user15", "big_test_private_2", perm.AccessModeRead, "git-upload-pack", "")
|
results, extra = private.ServCommand(ctx, deployKey.KeyID, "user15", "big_test_private_2", 0, perm.AccessModeRead, "git-upload-pack", "")
|
||||||
assert.NoError(t, extra.Error)
|
assert.NoError(t, extra.Error)
|
||||||
assert.False(t, results.IsWiki)
|
assert.False(t, results.IsWiki)
|
||||||
assert.NotZero(t, results.DeployKeyID)
|
assert.NotZero(t, results.DeployKeyID)
|
||||||
@@ -138,7 +138,7 @@ func TestAPIPrivateServ(t *testing.T) {
|
|||||||
assert.Equal(t, int64(20), results.RepoID)
|
assert.Equal(t, int64(20), results.RepoID)
|
||||||
|
|
||||||
// Can push to repo we're a writing deploy key for
|
// Can push to repo we're a writing deploy key for
|
||||||
results, extra = private.ServCommand(ctx, deployKey.KeyID, "user15", "big_test_private_2", perm.AccessModeWrite, "git-upload-pack", "")
|
results, extra = private.ServCommand(ctx, deployKey.KeyID, "user15", "big_test_private_2", 0, perm.AccessModeWrite, "git-upload-pack", "")
|
||||||
assert.NoError(t, extra.Error)
|
assert.NoError(t, extra.Error)
|
||||||
assert.False(t, results.IsWiki)
|
assert.False(t, results.IsWiki)
|
||||||
assert.NotZero(t, results.DeployKeyID)
|
assert.NotZero(t, results.DeployKeyID)
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ func createLFSTestRepository(t *testing.T, repoName string) *repo_model.Reposito
|
|||||||
ctx := NewAPITestContext(t, "user2", repoName, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
|
ctx := NewAPITestContext(t, "user2", repoName, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
|
||||||
t.Run("CreateRepo", doAPICreateRepository(ctx, false))
|
t.Run("CreateRepo", doAPICreateRepository(ctx, false))
|
||||||
|
|
||||||
repo, err := repo_model.GetRepositoryByOwnerAndName(t.Context(), "user2", repoName)
|
repo, err := repo_model.GetRepositoryByOwnerAndName(t.Context(), "user2", repoName, 0)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
return repo
|
return repo
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ func storeObjectInRepo(t *testing.T, repositoryID int64, content *[]byte) string
|
|||||||
}
|
}
|
||||||
|
|
||||||
func storeAndGetLfsToken(t *testing.T, content *[]byte, extraHeader *http.Header, expectedStatus int, ts ...auth.AccessTokenScope) *httptest.ResponseRecorder {
|
func storeAndGetLfsToken(t *testing.T, content *[]byte, extraHeader *http.Header, expectedStatus int, ts ...auth.AccessTokenScope) *httptest.ResponseRecorder {
|
||||||
repo, err := repo_model.GetRepositoryByOwnerAndName(t.Context(), "user2", "repo1")
|
repo, err := repo_model.GetRepositoryByOwnerAndName(t.Context(), "user2", "repo1", 0)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
oid := storeObjectInRepo(t, repo.ID, content)
|
oid := storeObjectInRepo(t, repo.ID, content)
|
||||||
defer git_model.RemoveLFSMetaObjectByOid(t.Context(), repo.ID, oid)
|
defer git_model.RemoveLFSMetaObjectByOid(t.Context(), repo.ID, oid)
|
||||||
@@ -66,7 +66,7 @@ func storeAndGetLfsToken(t *testing.T, content *[]byte, extraHeader *http.Header
|
|||||||
}
|
}
|
||||||
|
|
||||||
func storeAndGetLfs(t *testing.T, content *[]byte, extraHeader *http.Header, expectedStatus int) *httptest.ResponseRecorder {
|
func storeAndGetLfs(t *testing.T, content *[]byte, extraHeader *http.Header, expectedStatus int) *httptest.ResponseRecorder {
|
||||||
repo, err := repo_model.GetRepositoryByOwnerAndName(t.Context(), "user2", "repo1")
|
repo, err := repo_model.GetRepositoryByOwnerAndName(t.Context(), "user2", "repo1", 0)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
oid := storeObjectInRepo(t, repo.ID, content)
|
oid := storeObjectInRepo(t, repo.ID, content)
|
||||||
defer git_model.RemoveLFSMetaObjectByOid(t.Context(), repo.ID, oid)
|
defer git_model.RemoveLFSMetaObjectByOid(t.Context(), repo.ID, oid)
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ func TestMirrorPull(t *testing.T) {
|
|||||||
ctx := t.Context()
|
ctx := t.Context()
|
||||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
||||||
repoPath := repo_model.RepoPath(user.Name, repo.Name)
|
repoPath := repo_model.RepoPath(user.Name, repo.Name, repo.GroupID)
|
||||||
|
|
||||||
opts := migration.MigrateOptions{
|
opts := migration.MigrateOptions{
|
||||||
RepoName: "test_mirror",
|
RepoName: "test_mirror",
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ func resultFilenames(doc *HTMLDoc) []string {
|
|||||||
func TestSearchRepo(t *testing.T) {
|
func TestSearchRepo(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
repo, err := repo_model.GetRepositoryByOwnerAndName(t.Context(), "user2", "repo1")
|
repo, err := repo_model.GetRepositoryByOwnerAndName(t.Context(), "user2", "repo1", 0)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
|
|
||||||
code_indexer.UpdateRepoIndexer(repo)
|
code_indexer.UpdateRepoIndexer(repo)
|
||||||
@@ -38,7 +38,7 @@ func TestSearchRepo(t *testing.T) {
|
|||||||
setting.Indexer.IncludePatterns = setting.IndexerGlobFromString("**.txt")
|
setting.Indexer.IncludePatterns = setting.IndexerGlobFromString("**.txt")
|
||||||
setting.Indexer.ExcludePatterns = setting.IndexerGlobFromString("**/y/**")
|
setting.Indexer.ExcludePatterns = setting.IndexerGlobFromString("**/y/**")
|
||||||
|
|
||||||
repo, err = repo_model.GetRepositoryByOwnerAndName(t.Context(), "user2", "glob")
|
repo, err = repo_model.GetRepositoryByOwnerAndName(t.Context(), "user2", "glob", 0)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
|
|
||||||
code_indexer.UpdateRepoIndexer(repo)
|
code_indexer.UpdateRepoIndexer(repo)
|
||||||
|
|||||||
Reference in new issue
Block a user