Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-06-23 15:31:40 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

export of variables undone

Browse Source
This commit is contained in:
Karthic Rao 2015-06-27 03:49:44 +05:30
parent 9995466a18
commit e039577d66
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/setup/templates.go
View File

@ -39,11 +39,11 @@ func templatesParse(c *Controller) ([]templates.Rule, error) {
// Any remaining arguments are extensions // Any remaining arguments are extensions
rule.Extensions = c.RemainingArgs() rule.Extensions = c.RemainingArgs()
if len(rule.Extensions) == 0 { if len(rule.Extensions) == 0 {
rule.Extensions = DefaultTemplateExtensions rule.Extensions = defaultTemplateExtensions
} }
} else { } else {
rule.Path = DefaultTemplatePath rule.Path = defaultTemplatePath
rule.Extensions = DefaultTemplateExtensions rule.Extensions = defaultTemplateExtensions
} }
for _, ext := range rule.Extensions { for _, ext := range rule.Extensions {
@ -56,6 +56,6 @@ func templatesParse(c *Controller) ([]templates.Rule, error) {
return rules, nil return rules, nil
} }
const DefaultTemplatePath = "/" const defaultTemplatePath = "/"
var DefaultTemplateExtensions = []string{".html", ".htm", ".tmpl", ".tpl", ".txt"} var defaultTemplateExtensions = []string{".html", ".htm", ".tmpl", ".tpl", ".txt"}

8
config/setup/templates_test.go
View File

@ -27,14 +27,14 @@ func TestTemplates(t *testing.T) {
t.Fatalf("Expected handler to be type Templates, got: %#v", handler) t.Fatalf("Expected handler to be type Templates, got: %#v", handler)
} }
if myHandler.Rules[0].Path != DefaultTemplatePath { if myHandler.Rules[0].Path != defaultTemplatePath {
t.Errorf("Expected / as the default Path") t.Errorf("Expected / as the default Path")
} }
if fmt.Sprint(myHandler.Rules[0].Extensions) != fmt.Sprint(DefaultTemplateExtensions) { if fmt.Sprint(myHandler.Rules[0].Extensions) != fmt.Sprint(defaultTemplateExtensions) {
t.Errorf("Expected %v to be the Default Extensions", DefaultTemplateExtensions) t.Errorf("Expected %v to be the Default Extensions", defaultTemplateExtensions)
} }
var indexFiles []string var indexFiles []string
for _, extension := range DefaultTemplateExtensions { for _, extension := range defaultTemplateExtensions {
indexFiles = append(indexFiles, "index"+extension) indexFiles = append(indexFiles, "index"+extension)
} }
if fmt.Sprint(myHandler.Rules[0].IndexFiles) != fmt.Sprint(indexFiles) { if fmt.Sprint(myHandler.Rules[0].IndexFiles) != fmt.Sprint(indexFiles) {