mirror of
https://github.com/gin-gonic/gin.git
synced 2025-10-17 14:12:16 +08:00
Merge branch 'AbortWithStatusJSON' of https://github.com/pjgg/gin into AbortWithStatusJSON
This commit is contained in:
commit
d08a9a8f41
@ -631,7 +631,11 @@ func TestContextAbortWithStatus(t *testing.T) {
|
|||||||
func TestContextAbortWithStatusJSON(t *testing.T) {
|
func TestContextAbortWithStatusJSON(t *testing.T) {
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
c, _ := CreateTestContext(w)
|
c, _ := CreateTestContext(w)
|
||||||
|
<<<<<<< HEAD
|
||||||
|
|
||||||
|
=======
|
||||||
|
|
||||||
|
>>>>>>> d08400d4d4a552c9521b7e5379d79b18a409694e
|
||||||
c.index = 4
|
c.index = 4
|
||||||
type inboundJsonType struct {
|
type inboundJsonType struct {
|
||||||
Foo string `json:"foo"`
|
Foo string `json:"foo"`
|
||||||
|
Loading…
x
Reference in New Issue
Block a user