mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-12-05 02:54:46 +01:00
3a0d000b94
Backport #21646 A bug was introduced in #17865 where filepath.Join is used to join putative unadopted repository owner and names together. This is incorrect as these names are then used as repository names - which shoud have the '/' separator. This means that adoption will not work on Windows servers. Fix #21632 Signed-off-by: Andrew Thornton <art27@cantab.net>
86 lines
2.5 KiB
Go
86 lines
2.5 KiB
Go
// Copyright 2021 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 repository
|
|
|
|
import (
|
|
"os"
|
|
"path"
|
|
"testing"
|
|
|
|
"code.gitea.io/gitea/models/db"
|
|
"code.gitea.io/gitea/models/unittest"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestCheckUnadoptedRepositories_Add(t *testing.T) {
|
|
start := 10
|
|
end := 20
|
|
unadopted := &unadoptedRepositories{
|
|
start: start,
|
|
end: end,
|
|
index: 0,
|
|
}
|
|
|
|
total := 30
|
|
for i := 0; i < total; i++ {
|
|
unadopted.add("something")
|
|
}
|
|
|
|
assert.Equal(t, total, unadopted.index)
|
|
assert.Equal(t, end-start, len(unadopted.repositories))
|
|
}
|
|
|
|
func TestCheckUnadoptedRepositories(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
//
|
|
// Non existent user
|
|
//
|
|
unadopted := &unadoptedRepositories{start: 0, end: 100}
|
|
err := checkUnadoptedRepositories("notauser", []string{"repo"}, unadopted)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, 0, len(unadopted.repositories))
|
|
//
|
|
// Unadopted repository is returned
|
|
// Existing (adopted) repository is not returned
|
|
//
|
|
userName := "user2"
|
|
repoName := "repo2"
|
|
unadoptedRepoName := "unadopted"
|
|
unadopted = &unadoptedRepositories{start: 0, end: 100}
|
|
err = checkUnadoptedRepositories(userName, []string{repoName, unadoptedRepoName}, unadopted)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, []string{path.Join(userName, unadoptedRepoName)}, unadopted.repositories)
|
|
//
|
|
// Existing (adopted) repository is not returned
|
|
//
|
|
unadopted = &unadoptedRepositories{start: 0, end: 100}
|
|
err = checkUnadoptedRepositories(userName, []string{repoName}, unadopted)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, 0, len(unadopted.repositories))
|
|
assert.Equal(t, 0, unadopted.index)
|
|
}
|
|
|
|
func TestListUnadoptedRepositories_ListOptions(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
username := "user2"
|
|
unadoptedList := []string{path.Join(username, "unadopted1"), path.Join(username, "unadopted2")}
|
|
for _, unadopted := range unadoptedList {
|
|
_ = os.Mkdir(path.Join(setting.RepoRootPath, unadopted+".git"), 0o755)
|
|
}
|
|
|
|
opts := db.ListOptions{Page: 1, PageSize: 1}
|
|
repoNames, count, err := ListUnadoptedRepositories("", &opts)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, 2, count)
|
|
assert.Equal(t, unadoptedList[0], repoNames[0])
|
|
|
|
opts = db.ListOptions{Page: 2, PageSize: 1}
|
|
repoNames, count, err = ListUnadoptedRepositories("", &opts)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, 2, count)
|
|
assert.Equal(t, unadoptedList[1], repoNames[0])
|
|
}
|