Fix lint

Author: lunny

modules/test/context_tests.go

@@ -27,24 +27,23 @@ import (
 
 // MockContext mock context for unit tests
 func MockContext(t *testing.T, path string) *context.Context {
+	requestURL, err := url.Parse(path)
+	assert.NoError(t, err)
+
 	var resp = &mockResponseWriter{}
+	var req = &http.Request{
+		URL:  requestURL,
+		Form: url.Values{},
+	}
 	var ctx = context.Context{
-		Render: &mockRender{},
-		Data:   make(map[string]interface{}),
+		BaseContext: context.NewBaseContext(resp, req, map[string]interface{}{}),
+		Render:      &mockRender{},
 		Flash: &middleware.Flash{
 			Values: make(url.Values),
 		},
-		Resp:   context.NewResponse(resp),
 		Locale: &mockLocale{},
 	}
 
-	requestURL, err := url.Parse(path)
-	assert.NoError(t, err)
-	var req = &http.Request{
-		URL:  requestURL,
-		Form: url.Values{},
-	}
-
 	chiCtx := chi.NewRouteContext()
 	req = req.WithContext(scontext.WithValue(req.Context(), chi.RouteCtxKey, chiCtx))
 	ctx.Req = context.WithContext(req, &ctx)

routers/api/v1/misc/markdown_test.go

@@ -30,10 +30,8 @@ func createContext(req *http.Request) (*context.Context, *httptest.ResponseRecor
 	var rnd = templates.HTMLRenderer()
 	resp := httptest.NewRecorder()
 	c := &context.Context{
-		Req:    req,
-		Resp:   context.NewResponse(resp),
-		Render: rnd,
-		Data:   make(map[string]interface{}),
+		BaseContext: context.NewBaseContext(resp, req, map[string]interface{}{}),
+		Render:      rnd,
 	}
 	return c, resp
 }