Merge branch 'master' into develop

# Conflicts:
#	debug_test.go
This commit is contained in:
Manu Mtz.-Almeida
2016-01-27 03:40:52 +01:00
10 changed files with 47 additions and 36 deletions
+1 -1
View File
@@ -63,7 +63,7 @@ func TestDebugPrintRoutes(t *testing.T) {
defer teardown()
debugPrintRoute("GET", "/path/to/route/:param", HandlersChain{func(c *Context) {}, handlerNameTest})
assert.Equal(t, w.String(), "[GIN-debug] GET /path/to/route/:param --> github.com/gin-gonic/gin.handlerNameTest (2 handlers)\n")
assert.Regexp(t, `^\[GIN-debug\] GET /path/to/route/:param --> (.*/vendor/)?github.com/gin-gonic/gin.handlerNameTest \(2 handlers\)\n$`, w.String())
}
func setup(w io.Writer) {