Merge pull request gin-gonic#587 from roylou/develop

javierprovecho · javierprovecho · commit 4df51ad4f8b8 · 2016-04-15T00:36:29.000+02:00
Write header immediately in AbortWithStatus(), close gin-gonic#585
diff --git a/context.go b/context.go
@@ -115,6 +115,7 @@ func (c *Context) Abort() {
 // For example, a failed attempt to authentificate a request could use: context.AbortWithStatus(401).
 func (c *Context) AbortWithStatus(code int) {
 	c.Status(code)
+	c.Writer.WriteHeaderNow()
 	c.Abort()
 }
 
diff --git a/context_test.go b/context_test.go
@@ -556,7 +556,6 @@ func TestContextAbortWithStatus(t *testing.T) {
 	c, w, _ := CreateTestContext()
 	c.index = 4
 	c.AbortWithStatus(401)
-	c.Writer.WriteHeaderNow()
 
 	assert.Equal(t, c.index, abortIndex)
 	assert.Equal(t, c.Writer.Status(), 401)
@@ -607,7 +606,6 @@ func TestContextTypedError(t *testing.T) {
 func TestContextAbortWithError(t *testing.T) {
 	c, w, _ := CreateTestContext()
 	c.AbortWithError(401, errors.New("bad input")).SetMeta("some input")
-	c.Writer.WriteHeaderNow()
 
 	assert.Equal(t, w.Code, 401)
 	assert.Equal(t, c.index, abortIndex)
diff --git a/logger.go b/logger.go
@@ -28,12 +28,9 @@ func ErrorLogger() HandlerFunc {
 func ErrorLoggerT(typ ErrorType) HandlerFunc {
 	return func(c *Context) {
 		c.Next()
-		// avoid writting if we already wrote into the response body
-		if !c.Writer.Written() {
-			errors := c.Errors.ByType(typ)
-			if len(errors) > 0 {
-				c.JSON(-1, errors)
-			}
+		errors := c.Errors.ByType(typ)
+		if len(errors) > 0 {
+			c.JSON(-1, errors)
 		}
 	}
 }
diff --git a/logger_test.go b/logger_test.go
@@ -116,7 +116,7 @@ func TestErrorLogger(t *testing.T) {
 
 	w = performRequest(router, "GET", "/print")
 	assert.Equal(t, w.Code, 500)
-	assert.Equal(t, w.Body.String(), "hola!")
+	assert.Equal(t, w.Body.String(), "hola!{\"error\":\"this is an error\"}\n")
 }
 
 func TestSkippingPaths(t *testing.T) {
diff --git a/recovery_test.go b/recovery_test.go
@@ -39,5 +39,5 @@ func TestPanicWithAbort(t *testing.T) {
 	// RUN
 	w := performRequest(router, "GET", "/recovery")
 	// TEST
-	assert.Equal(t, w.Code, 500) // NOT SURE
+	assert.Equal(t, w.Code, 400)
 }

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ func (c *Context) Abort() {`
`115`	`115`	`// For example, a failed attempt to authentificate a request could use: context.AbortWithStatus(401).`
`116`	`116`	`func (c *Context) AbortWithStatus(code int) {`
`117`	`117`	`c.Status(code)`
	`118`	`+ c.Writer.WriteHeaderNow()`
`118`	`119`	`c.Abort()`
`119`	`120`	`}`
`120`	`121`
Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,9 @@ func ErrorLogger() HandlerFunc {`
`28`	`28`	`func ErrorLoggerT(typ ErrorType) HandlerFunc {`
`29`	`29`	`return func(c *Context) {`
`30`	`30`	`c.Next()`
`31`		`- // avoid writting if we already wrote into the response body`
`32`		`- if !c.Writer.Written() {`
`33`		`- errors := c.Errors.ByType(typ)`
`34`		`- if len(errors) > 0 {`
`35`		`- c.JSON(-1, errors)`
`36`		`- }`
	`31`	`+ errors := c.Errors.ByType(typ)`
	`32`	`+ if len(errors) > 0 {`
	`33`	`+ c.JSON(-1, errors)`
`37`	`34`	`}`
`38`	`35`	`}`
`39`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ func TestErrorLogger(t *testing.T) {`
`116`	`116`
`117`	`117`	`w = performRequest(router, "GET", "/print")`
`118`	`118`	`assert.Equal(t, w.Code, 500)`
`119`		`- assert.Equal(t, w.Body.String(), "hola!")`
	`119`	`+ assert.Equal(t, w.Body.String(), "hola!{\"error\":\"this is an error\"}\n")`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`func TestSkippingPaths(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,5 @@ func TestPanicWithAbort(t *testing.T) {`
`39`	`39`	`// RUN`
`40`	`40`	`w := performRequest(router, "GET", "/recovery")`
`41`	`41`	`// TEST`
`42`		`- assert.Equal(t, w.Code, 500) // NOT SURE`
	`42`	`+ assert.Equal(t, w.Code, 400)`
`43`	`43`	`}`