blackteay/gin
3
0
Fork 0
mirror of https://github.com/gin-gonic/gin.git synced 2025-10-24 19:09:57 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into indent

Browse Source
This commit is contained in:
Bo-Yi Wu 2017-07-11 09:43:43 -05:00 committed by GitHub
commit c5a88b35c5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
context_test.go
View File

@ -582,7 +582,7 @@ func TestContextRenderIndentedJSON(t *testing.T) {
c.IndentedJSON(201, H{"foo": "bar", "bar": "foo", "nested": H{"foo": "bar"}}) c.IndentedJSON(201, H{"foo": "bar", "bar": "foo", "nested": H{"foo": "bar"}})
assert.Equal(t, w.Code, 201) assert.Equal(t, w.Code, 201)
assert.Equal(t, "{\n \"bar\":\"foo\",\n \"foo\":\"bar\",\n \"nested\":{\n \"foo\":\"bar\"\n }\n}", w.Body.String()) assert.Equal(t, "{\n \"bar\": \"foo\",\n \"foo\": \"bar\",\n \"nested\": {\n \"foo\": \"bar\"\n }\n}", w.Body.String())
assert.Equal(t, "application/json; charset=utf-8", w.HeaderMap.Get("Content-Type")) assert.Equal(t, "application/json; charset=utf-8", w.HeaderMap.Get("Content-Type"))
} }

6
vendor/vendor.json vendored
View File

@ -34,10 +34,10 @@
"revisionTime": "2017-06-01T23:02:30Z" "revisionTime": "2017-06-01T23:02:30Z"
}, },
{ {
"checksumSHA1": "YY//OXgGrJOsiR8Cz1xexk/zwkc=", "checksumSHA1": "bgb/lk2wroBJ5z+JI2xnVj7WkwI=",
"path": "github.com/json-iterator/go", "path": "github.com/json-iterator/go",
"revision": "37ba1b32b5ed52dfaff0fe50d923d210c11c8daf", "revision": "845d8438db34cc782608bbee7647a522b4e87de0",
"revisionTime": "2017-07-08T17:01:13Z" "revisionTime": "2017-07-10T17:07:18Z"
}, },
{ {
"checksumSHA1": "9if9IBLsxkarJ804NPWAzgskIAk=", "checksumSHA1": "9if9IBLsxkarJ804NPWAzgskIAk=",