Merge branch 'syntaqx-directory-index'

vishr · vishr · commit dee0dddd6756 · 2015-06-19T18:05:34.000-07:00
diff --git a/echo_test.go b/echo_test.go
@@ -78,8 +78,14 @@ func TestEchoStatic(t *testing.T) {
 
 	// Directory with index.html
 	e.Static("/", "examples/website/public")
-	c, _ = request(GET, "/", e)
+	c, r := request(GET, "/", e)
 	assert.Equal(t, http.StatusOK, c)
+	assert.Equal(t, true, strings.HasPrefix(r, "<!doctype html>"))
+
+	// Sub-directory with index.html
+	c, r = request(GET, "/folder", e)
+	assert.Equal(t, http.StatusOK, c)
+	assert.Equal(t, "sub directory", r)
 }
 
 func TestEchoMiddleware(t *testing.T) {
diff --git a/examples/website/public/folder/index.html b/examples/website/public/folder/index.html
@@ -0,0 +1 @@
+sub directory
