Added a test on markdown for the default template

2df30d18 · Maxime · 6451e10d · 2df30d18 · 2df30d18 · 2df30d18
Commit 2df30d18 authored Jul 21, 2015 by Maxime
3 changed files
--- a/middleware/markdown/log/test.md
+++ b/middleware/markdown/log/test.md
+---
+title: Markdown test
+variables:
+    sitename: A Caddy website
+---
+
+## Welcome on the blog
+
+Body
+
+``` go
+func getTrue() bool {
+    return true
+}
+```
--- a/middleware/markdown/markdown_test.go
+++ b/middleware/markdown/markdown_test.go
@@ -3,6 +3,7 @@ package markdown
 import (
 	"net/http"
 	"net/http/httptest"
+	"strings"
 	"testing"

 	"github.com/russross/blackfriday"
@@ -18,11 +19,19 @@ func TestMarkdown(t *testing.T) {
 			Config{
 				Renderer:   blackfriday.HtmlRenderer(0, "", ""),
 				PathScope:  "/blog",
-				Extensions: []string{"md"},
+				Extensions: []string{".md"},
 				Styles:     []string{},
 				Scripts:    []string{},
 				Templates:  templates,
 			},
+			Config{
+				Renderer:   blackfriday.HtmlRenderer(0, "", ""),
+				PathScope:  "/log",
+				Extensions: []string{".md"},
+				Styles:     []string{"/resources/css/log.css", "/resources/css/default.css"},
+				Scripts:    []string{"/resources/js/log.js", "/resources/js/default.js"},
+				Templates:  make(map[string]string),
+			},
 		},
 		IndexFiles: []string{"index.html"},
 	}
@@ -62,7 +71,50 @@ func getTrue() bool {
 </body>
 </html>
 `
+	if respBody != expectedBody {
+		t.Fatalf("Expected body: %v got: %v", expectedBody, respBody)
+	}
+
+	req, err = http.NewRequest("GET", "/log/test.md", nil)
+	if err != nil {
+		t.Fatalf("Could not create HTTP request: %v", err)
+	}
+	rec = httptest.NewRecorder()
+
+	md.ServeHTTP(rec, req)
+	if rec.Code != http.StatusOK {
+		t.Fatalf("Wrong status, expected: %d and got %d", http.StatusOK, rec.Code)
+	}
+	respBody = rec.Body.String()
+	expectedBody = `<!DOCTYPE html>
+<html>
+	<head>
+		<title>Markdown test</title>
+		<meta charset="utf-8">
+		<link rel="stylesheet" href="/resources/css/log.css">
+<link rel="stylesheet" href="/resources/css/default.css">
+
+		<script src="/resources/js/log.js"></script>
+<script src="/resources/js/default.js"></script>
+
+	</head>
+	<body>
+		<h2>Welcome on the blog</h2>
+
+<p>Body</p>
+
+<p><code>go
+func getTrue() bool {
+    return true
+}
+</code></p>
+
+	</body>
+</html>`

+	replacer := strings.NewReplacer("\r", "", "\n", "")
+	respBody = replacer.Replace(respBody)
+	expectedBody = replacer.Replace(expectedBody)
 	if respBody != expectedBody {
 		t.Fatalf("Expected body: %v got: %v", expectedBody, respBody)
 	}

--- a/middleware/markdown/process.go
+++ b/middleware/markdown/process.go
@@ -191,7 +191,7 @@ const (
 		{{js}}
 	</head>
 	<body>
-		{{.markdown}}
+		{{.Markdown}}
 	</body>
 </html>`
 	cssTemplate = `<link rel="stylesheet" href="{{url}}">`