From 1b42dc572a0475596ffc64f8a9e0dbf8ec823094 Mon Sep 17 00:00:00 2001 From: bep Date: Fri, 12 Dec 2014 20:28:28 +0100 Subject: Fix RelPermalink() and Urls in menus vs canonifyUrls canonifyUrls=true, RelPermalink and baseUrl with sub-path did not work. This fixes that by adding a check for canonifyUrl=trues=true in RelPermalink(). So given - baseUrl "http://somehost.com/sub/" - the path "some-path/file.html" For canonifyUrls=false RelPermalink() returns "/sub/some-path/file.html" For canonifyUrls=true RelPermalink() returns "/some-path/file.html" In the last case, the Url will be made absolute and clickable in a later step. This commit also makes the menu urls defined in site config releative. To make them work with canonifying of urls, the context root is prepended if canonifying is turned off. Fixes #519 Fixes #711 --- helpers/url_test.go | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'helpers/url_test.go') diff --git a/helpers/url_test.go b/helpers/url_test.go index 1d5c770ea..3df1a05c2 100644 --- a/helpers/url_test.go +++ b/helpers/url_test.go @@ -68,6 +68,29 @@ func TestUrlPrep(t *testing.T) { } +func TestAddContextRoot(t *testing.T) { + tests := []struct { + baseUrl string + url string + expected string + }{ + {"http://example.com/sub/", "/foo", "/sub/foo"}, + {"http://example.com/sub/", "/foo/index.html", "/sub/foo/index.html"}, + {"http://example.com/sub1/sub2", "/foo", "/sub1/sub2/foo"}, + {"http://example.com", "/foo", "/foo"}, + // cannot guess that the context root is already added int the example below + {"http://example.com/sub/", "/sub/foo", "/sub/sub/foo"}, + {"http://example.com/тря", "/трям/", "/тря/трям/"}, + } + + for _, test := range tests { + output := AddContextRoot(test.baseUrl, test.url) + if output != test.expected { + t.Errorf("Expected %#v, got %#v\n", test.expected, output) + } + } +} + func TestPretty(t *testing.T) { assert.Equal(t, PrettifyUrlPath("/section/name.html"), "/section/name/index.html") assert.Equal(t, PrettifyUrlPath("/section/sub/name.html"), "/section/sub/name/index.html") -- cgit v1.2.3