1 files changed, 30 insertions, 79 deletions
diff --git a/modules/test/context_tests.go b/modules/test/context_tests.go
index 874d7db196..e219a8e56a 100644
--- a/modules/test/context_tests.go
+++ b/modules/test/context_tests.go
@@ -5,6 +5,9 @@
 package test
 
 import (
+	scontext "context"
+	"html/template"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -13,32 +16,37 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/modules/middlewares"
 
-	"gitea.com/macaron/macaron"
-	"gitea.com/macaron/session"
+	"github.com/go-chi/chi"
 	"github.com/stretchr/testify/assert"
+	"github.com/unrolled/render"
 )
 
 // MockContext mock context for unit tests
 func MockContext(t *testing.T, path string) *context.Context {
-	var macaronContext macaron.Context
-	macaronContext.ReplaceAllParams(macaron.Params{})
-	macaronContext.Locale = &mockLocale{}
+	var resp = &mockResponseWriter{}
+	var ctx = context.Context{
+		Render: &mockRender{},
+		Data:   make(map[string]interface{}),
+		Flash: &middlewares.Flash{
+			Values: make(url.Values),
+		},
+		Resp:   context.NewResponse(resp),
+		Locale: &mockLocale{},
+	}
+
 	requestURL, err := url.Parse(path)
 	assert.NoError(t, err)
-	macaronContext.Req = macaron.Request{Request: &http.Request{
+	var req = &http.Request{
 		URL:  requestURL,
 		Form: url.Values{},
-	}}
-	macaronContext.Resp = &mockResponseWriter{}
-	macaronContext.Render = &mockRender{ResponseWriter: macaronContext.Resp}
-	macaronContext.Data = map[string]interface{}{}
-	return &context.Context{
-		Context: &macaronContext,
-		Flash: &session.Flash{
-			Values: make(url.Values),
-		},
 	}
+
+	chiCtx := chi.NewRouteContext()
+	req = req.WithContext(scontext.WithValue(req.Context(), chi.RouteCtxKey, chiCtx))
+	ctx.Req = context.WithContext(req, &ctx)
+	return &ctx
 }
 
 // LoadRepo load a repo into a test context.
@@ -113,77 +121,20 @@ func (rw *mockResponseWriter) Size() int {
 	return rw.size
 }
 
-func (rw *mockResponseWriter) Before(b macaron.BeforeFunc) {
-	b(rw)
-}
-
 func (rw *mockResponseWriter) Push(target string, opts *http.PushOptions) error {
 	return nil
 }
 
 type mockRender struct {
-	http.ResponseWriter
-}
-
-func (tr *mockRender) SetResponseWriter(rw http.ResponseWriter) {
-	tr.ResponseWriter = rw
-}
-
-func (tr *mockRender) JSON(status int, _ interface{}) {
-	tr.Status(status)
-}
-
-func (tr *mockRender) JSONString(interface{}) (string, error) {
-	return "", nil
-}
-
-func (tr *mockRender) RawData(status int, _ []byte) {
-	tr.Status(status)
-}
-
-func (tr *mockRender) PlainText(status int, _ []byte) {
-	tr.Status(status)
-}
-
-func (tr *mockRender) HTML(status int, _ string, _ interface{}, _ ...macaron.HTMLOptions) {
-	tr.Status(status)
-}
-
-func (tr *mockRender) HTMLSet(status int, _ string, _ string, _ interface{}, _ ...macaron.HTMLOptions) {
-	tr.Status(status)
-}
-
-func (tr *mockRender) HTMLSetString(string, string, interface{}, ...macaron.HTMLOptions) (string, error) {
-	return "", nil
-}
-
-func (tr *mockRender) HTMLString(string, interface{}, ...macaron.HTMLOptions) (string, error) {
-	return "", nil
-}
-
-func (tr *mockRender) HTMLSetBytes(string, string, interface{}, ...macaron.HTMLOptions) ([]byte, error) {
-	return nil, nil
-}
-
-func (tr *mockRender) HTMLBytes(string, interface{}, ...macaron.HTMLOptions) ([]byte, error) {
-	return nil, nil
-}
-
-func (tr *mockRender) XML(status int, _ interface{}) {
-	tr.Status(status)
-}
-
-func (tr *mockRender) Error(status int, _ ...string) {
-	tr.Status(status)
 }
 
-func (tr *mockRender) Status(status int) {
-	tr.ResponseWriter.WriteHeader(status)
-}
-
-func (tr *mockRender) SetTemplatePath(string, string) {
+func (tr *mockRender) TemplateLookup(tmpl string) *template.Template {
+	return nil
 }
 
-func (tr *mockRender) HasTemplateSet(string) bool {
-	return true
+func (tr *mockRender) HTML(w io.Writer, status int, _ string, _ interface{}, _ ...render.HTMLOptions) error {
+	if resp, ok := w.(http.ResponseWriter); ok {
+		resp.WriteHeader(status)
+	}
+	return nil
 }