diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-07-17 11:18:29 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-07-18 00:07:20 +0200 |
commit | 3eb313fef495a39731dafa6bddbf77760090230d (patch) | |
tree | aa93e04123fa299e27b4d701b81d7976865d299c /hugolib/site_output_test.go | |
parent | b93417aa1d3d38a9e56bad25937e0e638a113faf (diff) |
Simplify .Site.GetPage etc.
This commit is a follow up to a recent overhaul of the GetPage/ref/relref implemenation.
The most important change in this commit is the update to `.Site.GetPage`:
* To reduce the amount of breakage in the wild to its minimum, I have reworked .Site.GetPage with some rules:
* We cannot support more than 2 arguments, i.e. .Site.GetPage "page" "posts" "mypage.md" will now throw an error. I think this is the most uncommon syntax and should be OK. It is an easy fix to change the above to .Site.GetPage "/posts/mypage.md" or similar.
* .Site.GetPage "home", .Site.GetPage "home" "" and .Site.GetPage "home" "/" will give you the home page. This means that if you have page in root with the name home.md you need to do .Site.GetPage "/home.md" or similar
This commit also fixes some multilingual issues, most notable it is now possible to do cross-language ref/relref lookups by prepending the language code to the path, e.g. `/jp/posts/mypage.md`.
This commit also reverts the site building tests related to this to "Hugo 0.44 state", to get better control of the changes made.
Closes #4147
Closes #4727
Closes #4728
Closes #4728
Closes #4726
Closes #4652
Diffstat (limited to 'hugolib/site_output_test.go')
-rw-r--r-- | hugolib/site_output_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hugolib/site_output_test.go b/hugolib/site_output_test.go index 8c9aa113a..0677dfbfb 100644 --- a/hugolib/site_output_test.go +++ b/hugolib/site_output_test.go @@ -150,7 +150,7 @@ Len Pages: {{ .Kind }} {{ len .Site.RegularPages }} Page Number: {{ .Paginator.P s := h.Sites[0] require.Equal(t, "en", s.Language.Lang) - home, _ := s.getPage(nil, "/") + home := s.getPage(KindHome) require.NotNil(t, home) @@ -325,7 +325,7 @@ baseName = "customdelimbase" th.assertFileContent("public/customdelimbase_del", "custom delim") s := h.Sites[0] - home, _ := s.getPage(nil, "/") + home := s.getPage(KindHome) require.NotNil(t, home) outputs := home.OutputFormats() |