From e039577d66a566e7d88de1a872292423d9e23ce8 Mon Sep 17 00:00:00 2001 From: Karthic Rao Date: Sat, 27 Jun 2015 03:49:44 +0530 Subject: [PATCH] export of variables undone --- config/setup/templates.go | 10 +++++----- config/setup/templates_test.go | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/setup/templates.go b/config/setup/templates.go index fe9088989..51d78d5ce 100644 --- a/config/setup/templates.go +++ b/config/setup/templates.go @@ -39,11 +39,11 @@ func templatesParse(c *Controller) ([]templates.Rule, error) { // Any remaining arguments are extensions rule.Extensions = c.RemainingArgs() if len(rule.Extensions) == 0 { - rule.Extensions = DefaultTemplateExtensions + rule.Extensions = defaultTemplateExtensions } } else { - rule.Path = DefaultTemplatePath - rule.Extensions = DefaultTemplateExtensions + rule.Path = defaultTemplatePath + rule.Extensions = defaultTemplateExtensions } for _, ext := range rule.Extensions { @@ -56,6 +56,6 @@ func templatesParse(c *Controller) ([]templates.Rule, error) { return rules, nil } -const DefaultTemplatePath = "/" +const defaultTemplatePath = "/" -var DefaultTemplateExtensions = []string{".html", ".htm", ".tmpl", ".tpl", ".txt"} +var defaultTemplateExtensions = []string{".html", ".htm", ".tmpl", ".tpl", ".txt"} diff --git a/config/setup/templates_test.go b/config/setup/templates_test.go index 35d40aa7a..4b9d37ea3 100644 --- a/config/setup/templates_test.go +++ b/config/setup/templates_test.go @@ -27,14 +27,14 @@ func TestTemplates(t *testing.T) { 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") } - if fmt.Sprint(myHandler.Rules[0].Extensions) != fmt.Sprint(DefaultTemplateExtensions) { - t.Errorf("Expected %v to be the Default Extensions", DefaultTemplateExtensions) + if fmt.Sprint(myHandler.Rules[0].Extensions) != fmt.Sprint(defaultTemplateExtensions) { + t.Errorf("Expected %v to be the Default Extensions", defaultTemplateExtensions) } var indexFiles []string - for _, extension := range DefaultTemplateExtensions { + for _, extension := range defaultTemplateExtensions { indexFiles = append(indexFiles, "index"+extension) } if fmt.Sprint(myHandler.Rules[0].IndexFiles) != fmt.Sprint(indexFiles) {