Browse Source

Merge branch 'fix_is_aborted_method' of https://github.com/adwinsky/gin

Manu Mtz-Almeida 10 years ago
parent
commit
16b08c41c9
2 changed files with 15 additions and 1 deletions
  1. 1 1
      context.go
  2. 14 0
      context_test.go

+ 1 - 1
context.go

@@ -95,7 +95,7 @@ func (c *Context) Next() {
 
 // Returns if the currect context was aborted.
 func (c *Context) IsAborted() bool {
-	return c.index == AbortIndex
+	return c.index >= AbortIndex
 }
 
 // Stops the system to continue calling the pending handlers in the chain.

+ 14 - 0
context_test.go

@@ -408,6 +408,20 @@ func TestContextNegotiationFormatCustum(t *testing.T) {
 	assert.Equal(t, c.NegotiateFormat(MIMEJSON), MIMEJSON)
 }
 
+func TestContextIsAborted(t *testing.T) {
+	c, _, _ := createTestContext()
+
+	assert.False(t, c.IsAborted())
+
+	c.Abort()
+
+	assert.True(t, c.IsAborted())
+
+	c.Next()
+
+	assert.True(t, c.IsAborted())
+}
+
 // TestContextData tests that the response can be written from `bytesting`
 // with specified MIME type
 func TestContextAbortWithStatus(t *testing.T) {