diff options
| author | Tim Esselens <tim.esselens@gmail.com> | 2013-11-19 14:10:03 +0100 |
|---|---|---|
| committer | Noah Campbell <noahcampbell@gmail.com> | 2013-11-20 15:32:22 -0800 |
| commit | 860f982cc454a6a5e111eb5b79915cd21f49240e (patch) | |
| tree | cf342cd6f0ef4abe25a2fcf6dfa277b0ffb1619f /hugolib/page_permalink_test.go | |
| parent | e425226a2802993f4be3689565136965fb5bc58c (diff) | |
fixed trailing dir slash when using slug
See testcase, dir + slug contained double slash when dir had a trailing
slash.
Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
Diffstat (limited to 'hugolib/page_permalink_test.go')
| -rw-r--r-- | hugolib/page_permalink_test.go | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/hugolib/page_permalink_test.go b/hugolib/page_permalink_test.go index b4ef66ba7..fd1f2b2f8 100644 --- a/hugolib/page_permalink_test.go +++ b/hugolib/page_permalink_test.go @@ -7,12 +7,18 @@ import ( func TestPermalink(t *testing.T) { tests := []struct { + file string + dir string base template.URL + slug string expectedAbs string expectedRel string }{ - {"", "/x/y/z/boofar", "/x/y/z/boofar"}, - {"http://barnew/", "http://barnew/x/y/z/boofar", "/x/y/z/boofar"}, + {"x/y/z/boofar.md", "x/y/z", "", "", "/x/y/z/boofar", "/x/y/z/boofar"}, + {"x/y/z/boofar.md", "x/y/z/", "", "", "/x/y/z/boofar", "/x/y/z/boofar"}, + {"x/y/z/boofar.md", "x/y/z/", "", "boofar", "/x/y/z/boofar/", "/x/y/z/boofar/"}, + {"x/y/z/boofar.md", "x/y/z", "http://barnew/", "", "http://barnew/x/y/z/boofar", "/x/y/z/boofar"}, + {"x/y/z/boofar.md", "x/y/z/", "http://barnew/", "boofar", "http://barnew/x/y/z/boofar/", "/x/y/z/boofar/"}, } for _, test := range tests { @@ -21,7 +27,13 @@ func TestPermalink(t *testing.T) { UrlPath: UrlPath{Section: "z"}, Site: SiteInfo{BaseUrl: test.base}, }, - File: File{FileName: "x/y/z/boofar.md", Dir: "x/y/z"}, + File: File{FileName: test.file, Dir: test.dir}, + } + + if test.slug != "" { + p.update(map[string]interface{}{ + "slug": test.slug, + }) } u, err := p.Permalink() |