Scheduled
{{end}}{{if .Title.String}}{{.FormattedDisplayTitle}}
{{end}}{{if and $.Collection.Format.ShowDates (not .IsPinned) .IsFound}}{{end}}{{.HTMLContent}}
with a
paragraph."), "Content with a paragraph."}, + "content with escaped char": {givenPost("Content's all OK."), "Content's all OK."}, + "multiline content": {givenPost(`Content +in +multiple +lines.`), "Content in multiple lines."}, + } + + for name, test := range testCases { + t.Run(name, func(t *testing.T) { + actual := test.given.Summary() + assert.Equal(t, test.expected, actual) + }) + } +} + +func givenPost(content string) writefreely.Post { + return writefreely.Post{Title: zero.StringFrom("Title"), Content: content} +} diff --git a/routes.go b/routes.go index 47c4f19..bb1785f 100644 --- a/routes.go +++ b/routes.go @@ -26,6 +26,7 @@ import ( func (app *App) InitStaticRoutes(r *mux.Router) { // Handle static files fs := http.FileServer(http.Dir(filepath.Join(app.cfg.Server.StaticParentDir, staticDir))) + fs = cacheControl(fs) app.shttp = http.NewServeMux() app.shttp.Handle("/", fs) r.PathPrefix("/").Handler(fs) @@ -206,7 +207,6 @@ func RouteCollections(handler *Handler, r *mux.Router) { r.HandleFunc("/page/{page:[0-9]+}", handler.Web(handleViewCollection, UserLevelReader)) r.HandleFunc("/tag:{tag}", handler.Web(handleViewCollectionTag, UserLevelReader)) r.HandleFunc("/tag:{tag}/feed/", handler.Web(ViewFeed, UserLevelReader)) - r.HandleFunc("/tags/{tag}", handler.Web(handleViewCollectionTag, UserLevelReader)) r.HandleFunc("/sitemap.xml", handler.AllReader(handleViewSitemap)) r.HandleFunc("/feed/", handler.AllReader(ViewFeed)) r.HandleFunc("/{slug}", handler.CollectionPostOrStatic) diff --git a/routes_test.go b/routes_test.go new file mode 100644 index 0000000..9669e6e --- /dev/null +++ b/routes_test.go @@ -0,0 +1,38 @@ +package writefreely + +import ( + "net/http" + "net/http/httptest" + "strings" + "testing" + + "github.com/gorilla/mux" +) + +func TestCacheControlForStaticFiles(t *testing.T) { + app := NewApp("testdata/config.ini") + if err := app.LoadConfig(); err != nil { + t.Fatalf("Could not create an app; %v", err) + } + router := mux.NewRouter() + app.InitStaticRoutes(router) + + rec := httptest.NewRecorder() + req := httptest.NewRequest("GET", "/style.css", nil) + router.ServeHTTP(rec, req) + if code := rec.Result().StatusCode; code != http.StatusOK { + t.Fatalf("Could not get /style.css, got HTTP status %d", code) + } + actual := rec.Result().Header.Get("Cache-Control") + + expectedDirectives := []string{ + "public", + "max-age", + "immutable", + } + for _, expected := range expectedDirectives { + if !strings.Contains(actual, expected) { + t.Errorf("Expected Cache-Control header to contain '%s', but was '%s'", expected, actual) + } + } +} diff --git a/templates/chorus-collection-post.tmpl b/templates/chorus-collection-post.tmpl index dcea457..22f2d8f 100644 --- a/templates/chorus-collection-post.tmpl +++ b/templates/chorus-collection-post.tmpl @@ -29,6 +29,7 @@ {{range .Images}}{{else}}{{end}} + {{template "collection-meta" .}} {{if .Collection.StyleSheet}}{{end}} {{end}} {{end}} {{if .Collection.RenderMathJax}} @@ -62,7 +63,7 @@ {{if .Silenced}} {{template "user-silenced"}} {{end}} -Scheduled
{{end}}{{if .Title.String}}Scheduled
{{end}}{{if .Title.String}}