finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make writing main test easier (#27270)

Browse source 
This PR removed `unittest.MainTest` the second parameter
`TestOptions.GiteaRoot`. Now it detects the root directory by current
working directory.

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Lunny Xiao 2023-09-28 09:38:53 +08:00 • committed by GitHub
parent e74a3b18af
commit 673cf6af76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
55 changed files with 81 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

5
services/asymkey/main_test.go
View file

@ -4,7 +4,6 @@
package asymkey
import (
"path/filepath"
"testing"
"code.gitea.io/gitea/models/unittest"
@ -14,7 +13,5 @@ import (
)
func TestMain(m *testing.M) {
unittest.MainTest(m, &unittest.TestOptions{
GiteaRootPath: filepath.Join("..", ".."),
})
unittest.MainTest(m)
}

4
services/attachment/attachment_test.go
View file

@ -19,9 +19,7 @@ import (
)
func TestMain(m *testing.M) {
unittest.MainTest(m, &unittest.TestOptions{
GiteaRootPath: filepath.Join("..", ".."),
})
unittest.MainTest(m)
}
func TestUploadAttachment(t *testing.T) {

5
services/convert/main_test.go
View file

@ -4,7 +4,6 @@
package convert
import (
"path/filepath"
"testing"
"code.gitea.io/gitea/models/unittest"
@ -13,7 +12,5 @@ import (
)
func TestMain(m *testing.M) {
unittest.MainTest(m, &unittest.TestOptions{
GiteaRootPath: filepath.Join("..", ".."),
})
unittest.MainTest(m)
}

5
services/feed/action_test.go
View file

@ -4,7 +4,6 @@
package feed
import (
"path/filepath"
"strings"
"testing"
@ -20,9 +19,7 @@ import (
)
func TestMain(m *testing.M) {
unittest.MainTest(m, &unittest.TestOptions{
GiteaRootPath: filepath.Join("..", ".."),
})
unittest.MainTest(m)
}
func TestRenameRepoAction(t *testing.T) {

5
services/gitdiff/main_test.go
View file

@ -4,7 +4,6 @@
package gitdiff
import (
"path/filepath"
"testing"
"code.gitea.io/gitea/models/unittest"
@ -15,7 +14,5 @@ import (
)
func TestMain(m *testing.M) {
unittest.MainTest(m, &unittest.TestOptions{
GiteaRootPath: filepath.Join("..", ".."),
})
unittest.MainTest(m)
}

5
services/issue/main_test.go
View file

@ -4,7 +4,6 @@
package issue
import (
"path/filepath"
"testing"
"code.gitea.io/gitea/models/unittest"
@ -13,7 +12,5 @@ import (
)
func TestMain(m *testing.M) {
unittest.MainTest(m, &unittest.TestOptions{
GiteaRootPath: filepath.Join("..", ".."),
})
unittest.MainTest(m)
}

5
services/mailer/main_test.go
View file

@ -4,7 +4,6 @@
package mailer
import (
"path/filepath"
"testing"
"code.gitea.io/gitea/models/unittest"
@ -13,7 +12,5 @@ import (
)
func TestMain(m *testing.M) {
unittest.MainTest(m, &unittest.TestOptions{
GiteaRootPath: filepath.Join("..", ".."),
})
unittest.MainTest(m)
}

4
services/markup/main_test.go
View file

@ -4,7 +4,6 @@
package markup
import (
"path/filepath"
"testing"
"code.gitea.io/gitea/models/unittest"
@ -12,7 +11,6 @@ import (
func TestMain(m *testing.M) {
unittest.MainTest(m, &unittest.TestOptions{
GiteaRootPath: filepath.Join("..", ".."),
FixtureFiles: []string{"user.yml"},
FixtureFiles: []string{"user.yml"},
})
}

5
services/migrations/main_test.go
View file

@ -5,7 +5,6 @@
package migrations
import (
"path/filepath"
"testing"
"time"
@ -16,9 +15,7 @@ import (
)
func TestMain(m *testing.M) {
unittest.MainTest(m, &unittest.TestOptions{
GiteaRootPath: filepath.Join("..", ".."),
})
unittest.MainTest(m)
}
func timePtr(t time.Time) *time.Time {

5
services/org/org_test.go
View file

@ -4,7 +4,6 @@
package org
import (
"path/filepath"
"testing"
"code.gitea.io/gitea/models"
@ -16,9 +15,7 @@ import (
)
func TestMain(m *testing.M) {
unittest.MainTest(m, &unittest.TestOptions{
GiteaRootPath: filepath.Join("..", ".."),
})
unittest.MainTest(m)
}
func TestDeleteOrganization(t *testing.T) {

5
services/pull/main_test.go
View file

@ -5,7 +5,6 @@
package pull
import (
"path/filepath"
"testing"
"code.gitea.io/gitea/models/unittest"
@ -14,7 +13,5 @@ import (
)
func TestMain(m *testing.M) {
unittest.MainTest(m, &unittest.TestOptions{
GiteaRootPath: filepath.Join("..", ".."),
})
unittest.MainTest(m)
}

5
services/release/release_test.go
View file

@ -4,7 +4,6 @@
package release
import (
"path/filepath"
"strings"
"testing"
"time"
@ -22,9 +21,7 @@ import (
)
func TestMain(m *testing.M) {
unittest.MainTest(m, &unittest.TestOptions{
GiteaRootPath: filepath.Join("..", ".."),
})
unittest.MainTest(m)
}
func TestRelease_Create(t *testing.T) {

5
services/repository/archiver/archiver_test.go
View file

@ -5,7 +5,6 @@ package archiver
import (
"errors"
"path/filepath"
"testing"
"time"
@ -18,9 +17,7 @@ import (
)
func TestMain(m *testing.M) {
unittest.MainTest(m, &unittest.TestOptions{
GiteaRootPath: filepath.Join("..", "..", ".."),
})
unittest.MainTest(m)
}
func TestArchive_Basic(t *testing.T) {

5
services/repository/files/content_test.go
View file

@ -4,7 +4,6 @@
package files
import (
"path/filepath"
"testing"
repo_model "code.gitea.io/gitea/models/repo"
@ -19,9 +18,7 @@ import (
)
func TestMain(m *testing.M) {
unittest.MainTest(m, &unittest.TestOptions{
GiteaRootPath: filepath.Join("..", "..", ".."),
})
unittest.MainTest(m)
}
func getExpectedReadmeContentsResponse() *api.ContentsResponse {

5
services/repository/main_test.go
View file

@ -4,14 +4,11 @@
package repository
import (
"path/filepath"
"testing"
"code.gitea.io/gitea/models/unittest"
)
func TestMain(m *testing.M) {
unittest.MainTest(m, &unittest.TestOptions{
GiteaRootPath: filepath.Join("..", ".."),
})
unittest.MainTest(m)
}

5
services/user/user_test.go
View file

@ -5,7 +5,6 @@ package user
import (
"fmt"
"path/filepath"
"strings"
"testing"
@ -22,9 +21,7 @@ import (
)
func TestMain(m *testing.M) {
unittest.MainTest(m, &unittest.TestOptions{
GiteaRootPath: filepath.Join("..", ".."),
})
unittest.MainTest(m)
}
func TestDeleteUser(t *testing.T) {

2
services/webhook/main_test.go
View file

@ -4,7 +4,6 @@
package webhook
import (
"path/filepath"
"testing"
"code.gitea.io/gitea/models/unittest"
@ -19,7 +18,6 @@ func TestMain(m *testing.M) {
// for tests, allow only loopback IPs
setting.Webhook.AllowedHostList = hostmatcher.MatchBuiltinLoopback
unittest.MainTest(m, &unittest.TestOptions{
GiteaRootPath: filepath.Join("..", ".."),
SetUp: func() error {
setting.LoadQueueSettings()
return Init()

5
services/wiki/wiki_test.go
View file

@ -5,7 +5,6 @@ package wiki
import (
"math/rand"
"path/filepath"
"strings"
"testing"
@ -20,9 +19,7 @@ import (
)
func TestMain(m *testing.M) {
unittest.MainTest(m, &unittest.TestOptions{
GiteaRootPath: filepath.Join("..", ".."),
})
unittest.MainTest(m)
}
func TestWebPathSegments(t *testing.T) {