Skip to content

Commit a099a57

Browse files
kdumontnukdumontnu
committed
Move integrations to subfolder
1 parent 5ebadc5 commit a099a57

File tree

630 files changed

+160
-155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

630 files changed

+160
-155
lines changed

‎.gitignore‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,21 @@ cpu.out
6363
/indexers
6464
/log
6565
/public/img/avatar
66-
/integrations/gitea-integration-mysql
67-
/integrations/gitea-integration-mysql8
68-
/integrations/gitea-integration-pgsql
69-
/integrations/gitea-integration-sqlite
70-
/integrations/gitea-integration-mssql
71-
/integrations/indexers-mysql
72-
/integrations/indexers-mysql8
73-
/integrations/indexers-pgsql
74-
/integrations/indexers-sqlite
75-
/integrations/indexers-mssql
76-
/integrations/sqlite.ini
77-
/integrations/mysql.ini
78-
/integrations/mysql8.ini
79-
/integrations/pgsql.ini
80-
/integrations/mssql.ini
66+
/tests/integrations/gitea-integration-mysql
67+
/tests/integrations/gitea-integration-mysql8
68+
/tests/integrations/gitea-integration-pgsql
69+
/tests/integrations/gitea-integration-sqlite
70+
/tests/integrations/gitea-integration-mssql
71+
/tests/integrations/indexers-mysql
72+
/tests/integrations/indexers-mysql8
73+
/tests/integrations/indexers-pgsql
74+
/tests/integrations/indexers-sqlite
75+
/tests/integrations/indexers-mssql
76+
/tests/sqlite.ini
77+
/tests/mysql.ini
78+
/tests/mysql8.ini
79+
/tests/pgsql.ini
80+
/tests/mssql.ini
8181
/node_modules
8282
/yarn.lock
8383
/yarn-error.log

‎Makefile‎

Lines changed: 63 additions & 58 deletions
Large diffs are not rendered by default.

‎build/code-batch-process.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func newFileCollector(fileFilter string, batchSize int) (*fileCollector, error)
6161
"build",
6262
"cmd",
6363
"contrib",
64-
"integrations",
64+
"tests",
6565
"models",
6666
"modules",
6767
"routers",
@@ -71,8 +71,8 @@ func newFileCollector(fileFilter string, batchSize int) (*fileCollector, error)
7171
co.includePatterns = append(co.includePatterns, regexp.MustCompile(`.*\.go$`))
7272

7373
co.excludePatterns = append(co.excludePatterns, regexp.MustCompile(`.*\bbindata\.go$`))
74-
co.excludePatterns = append(co.excludePatterns, regexp.MustCompile(`integrations/gitea-repositories-meta`))
75-
co.excludePatterns = append(co.excludePatterns, regexp.MustCompile(`integrations/migration-test`))
74+
co.excludePatterns = append(co.excludePatterns, regexp.MustCompile(`tests/gitea-repositories-meta`))
75+
co.excludePatterns = append(co.excludePatterns, regexp.MustCompile(`tests/integrations/migration-test`))
7676
co.excludePatterns = append(co.excludePatterns, regexp.MustCompile(`modules/git/tests`))
7777
co.excludePatterns = append(co.excludePatterns, regexp.MustCompile(`models/fixtures`))
7878
co.excludePatterns = append(co.excludePatterns, regexp.MustCompile(`models/migrations/fixtures`))

