Fix CSRF tests for Go 1.12

middleware/csrf.go

@@ -110,7 +110,7 @@ func CSRFWithConfig(config CSRFConfig) echo.MiddlewareFunc {
 	if config.CookieMaxAge == 0 {
 		config.CookieMaxAge = DefaultCSRFConfig.CookieMaxAge
 	}
-	if config.CookieSameSite == http.SameSiteNoneMode {
+	if config.CookieSameSite == SameSiteNoneMode {
 		config.CookieSecure = true
 	}
 

middleware/csrf_samesite.go

@@ -1,4 +1,4 @@
-// +build !go1.12
+// +build go1.13
 
 package middleware
 

middleware/csrf_samesite_1.12.go

@@ -1,4 +1,4 @@
-// +build go1.12
+// +build !go1.13
 
 package middleware
 

middleware/csrf_samesite_test.go

@@ -0,0 +1,33 @@
+// +build go1.13
+
+package middleware
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/labstack/echo/v4"
+	"github.com/stretchr/testify/assert"
+)
+
+// Test for SameSiteModeNone moved to separate file for Go 1.12 support
+func TestCSRFWithSameSiteModeNone(t *testing.T) {
+	e := echo.New()
+	req := httptest.NewRequest(http.MethodGet, "/", nil)
+	rec := httptest.NewRecorder()
+	c := e.NewContext(req, rec)
+
+	csrf := CSRFWithConfig(CSRFConfig{
+		CookieSameSite: SameSiteNoneMode,
+	})
+
+	h := csrf(func(c echo.Context) error {
+		return c.String(http.StatusOK, "test")
+	})
+
+	r := h(c)
+	assert.NoError(t, r)
+	assert.Regexp(t, "SameSite=None", rec.Header()["Set-Cookie"])
+	assert.Regexp(t, "Secure", rec.Header()["Set-Cookie"])
+}

middleware/csrf_test.go

@@ -138,23 +138,3 @@ func TestCSRFWithSameSiteDefaultMode(t *testing.T) {
 	fmt.Println(rec.Header()["Set-Cookie"])
 	assert.NotRegexp(t, "SameSite=", rec.Header()["Set-Cookie"])
 }
-
-func TestCSRFWithSameSiteModeNone(t *testing.T) {
-	e := echo.New()
-	req := httptest.NewRequest(http.MethodGet, "/", nil)
-	rec := httptest.NewRecorder()
-	c := e.NewContext(req, rec)
-
-	csrf := CSRFWithConfig(CSRFConfig{
-		CookieSameSite: SameSiteNoneMode,
-	})
-
-	h := csrf(func(c echo.Context) error {
-		return c.String(http.StatusOK, "test")
-	})
-
-	r := h(c)
-	assert.NoError(t, r)
-	assert.Regexp(t, "SameSite=None", rec.Header()["Set-Cookie"])
-	assert.Regexp(t, "Secure", rec.Header()["Set-Cookie"])
-}