diff options
| author | Ask Bjørn Hansen <ask@develooper.com> | 2014-02-27 23:30:12 -0800 |
|---|---|---|
| committer | spf13 <steve.francia@gmail.com> | 2014-02-28 11:55:37 -0500 |
| commit | ea8d0981d5c0c820f543073299c56a3a3e2c44fc (patch) | |
| tree | c6f8ebd92f93b550968d9c8a3a6f6c0802b8ee59 /hugolib/page_permalink_test.go | |
| parent | 732b5d42b2c1adb5b9ef36b79c10c786b28aee39 (diff) | |
Make per-page url overrides take precedence over section permalink settings
This seems more reasonable to me.
I didn't understand why the pUrl comparision was on len > 2; I changed it to 0.
Closes #212.
Diffstat (limited to 'hugolib/page_permalink_test.go')
| -rw-r--r-- | hugolib/page_permalink_test.go | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/hugolib/page_permalink_test.go b/hugolib/page_permalink_test.go index 6f08152a6..a4fed5b19 100644 --- a/hugolib/page_permalink_test.go +++ b/hugolib/page_permalink_test.go @@ -11,26 +11,33 @@ func TestPermalink(t *testing.T) { dir string base template.URL slug string + url string uglyurls bool expectedAbs string expectedRel string }{ - {"x/y/z/boofar.md", "x/y/z", "", "", false, "/x/y/z/boofar", "/x/y/z/boofar"}, - {"x/y/z/boofar.md", "x/y/z/", "", "", false, "/x/y/z/boofar", "/x/y/z/boofar"}, - {"x/y/z/boofar.md", "x/y/z/", "", "boofar", false, "/x/y/z/boofar", "/x/y/z/boofar"}, - {"x/y/z/boofar.md", "x/y/z", "http://barnew/", "", false, "http://barnew/x/y/z/boofar", "/x/y/z/boofar"}, - {"x/y/z/boofar.md", "x/y/z/", "http://barnew/", "boofar", false, "http://barnew/x/y/z/boofar", "/x/y/z/boofar"}, - {"x/y/z/boofar.md", "x/y/z", "", "", true, "/x/y/z/boofar.html", "/x/y/z/boofar.html"}, - {"x/y/z/boofar.md", "x/y/z/", "", "", true, "/x/y/z/boofar.html", "/x/y/z/boofar.html"}, - {"x/y/z/boofar.md", "x/y/z/", "", "boofar", true, "/x/y/z/boofar.html", "/x/y/z/boofar.html"}, - {"x/y/z/boofar.md", "x/y/z", "http://barnew/", "", true, "http://barnew/x/y/z/boofar.html", "/x/y/z/boofar.html"}, - {"x/y/z/boofar.md", "x/y/z/", "http://barnew/", "boofar", true, "http://barnew/x/y/z/boofar.html", "/x/y/z/boofar.html"}, + {"x/y/z/boofar.md", "x/y/z", "", "", "", false, "/x/y/z/boofar", "/x/y/z/boofar"}, + {"x/y/z/boofar.md", "x/y/z/", "", "", "", false, "/x/y/z/boofar", "/x/y/z/boofar"}, + {"x/y/z/boofar.md", "x/y/z/", "", "boofar", "", false, "/x/y/z/boofar", "/x/y/z/boofar"}, + {"x/y/z/boofar.md", "x/y/z", "http://barnew/", "", "", false, "http://barnew/x/y/z/boofar", "/x/y/z/boofar"}, + {"x/y/z/boofar.md", "x/y/z/", "http://barnew/", "boofar", "", false, "http://barnew/x/y/z/boofar", "/x/y/z/boofar"}, + {"x/y/z/boofar.md", "x/y/z", "", "", "", true, "/x/y/z/boofar.html", "/x/y/z/boofar.html"}, + {"x/y/z/boofar.md", "x/y/z/", "", "", "", true, "/x/y/z/boofar.html", "/x/y/z/boofar.html"}, + {"x/y/z/boofar.md", "x/y/z/", "", "boofar", "", true, "/x/y/z/boofar.html", "/x/y/z/boofar.html"}, + {"x/y/z/boofar.md", "x/y/z", "http://barnew/", "", "", true, "http://barnew/x/y/z/boofar.html", "/x/y/z/boofar.html"}, + {"x/y/z/boofar.md", "x/y/z/", "http://barnew/", "boofar", "", true, "http://barnew/x/y/z/boofar.html", "/x/y/z/boofar.html"}, + + // test url overrides + {"x/y/z/boofar.md", "x/y/z", "", "", "/z/y/q/", false, "/z/y/q/", "/z/y/q/"}, } for _, test := range tests { p := &Page{ Node: Node{ - UrlPath: UrlPath{Section: "z"}, + UrlPath: UrlPath{ + Section: "z", + Url: test.url, + }, Site: SiteInfo{ BaseUrl: test.base, Config: &Config{ |