‎contrib/pr/checkout.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func runPR() {
112112
unittest.LoadFixtures()
113113
util.RemoveAll(setting.RepoRootPath)
114114
util.RemoveAll(repo_module.LocalCopyPath())
115-
unittest.CopyDir(path.Join(curDir, "integrations/gitea-repositories-meta"), setting.RepoRootPath)
115+
unittest.CopyDir(path.Join(curDir, "tests/gitea-repositories-meta"), setting.RepoRootPath)
116116

117117
log.Printf("[PR] Setting up router\n")
118118
// routers.GlobalInit()

‎docs/content/doc/developers/hacking-on-gitea.en-us.md‎

Lines changed: 1 addition & 1 deletion

‎models/migrations/migrations_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func TestMain(m *testing.M) {
4646

4747
giteaConf := os.Getenv("GITEA_CONF")
4848
if giteaConf == "" {
49-
giteaConf = path.Join(filepath.Dir(setting.AppPath), "integrations/sqlite.ini")
49+
giteaConf = path.Join(filepath.Dir(setting.AppPath), "tests/sqlite.ini")
5050
fmt.Printf("Environment variable $GITEA_CONF not set - defaulting to %s\n", giteaConf)
5151
}
5252

@@ -206,7 +206,7 @@ func prepareTestEnv(t *testing.T, skip int, syncModels ...interface{}) (*xorm.En
206206
ourSkip += skip
207207
deferFn := PrintCurrentTest(t, ourSkip)
208208
assert.NoError(t, os.RemoveAll(setting.RepoRootPath))
209-
assert.NoError(t, unittest.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"), setting.RepoRootPath))
209+
assert.NoError(t, unittest.CopyDir(path.Join(filepath.Dir(setting.AppPath), "tests/gitea-repositories-meta"), setting.RepoRootPath))
210210
assert.NoError(t, git.InitOnceWithSync(context.Background())) // the gitconfig has been removed above, so sync the gitconfig again
211211
ownerDirs, err := os.ReadDir(setting.RepoRootPath)
212212
if err != nil {

‎models/migrations/testlogger_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,5 +188,5 @@ func (log *TestLogger) GetName() string {
188188
func init() {
189189
log.Register("test", NewTestLogger)
190190
_, filename, _, _ := runtime.Caller(0)
191-
prefix = strings.TrimSuffix(filename, "integrations/testlogger.go")
191+
prefix = strings.TrimSuffix(filename, "tests/testlogger.go")
192192
}

‎models/unittest/testdb.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func MainTest(m *testing.M, testOpts *TestOptions) {
114114
if err = util.RemoveAll(repoRootPath); err != nil {
115115
fatalTestError("util.RemoveAll: %v\n", err)
116116
}
117-
if err = CopyDir(filepath.Join(testOpts.GiteaRootPath, "integrations", "gitea-repositories-meta"), setting.RepoRootPath); err != nil {
117+
if err = CopyDir(filepath.Join(testOpts.GiteaRootPath, "tests", "gitea-repositories-meta"), setting.RepoRootPath); err != nil {
118118
fatalTestError("util.CopyDir: %v\n", err)
119119
}
120120

@@ -202,7 +202,7 @@ func PrepareTestDatabase() error {
202202
func PrepareTestEnv(t testing.TB) {
203203
assert.NoError(t, PrepareTestDatabase())
204204
assert.NoError(t, util.RemoveAll(setting.RepoRootPath))
205-
metaPath := filepath.Join(giteaRoot, "integrations", "gitea-repositories-meta")
205+
metaPath := filepath.Join(giteaRoot, "tests", "gitea-repositories-meta")
206206
assert.NoError(t, CopyDir(metaPath, setting.RepoRootPath))
207207
assert.NoError(t, git.InitOnceWithSync(context.Background())) // the gitconfig has been removed above, so sync the gitconfig again
208208

‎modules/markup/html_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
var localMetas = map[string]string{
2525
"user": "gogits",
2626
"repo": "gogs",
27-
"repoPath": "../../integrations/gitea-repositories-meta/user13/repo11.git/",
27+
"repoPath": "../../tests/gitea-repositories-meta/user13/repo11.git/",
2828
}
2929

3030
func TestMain(m *testing.M) {

‎modules/markup/markdown/markdown_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const (
2929
var localMetas = map[string]string{
3030
"user": "gogits",
3131
"repo": "gogs",
32-
"repoPath": "../../../integrations/gitea-repositories-meta/user13/repo11.git/",
32+
"repoPath": "../../../tests/gitea-repositories-meta/user13/repo11.git/",
3333
}
3434

3535
func TestMain(m *testing.M) {

0 commit comments

Comments
 (0)