From 9f31f3aa8ac4f6bfc8390c9ae63b2a387b414c88 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 25 Jul 2021 00:03:58 +0800 Subject: Add an abstract json layout to make it's easier to change json library (#16528) * Add an abstract json layout to make it's easier to change json library * Fix import * Fix import sequence * Fix blank lines * Fix blank lines --- integrations/integration_test.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'integrations/integration_test.go') diff --git a/integrations/integration_test.go b/integrations/integration_test.go index 8a008ac621..7ddcf3e1cd 100644 --- a/integrations/integration_test.go +++ b/integrations/integration_test.go @@ -28,6 +28,7 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/graceful" + "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/queue" "code.gitea.io/gitea/modules/setting" @@ -37,7 +38,6 @@ import ( "code.gitea.io/gitea/routers" "github.com/PuerkitoBio/goquery" - jsoniter "github.com/json-iterator/go" "github.com/stretchr/testify/assert" ) @@ -416,7 +416,6 @@ func NewRequestWithValues(t testing.TB, method, urlStr string, values map[string func NewRequestWithJSON(t testing.TB, method, urlStr string, v interface{}) *http.Request { t.Helper() - json := jsoniter.ConfigCompatibleWithStandardLibrary jsonBytes, err := json.Marshal(v) assert.NoError(t, err) req := NewRequestWithBody(t, method, urlStr, bytes.NewBuffer(jsonBytes)) @@ -508,7 +507,6 @@ func logUnexpectedResponse(t testing.TB, recorder *httptest.ResponseRecorder) { func DecodeJSON(t testing.TB, resp *httptest.ResponseRecorder, v interface{}) { t.Helper() - json := jsoniter.ConfigCompatibleWithStandardLibrary decoder := json.NewDecoder(resp.Body) assert.NoError(t, decoder.Decode(v)) } -- cgit v1.2.3