github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-26 18:30:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
7b29568eb1
caddy/middleware/markdown/markdown_test.go

162 lines
3.5 KiB
Go
Raw Normal View History

Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 13:58:34 +08:00
package markdown
import (
"net/http"
"net/http/httptest"
Added a test on markdown for the default template
2015-07-21 23:45:32 +08:00
"strings"
Code cleanups. Fix more race conditions.
2015-07-29 19:15:02 +08:00
"sync"
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 13:58:34 +08:00
"testing"
Moved test files to testdata folder. Changed the tests accordingly.
2015-07-23 15:35:46 +08:00
"github.com/mholt/caddy/middleware"
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 13:58:34 +08:00
"github.com/russross/blackfriday"
)
func TestMarkdown(t *testing.T) {
templates := make(map[string]string)
Moved test files to testdata folder. Changed the tests accordingly.
2015-07-23 15:35:46 +08:00
templates[DefaultTemplate] = "testdata/markdown_tpl.html"
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 13:58:34 +08:00
md := Markdown{
Moved test files to testdata folder. Changed the tests accordingly.
2015-07-23 15:35:46 +08:00
Root: "./testdata",
FileSys: http.Dir("./testdata"),
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 13:58:34 +08:00
Configs: []Config{
Config{
Code cleanups. Fix more race conditions.
2015-07-29 19:15:02 +08:00
Renderer: blackfriday.HtmlRenderer(0, "", ""),
PathScope: "/blog",
Extensions: []string{".md"},
Styles: []string{},
Scripts: []string{},
Templates: templates,
StaticDir: DefaultStaticDir,
StaticFiles: make(map[string]string),
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 13:58:34 +08:00
},
Added a test on markdown for the default template
2015-07-21 23:45:32 +08:00
Config{
Code cleanups. Fix more race conditions.
2015-07-29 19:15:02 +08:00
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),
StaticDir: DefaultStaticDir,
StaticFiles: make(map[string]string),
Added a test on markdown for the default template
2015-07-21 23:45:32 +08:00
},
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 13:58:34 +08:00
},
IndexFiles: []string{"index.html"},
Moved test files to testdata folder. Changed the tests accordingly.
2015-07-23 15:35:46 +08:00
Next: middleware.HandlerFunc(func(w http.ResponseWriter, r *http.Request) (int, error) {
t.Fatalf("Next shouldn't be called")
return 0, nil
}),
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 13:58:34 +08:00
}
req, err := http.NewRequest("GET", "/blog/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>
</head>
<body>
<h1>Header</h1>
Welcome to A Caddy website!
<h2>Welcome on the blog</h2>
<p>Body</p>
<p><code>go
func getTrue() bool {
return true
}
</code></p>
</body>
</html>
`
Added a test on markdown for the default template
2015-07-21 23:45:32 +08:00
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>`
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 13:58:34 +08:00
Added a test on markdown for the default template
2015-07-21 23:45:32 +08:00
replacer := strings.NewReplacer("\r", "", "\n", "")
respBody = replacer.Replace(respBody)
expectedBody = replacer.Replace(expectedBody)
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 13:58:34 +08:00
if respBody != expectedBody {
t.Fatalf("Expected body: %v got: %v", expectedBody, respBody)
}
Code cleanups. Fix more race conditions.
2015-07-29 19:15:02 +08:00
expectedLinks := []string{
"/blog/test.md",
"/log/test.md",
}
for i, c := range md.Configs {
if c.Links[0].Url != expectedLinks[i] {
t.Fatalf("Expected %v got %v", expectedLinks[i], c.Links[0].Url)
}
}
// attempt to trigger race condition
var w sync.WaitGroup
f := func() {
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)
w.Done()
}
for i := 0; i < 5; i++ {
w.Add(1)
go f()
}
w.Wait()
Add context to markdown template Created a struct containing middleware.Context, Title, Markdown and the variables from the user to use to render the template. The title now can be accessed via {{.Title}}. The variables can now be accessed via {{.Var.myVariableName}}.
2015-07-21 13:58:34 +08:00
}
Reference in New Issue Copy Permalink