5 files changed, 10 insertions, 9 deletions
diff --git a/modules/validation/binding.go b/modules/validation/binding.go
index 1c67878ea1..5cfd994d2d 100644
--- a/modules/validation/binding.go
+++ b/modules/validation/binding.go
@@ -9,7 +9,7 @@ import (
 	"regexp"
 	"strings"
 
-	"gitea.com/macaron/binding"
+	"gitea.com/go-chi/binding"
 	"github.com/gobwas/glob"
 )
 
diff --git a/modules/validation/binding_test.go b/modules/validation/binding_test.go
index 9fc9a6db08..e0daba89e5 100644
--- a/modules/validation/binding_test.go
+++ b/modules/validation/binding_test.go
@@ -9,8 +9,8 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"gitea.com/macaron/binding"
-	"gitea.com/macaron/macaron"
+	"gitea.com/go-chi/binding"
+	"github.com/go-chi/chi"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -34,9 +34,10 @@ type (
 
 func performValidationTest(t *testing.T, testCase validationTestCase) {
 	httpRecorder := httptest.NewRecorder()
-	m := macaron.Classic()
+	m := chi.NewRouter()
 
-	m.Post(testRoute, binding.Validate(testCase.data), func(actual binding.Errors) {
+	m.Post(testRoute, func(resp http.ResponseWriter, req *http.Request) {
+		actual := binding.Validate(req, testCase.data)
 		// see https://github.com/stretchr/testify/issues/435
 		if actual == nil {
 			actual = binding.Errors{}
@@ -49,7 +50,7 @@ func performValidationTest(t *testing.T, testCase validationTestCase) {
 	if err != nil {
 		panic(err)
 	}
-
+	req.Header.Add("Content-Type", "x-www-form-urlencoded")
 	m.ServeHTTP(httpRecorder, req)
 
 	switch httpRecorder.Code {
diff --git a/modules/validation/glob_pattern_test.go b/modules/validation/glob_pattern_test.go
index 26775167b4..cbaed7e66a 100644
--- a/modules/validation/glob_pattern_test.go
+++ b/modules/validation/glob_pattern_test.go
@@ -7,7 +7,7 @@ package validation
 import (
 	"testing"
 
-	"gitea.com/macaron/binding"
+	"gitea.com/go-chi/binding"
 	"github.com/gobwas/glob"
 )
 
diff --git a/modules/validation/refname_test.go b/modules/validation/refname_test.go
index 521a83fa04..974d956563 100644
--- a/modules/validation/refname_test.go
+++ b/modules/validation/refname_test.go
@@ -7,7 +7,7 @@ package validation
 import (
 	"testing"
 
-	"gitea.com/macaron/binding"
+	"gitea.com/go-chi/binding"
 )
 
 var gitRefNameValidationTestCases = []validationTestCase{
diff --git a/modules/validation/validurl_test.go b/modules/validation/validurl_test.go
index aed7406c0a..3cb6206602 100644
--- a/modules/validation/validurl_test.go
+++ b/modules/validation/validurl_test.go
@@ -7,7 +7,7 @@ package validation
 import (
 	"testing"
 
-	"gitea.com/macaron/binding"
+	"gitea.com/go-chi/binding"
 )
 
 var urlValidationTestCases = []validationTestCase{