diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-03-22 11:34:17 +0100 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-03-27 15:43:56 +0200 |
| commit | dbb83f925a7cb256b69b158e2caf0d99e3c7c5e6 (patch) | |
| tree | 2ad59d18c8f0847cf2f8bd3938327a4c9d462483 /output | |
| parent | 4aaed87dd97b085b1505e53b7d4564aa8f7f18ef (diff) | |
hugolib: Read default output formats from site config
Diffstat (limited to 'output')
| -rw-r--r-- | output/layout_base.go | 4 | ||||
| -rw-r--r-- | output/layout_base_test.go | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/output/layout_base.go b/output/layout_base.go index 929ee07a2..6b26a4c5b 100644 --- a/output/layout_base.go +++ b/output/layout_base.go @@ -56,11 +56,11 @@ type TemplateLookupDescriptor struct { ContainsAny func(filename string, subslices [][]byte) (bool, error) } -func CreateTemplateID(d TemplateLookupDescriptor) (TemplateNames, error) { +func CreateTemplateNames(d TemplateLookupDescriptor) (TemplateNames, error) { var id TemplateNames - name := filepath.FromSlash(d.RelPath) + name := filepath.ToSlash(d.RelPath) if d.Prefix != "" { name = strings.Trim(d.Prefix, "/") + "/" + name diff --git a/output/layout_base_test.go b/output/layout_base_test.go index 60d9b8c62..f20d99bef 100644 --- a/output/layout_base_test.go +++ b/output/layout_base_test.go @@ -124,6 +124,8 @@ func TestLayoutBase(t *testing.T) { } { t.Run(this.name, func(t *testing.T) { + this.basePathMatchStrings = filepath.FromSlash(this.basePathMatchStrings) + fileExists := func(filename string) (bool, error) { stringsToMatch := strings.Split(this.basePathMatchStrings, "|") for _, s := range stringsToMatch { @@ -148,7 +150,7 @@ func TestLayoutBase(t *testing.T) { this.expect.MasterFilename = filepath.FromSlash(this.expect.MasterFilename) this.expect.OverlayFilename = filepath.FromSlash(this.expect.OverlayFilename) - id, err := CreateTemplateID(this.d) + id, err := CreateTemplateNames(this.d) require.NoError(t, err) require.Equal(t, this.expect, id, this.name) |