diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-06-09 07:33:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 01:33:54 +0200 |
| commit | 1bfb0a24d843e10d6d95c4319a84980485e584ed (patch) | |
| tree | e4a736f9abee3eaad1270bf3b60ee3bb9401a9dc /integrations | |
| parent | e03a91a48ef7fb716cc7c8bfb411ca8f332dcfe5 (diff) | |
| download | gitea-1bfb0a24d843e10d6d95c4319a84980485e584ed.tar.gz gitea-1bfb0a24d843e10d6d95c4319a84980485e584ed.zip | |
Refactor routers directory (#15800)
* refactor routers directory
* move func used for web and api to common
* make corsHandler a function to prohibit side efects
* rm unused func
Co-authored-by: 6543 <6543@obermui.de>
Diffstat (limited to 'integrations')
| -rw-r--r-- | integrations/create_no_session_test.go | 6 | ||||
| -rw-r--r-- | integrations/integration_test.go | 3 | ||||
| -rw-r--r-- | integrations/lfs_getobject_test.go | 8 |
3 files changed, 8 insertions, 9 deletions
diff --git a/integrations/create_no_session_test.go b/integrations/create_no_session_test.go index c864b9c7ae..46f111b6f7 100644 --- a/integrations/create_no_session_test.go +++ b/integrations/create_no_session_test.go @@ -14,7 +14,7 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/routes" + "code.gitea.io/gitea/routers" "gitea.com/go-chi/session" jsoniter "github.com/json-iterator/go" @@ -58,7 +58,7 @@ func TestSessionFileCreation(t *testing.T) { oldSessionConfig := setting.SessionConfig.ProviderConfig defer func() { setting.SessionConfig.ProviderConfig = oldSessionConfig - c = routes.NormalRoutes() + c = routers.NormalRoutes() }() var config session.Options @@ -84,7 +84,7 @@ func TestSessionFileCreation(t *testing.T) { setting.SessionConfig.ProviderConfig = string(newConfigBytes) - c = routes.NormalRoutes() + c = routers.NormalRoutes() t.Run("NoSessionOnViewIssue", func(t *testing.T) { defer PrintCurrentTest(t)() diff --git a/integrations/integration_test.go b/integrations/integration_test.go index 74227416c4..d755977d1a 100644 --- a/integrations/integration_test.go +++ b/integrations/integration_test.go @@ -34,7 +34,6 @@ import ( "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/routers/routes" "github.com/PuerkitoBio/goquery" jsoniter "github.com/json-iterator/go" @@ -88,7 +87,7 @@ func TestMain(m *testing.M) { defer cancel() initIntegrationTest() - c = routes.NormalRoutes() + c = routers.NormalRoutes() // integration test settings... if setting.Cfg != nil { diff --git a/integrations/lfs_getobject_test.go b/integrations/lfs_getobject_test.go index b7423a2dbe..337a93567a 100644 --- a/integrations/lfs_getobject_test.go +++ b/integrations/lfs_getobject_test.go @@ -15,7 +15,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/routes" + "code.gitea.io/gitea/routers/web" jsoniter "github.com/json-iterator/go" gzipp "github.com/klauspost/compress/gzip" @@ -99,7 +99,7 @@ func TestGetLFSLarge(t *testing.T) { t.Skip() return } - content := make([]byte, routes.GzipMinSize*10) + content := make([]byte, web.GzipMinSize*10) for i := range content { content[i] = byte(i % 256) } @@ -115,7 +115,7 @@ func TestGetLFSGzip(t *testing.T) { t.Skip() return } - b := make([]byte, routes.GzipMinSize*10) + b := make([]byte, web.GzipMinSize*10) for i := range b { b[i] = byte(i % 256) } @@ -136,7 +136,7 @@ func TestGetLFSZip(t *testing.T) { t.Skip() return } - b := make([]byte, routes.GzipMinSize*10) + b := make([]byte, web.GzipMinSize*10) for i := range b { b[i] = byte(i % 256) } |