diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2020-11-13 20:51:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-13 14:51:07 +0200 |
| commit | c296f4fed66288431fa7ec3a64f990beccd29eb1 (patch) | |
| tree | 6b2f1971303967671bd5da1d1149407e410d62bd /integrations/integration_test.go | |
| parent | 0ae35c66f2efe608e3176f796866c18461f0780f (diff) | |
| download | gitea-c296f4fed66288431fa7ec3a64f990beccd29eb1.tar.gz gitea-c296f4fed66288431fa7ec3a64f990beccd29eb1.zip | |
Introduce go chi web framework as frontend of macaron, so that we can move routes from macaron to chi step by step (#7420)
* When route cannot be found on chi, go to macaron
* Stick chi version to 1.5.0
* Follow router log setting
Diffstat (limited to 'integrations/integration_test.go')
| -rw-r--r-- | integrations/integration_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/integrations/integration_test.go b/integrations/integration_test.go index 13a1bac370..1e42fb5333 100644 --- a/integrations/integration_test.go +++ b/integrations/integration_test.go @@ -34,13 +34,13 @@ import ( "code.gitea.io/gitea/routers" "code.gitea.io/gitea/routers/routes" - "gitea.com/macaron/macaron" "github.com/PuerkitoBio/goquery" + "github.com/go-chi/chi" "github.com/stretchr/testify/assert" "github.com/unknwon/com" ) -var mac *macaron.Macaron +var c chi.Router type NilResponseRecorder struct { httptest.ResponseRecorder @@ -67,8 +67,8 @@ func TestMain(m *testing.M) { defer cancel() initIntegrationTest() - mac = routes.NewMacaron() - routes.RegisterRoutes(mac) + c = routes.NewChi() + routes.RegisterRoutes(c) // integration test settings... if setting.Cfg != nil { @@ -404,7 +404,7 @@ const NoExpectedStatus = -1 func MakeRequest(t testing.TB, req *http.Request, expectedStatus int) *httptest.ResponseRecorder { t.Helper() recorder := httptest.NewRecorder() - mac.ServeHTTP(recorder, req) + c.ServeHTTP(recorder, req) if expectedStatus != NoExpectedStatus { if !assert.EqualValues(t, expectedStatus, recorder.Code, "Request: %s %s", req.Method, req.URL.String()) { @@ -417,7 +417,7 @@ func MakeRequest(t testing.TB, req *http.Request, expectedStatus int) *httptest. func MakeRequestNilResponseRecorder(t testing.TB, req *http.Request, expectedStatus int) *NilResponseRecorder { t.Helper() recorder := NewNilResponseRecorder() - mac.ServeHTTP(recorder, req) + c.ServeHTTP(recorder, req) if expectedStatus != NoExpectedStatus { if !assert.EqualValues(t, expectedStatus, recorder.Code, "Request: %s %s", req.Method, req.URL.String()) { |