Merge pull request #1722 from aldas/revert_pr_1674

lammel · web-flow · commit 829e82165fc0 · 2020-12-17T03:24:01.000+01:00
Revert #1674 - failing tests
diff --git a/echo.go b/echo.go
@@ -500,7 +500,6 @@ func (common) static(prefix, root string, get func(string, HandlerFunc, ...Middl
 		}
 		return c.File(name)
 	}
-	get(prefix, h)
 	if prefix == "/" {
 		return get(prefix+"*", h)
 	}
diff --git a/echo_test.go b/echo_test.go
@@ -102,15 +102,6 @@ func TestEchoStatic(t *testing.T) {
 			expectHeaderLocation: "/folder/",
 			expectBodyStartsWith: "",
 		},
-    {
-			name:                 "Directory Redirect with non-root path",
-			givenPrefix:          "/static",
-			givenRoot:            "_fixture",
-			whenURL:              "/static",
-			expectStatus:         http.StatusMovedPermanently,
-			expectHeaderLocation: "/static/",
-			expectBodyStartsWith: "",
-		},
 		{
 			name:                 "Directory with index.html",
 			givenPrefix:          "/",
@@ -170,40 +161,6 @@ func TestEchoStatic(t *testing.T) {
 	}
 }
 
-func TestEchoStaticRedirectIndex(t *testing.T) {
-	assert := assert.New(t)
-	e := New()
-
-	// HandlerFunc
-	e.Static("/static", "_fixture")
-
-	errCh := make(chan error)
-
-	go func() {
-		errCh <- e.Start("127.0.0.1:1323")
-	}()
-
-	time.Sleep(200 * time.Millisecond)
-
-	if resp, err := http.Get("http://127.0.0.1:1323/static"); err == nil {
-		defer resp.Body.Close()
-		assert.Equal(http.StatusOK, resp.StatusCode)
-
-		if body, err := ioutil.ReadAll(resp.Body); err == nil {
-			assert.Equal(true, strings.HasPrefix(string(body), "<!doctype html>"))
-		} else {
-			assert.Fail(err.Error())
-		}
-
-	} else {
-		assert.Fail(err.Error())
-	}
-
-	if err := e.Close(); err != nil {
-		t.Fatal(err)
-	}
-}
-
 func TestEchoFile(t *testing.T) {
 	e := New()
 	e.File("/walle", "_fixture/images/walle.png")
diff --git a/group.go b/group.go
@@ -23,6 +23,10 @@ func (g *Group) Use(middleware ...MiddlewareFunc) {
 	if len(g.middleware) == 0 {
 		return
 	}
+	// Allow all requests to reach the group as they might get dropped if router
+	// doesn't find a match, making none of the group middleware process.
+	g.Any("", NotFoundHandler)
+	g.Any("/*", NotFoundHandler)
 }
 
 // CONNECT implements `Echo#CONNECT()` for sub-routes within the Group.
diff --git a/group_test.go b/group_test.go
@@ -119,37 +119,3 @@ func TestGroupRouteMiddlewareWithMatchAny(t *testing.T) {
 	assert.Equal(t, "/*", m)
 
 }
-
-func TestMultipleGroupSamePathMiddleware(t *testing.T) {
-	// Ensure multiple groups with the same path do not clobber previous routes or mixup middlewares
-	e := New()
-	m1 := func(next HandlerFunc) HandlerFunc {
-		return func(c Context) error {
-			c.Set("middleware", "m1")
-			return next(c)
-		}
-	}
-	m2 := func(next HandlerFunc) HandlerFunc {
-		return func(c Context) error {
-			c.Set("middleware", "m2")
-			return next(c)
-		}
-	}
-	h := func(c Context) error {
-		return c.String(http.StatusOK, c.Get("middleware").(string))
-	}
-
-	g1 := e.Group("/group", m1)
-	{
-		g1.GET("", h)
-	}
-	g2 := e.Group("/group", m2)
-	{
-		g2.GET("/other", h)
-	}
-
-	_, m := request(http.MethodGet, "/group", e)
-	assert.Equal(t, "m1", m)
-	_, m = request(http.MethodGet, "/group/other", e)
-	assert.Equal(t, "m2", m)
-}

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,6 @@ func (common) static(prefix, root string, get func(string, HandlerFunc, ...Middl`
`500`	`500`	`}`
`501`	`501`	`return c.File(name)`
`502`	`502`	`}`
`503`		`- get(prefix, h)`
`504`	`503`	`if prefix == "/" {`
`505`	`504`	`return get(prefix+"*", h)`
`506`	`505`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,10 @@ func (g *Group) Use(middleware ...MiddlewareFunc) {`
`23`	`23`	`if len(g.middleware) == 0 {`
`24`	`24`	`return`
`25`	`25`	`}`
	`26`	`+ // Allow all requests to reach the group as they might get dropped if router`
	`27`	`+ // doesn't find a match, making none of the group middleware process.`
	`28`	`+ g.Any("", NotFoundHandler)`
	`29`	`+ g.Any("/*", NotFoundHandler)`
`26`	`30`	`}`
`27`	`31`
`28`	`32`	// CONNECT implements `Echo#CONNECT()` for sub-routes within the Group.