mirror of
https://github.com/labstack/echo.git
synced 2024-12-24 20:14:31 +02:00
88965757af
* Simplify code of Add/Remove trailing slash - simplify code (more informative / understanding) - assert collides with imported package name (in tests) - fix unhandled errors * add tests for https://github.com/labstack/echo/pull/1275#issuecomment-460467700
97 lines
2.6 KiB
Go
97 lines
2.6 KiB
Go
package middleware
|
|
|
|
import (
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"github.com/labstack/echo/v4"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestAddTrailingSlash(t *testing.T) {
|
|
is := assert.New(t)
|
|
e := echo.New()
|
|
req := httptest.NewRequest(http.MethodGet, "/add-slash", nil)
|
|
rec := httptest.NewRecorder()
|
|
c := e.NewContext(req, rec)
|
|
h := AddTrailingSlash()(func(c echo.Context) error {
|
|
return nil
|
|
})
|
|
is.NoError(h(c))
|
|
is.Equal("/add-slash/", req.URL.Path)
|
|
is.Equal("/add-slash/", req.RequestURI)
|
|
|
|
// Method Connect must not fail:
|
|
req = httptest.NewRequest(http.MethodConnect, "", nil)
|
|
rec = httptest.NewRecorder()
|
|
c = e.NewContext(req, rec)
|
|
h = AddTrailingSlash()(func(c echo.Context) error {
|
|
return nil
|
|
})
|
|
is.NoError(h(c))
|
|
is.Equal("/", req.URL.Path)
|
|
is.Equal("/", req.RequestURI)
|
|
|
|
// With config
|
|
req = httptest.NewRequest(http.MethodGet, "/add-slash?key=value", nil)
|
|
rec = httptest.NewRecorder()
|
|
c = e.NewContext(req, rec)
|
|
h = AddTrailingSlashWithConfig(TrailingSlashConfig{
|
|
RedirectCode: http.StatusMovedPermanently,
|
|
})(func(c echo.Context) error {
|
|
return nil
|
|
})
|
|
is.NoError(h(c))
|
|
is.Equal(http.StatusMovedPermanently, rec.Code)
|
|
is.Equal("/add-slash/?key=value", rec.Header().Get(echo.HeaderLocation))
|
|
}
|
|
|
|
func TestRemoveTrailingSlash(t *testing.T) {
|
|
is := assert.New(t)
|
|
e := echo.New()
|
|
req := httptest.NewRequest(http.MethodGet, "/remove-slash/", nil)
|
|
rec := httptest.NewRecorder()
|
|
c := e.NewContext(req, rec)
|
|
h := RemoveTrailingSlash()(func(c echo.Context) error {
|
|
return nil
|
|
})
|
|
is.NoError(h(c))
|
|
is.Equal("/remove-slash", req.URL.Path)
|
|
is.Equal("/remove-slash", req.RequestURI)
|
|
|
|
// Method Connect must not fail:
|
|
req = httptest.NewRequest(http.MethodConnect, "", nil)
|
|
rec = httptest.NewRecorder()
|
|
c = e.NewContext(req, rec)
|
|
h = RemoveTrailingSlash()(func(c echo.Context) error {
|
|
return nil
|
|
})
|
|
is.NoError(h(c))
|
|
is.Equal("", req.URL.Path)
|
|
is.Equal("", req.RequestURI)
|
|
|
|
// With config
|
|
req = httptest.NewRequest(http.MethodGet, "/remove-slash/?key=value", nil)
|
|
rec = httptest.NewRecorder()
|
|
c = e.NewContext(req, rec)
|
|
h = RemoveTrailingSlashWithConfig(TrailingSlashConfig{
|
|
RedirectCode: http.StatusMovedPermanently,
|
|
})(func(c echo.Context) error {
|
|
return nil
|
|
})
|
|
is.NoError(h(c))
|
|
is.Equal(http.StatusMovedPermanently, rec.Code)
|
|
is.Equal("/remove-slash?key=value", rec.Header().Get(echo.HeaderLocation))
|
|
|
|
// With bare URL
|
|
req = httptest.NewRequest(http.MethodGet, "http://localhost", nil)
|
|
rec = httptest.NewRecorder()
|
|
c = e.NewContext(req, rec)
|
|
h = RemoveTrailingSlash()(func(c echo.Context) error {
|
|
return nil
|
|
})
|
|
is.NoError(h(c))
|
|
is.Equal("", req.URL.Path)
|
|
}
|