Fixed test

vishr · vishr · commit 4255f4bd4411 · 2016-01-09T10:39:47.000-08:00
Signed-off-by: Vishal Rana &lt;vr@labstack.com&gt;
diff --git a/_fixture/favicon.ico b/_fixture/favicon.ico
diff --git a/_fixture/folder/index.html b/_fixture/folder/index.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Echo</title>
+</head>
+<body>
+</body>
+</html>
diff --git a/_fixture/images/walle.png b/_fixture/images/walle.png
diff --git a/_fixture/index.html b/_fixture/index.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Echo</title>
+</head>
+<body>
+</body>
+</html>
diff --git a/context_test.go b/context_test.go
@@ -194,7 +194,7 @@ func TestContext(t *testing.T) {
 	// File
 	rec = httptest.NewRecorder()
 	c = NewContext(req, NewResponse(rec, e), e)
-	err = c.File("test/fixture/walle.png", "", false)
+	err = c.File("_fixture/images/walle.png", "", false)
 	if assert.NoError(t, err) {
 		assert.Equal(t, http.StatusOK, rec.Code)
 		assert.Equal(t, 219885, rec.Body.Len())
@@ -203,7 +203,7 @@ func TestContext(t *testing.T) {
 	// File as attachment
 	rec = httptest.NewRecorder()
 	c = NewContext(req, NewResponse(rec, e), e)
-	err = c.File("test/fixture/walle.png", "WALLE.PNG", true)
+	err = c.File("_fixture/images/walle.png", "WALLE.PNG", true)
 	if assert.NoError(t, err) {
 		assert.Equal(t, http.StatusOK, rec.Code)
 		assert.Equal(t, rec.Header().Get(ContentDisposition), "attachment; filename=WALLE.PNG")
diff --git a/echo_test.go b/echo_test.go
@@ -43,15 +43,15 @@ func TestEcho(t *testing.T) {
 
 func TestEchoIndex(t *testing.T) {
 	e := New()
-	e.Index("recipes/website/public/index.html")
+	e.Index("_fixture/index.html")
 	c, b := request(GET, "/", e)
 	assert.Equal(t, http.StatusOK, c)
 	assert.NotEmpty(t, b)
 }
 
 func TestEchoFavicon(t *testing.T) {
 	e := New()
-	e.Favicon("recipes/website/public/favicon.ico")
+	e.Favicon("_fixture/favicon.ico")
 	c, b := request(GET, "/favicon.ico", e)
 	assert.Equal(t, http.StatusOK, c)
 	assert.NotEmpty(t, b)
@@ -61,31 +61,32 @@ func TestEchoStatic(t *testing.T) {
 	e := New()
 
 	// OK
-	e.Static("/scripts", "recipes/website/public/scripts")
-	c, b := request(GET, "/scripts/main.js", e)
+	e.Static("/images", "_fixture/images")
+	c, b := request(GET, "/images/walle.png", e)
 	assert.Equal(t, http.StatusOK, c)
 	assert.NotEmpty(t, b)
 
 	// No file
-	e.Static("/scripts", "recipes/website/public/scripts")
-	c, _ = request(GET, "/scripts/index.js", e)
+	e.Static("/images", "_fixture/scripts")
+	c, _ = request(GET, "/images/bolt.png", e)
 	assert.Equal(t, http.StatusNotFound, c)
 
 	// Directory
-	e.Static("/scripts", "recipes/website/public/scripts")
-	c, _ = request(GET, "/scripts", e)
+	e.Static("/images", "_fixture/images")
+	c, _ = request(GET, "/images", e)
 	assert.Equal(t, http.StatusForbidden, c)
 
 	// Directory with index.html
-	e.Static("/", "recipes/website/public")
+	e.Static("/", "_fixture")
 	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)
+	assert.Equal(t, true, strings.HasPrefix(r, "<!doctype html>"))
+	// assert.Equal(t, "sub directory", r)
 }
 
 func TestEchoMiddleware(t *testing.T) {
