Added tests for cloning request for Form, QueryString, and Cookies

Author: ilijamt

middleware/timeout_test.go

@@ -9,12 +9,15 @@ import (
 	"github.com/stretchr/testify/assert"
 	"net/http"
 	"net/http/httptest"
+	"net/url"
 	"reflect"
+	"strings"
 	"testing"
 	"time"
 )
 
 func TestTimeoutSkipper(t *testing.T) {
+	t.Parallel()
 	m := TimeoutWithConfig(TimeoutConfig{
 		Skipper: func(context echo.Context) bool {
 			return true
@@ -36,6 +39,7 @@ func TestTimeoutSkipper(t *testing.T) {
 }
 
 func TestTimeoutWithTimeout0(t *testing.T) {
+	t.Parallel()
 	m := TimeoutWithConfig(TimeoutConfig{
 		Timeout: 0,
 	})
@@ -55,6 +59,7 @@ func TestTimeoutWithTimeout0(t *testing.T) {
 }
 
 func TestTimeoutIsCancelable(t *testing.T) {
+	t.Parallel()
 	m := TimeoutWithConfig(TimeoutConfig{
 		Timeout: time.Minute,
 	})
@@ -74,6 +79,7 @@ func TestTimeoutIsCancelable(t *testing.T) {
 }
 
 func TestTimeoutErrorOutInHandler(t *testing.T) {
+	t.Parallel()
 	m := Timeout()
 
 	req := httptest.NewRequest(http.MethodGet, "/", nil)
@@ -90,9 +96,11 @@ func TestTimeoutErrorOutInHandler(t *testing.T) {
 }
 
 func TestTimeoutTimesOutAfterPredefinedTimeoutWithErrorHandler(t *testing.T) {
+	t.Parallel()
 	m := TimeoutWithConfig(TimeoutConfig{
 		Timeout: time.Second,
 		ErrorHandler: func(err error, e echo.Context) error {
+			assert.EqualError(t, err, context.DeadlineExceeded.Error())
 			return errors.New("err")
 		},
 	})
@@ -112,6 +120,7 @@ func TestTimeoutTimesOutAfterPredefinedTimeoutWithErrorHandler(t *testing.T) {
 }
 
 func TestTimeoutTimesOutAfterPredefinedTimeout(t *testing.T) {
+	t.Parallel()
 	m := TimeoutWithConfig(TimeoutConfig{
 		Timeout: time.Second,
 	})
@@ -129,3 +138,44 @@ func TestTimeoutTimesOutAfterPredefinedTimeout(t *testing.T) {
 
 	assert.EqualError(t, err, context.DeadlineExceeded.Error())
 }
+
+func TestTimeoutTestRequestClone(t *testing.T) {
+	t.Parallel()
+	req := httptest.NewRequest(http.MethodPost, "/uri?query=value", strings.NewReader(url.Values{"form": {"value"}}.Encode()))
+	req.AddCookie(&http.Cookie{Name: "cookie", Value: "value"})
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	rec := httptest.NewRecorder()
+
+	m := TimeoutWithConfig(TimeoutConfig{
+		Timeout: time.Second,
+		ErrorHandler: func(err error, c echo.Context) error {
+			assert.EqualError(t, err, context.DeadlineExceeded.Error())
+			
+			// Cookie test
+			cookie, err := c.Request().Cookie("cookie")
+			if assert.NoError(t, err) {
+				assert.EqualValues(t, "cookie", cookie.Name)
+				assert.EqualValues(t, "value", cookie.Value)
+			}
+
+			// Form values
+			if assert.NoError(t, c.Request().ParseForm()) {
+				assert.EqualValues(t, "value", c.Request().FormValue("form"))
+			}
+
+			// Query string
+			assert.EqualValues(t, "value", c.Request().URL.Query()["query"][0])
+			return errors.New("err")
+		},
+	})
+
+	e := echo.New()
+	c := e.NewContext(req, rec)
+
+	err := m(func(c echo.Context) error {
+		time.Sleep(time.Minute)
+		return nil
+	})(c)
+
+	assert.Error(t, err)
+}