From f9bc36b32f912889ab3d199d6453779a503702f8 Mon Sep 17 00:00:00 2001 From: George Date: Mon, 5 Aug 2019 20:37:24 +0300 Subject: [PATCH 1/2] Fixed JSONP format (added semicolon) --- context_test.go | 2 +- render/json.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/context_test.go b/context_test.go index 439e8ee684..f7bb0f5162 100644 --- a/context_test.go +++ b/context_test.go @@ -676,7 +676,7 @@ func TestContextRenderJSONP(t *testing.T) { c.JSONP(http.StatusCreated, H{"foo": "bar"}) assert.Equal(t, http.StatusCreated, w.Code) - assert.Equal(t, "x({\"foo\":\"bar\"})", w.Body.String()) + assert.Equal(t, "x({\"foo\":\"bar\"});", w.Body.String()) assert.Equal(t, "application/javascript; charset=utf-8", w.Header().Get("Content-Type")) } diff --git a/render/json.go b/render/json.go index 2b07cba09e..70506f78a8 100644 --- a/render/json.go +++ b/render/json.go @@ -138,7 +138,7 @@ func (r JsonpJSON) Render(w http.ResponseWriter) (err error) { if err != nil { return err } - _, err = w.Write([]byte(")")) + _, err = w.Write([]byte(");")) if err != nil { return err } From 930bd2d6ddc4899fba22b17198618104c87aa292 Mon Sep 17 00:00:00 2001 From: George Date: Mon, 5 Aug 2019 20:47:35 +0300 Subject: [PATCH 2/2] render_test fix --- render/render_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/render/render_test.go b/render/render_test.go index 4cc71972c5..b27134ff3a 100644 --- a/render/render_test.go +++ b/render/render_test.go @@ -146,7 +146,7 @@ func TestRenderJsonpJSON(t *testing.T) { err1 := (JsonpJSON{"x", data}).Render(w1) assert.NoError(t, err1) - assert.Equal(t, "x({\"foo\":\"bar\"})", w1.Body.String()) + assert.Equal(t, "x({\"foo\":\"bar\"});", w1.Body.String()) assert.Equal(t, "application/javascript; charset=utf-8", w1.Header().Get("Content-Type")) w2 := httptest.NewRecorder() @@ -158,7 +158,7 @@ func TestRenderJsonpJSON(t *testing.T) { err2 := (JsonpJSON{"x", datas}).Render(w2) assert.NoError(t, err2) - assert.Equal(t, "x([{\"foo\":\"bar\"},{\"bar\":\"foo\"}])", w2.Body.String()) + assert.Equal(t, "x([{\"foo\":\"bar\"},{\"bar\":\"foo\"}]);", w2.Body.String()) assert.Equal(t, "application/javascript; charset=utf-8", w2.Header().Get("Content-Type")) }