diff options
| author | Bjørn Erik Pedersen <[email protected]> | 2018-07-17 11:18:29 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <[email protected]> | 2018-07-18 00:07:20 +0200 |
| commit | 3eb313fef495a39731dafa6bddbf77760090230d (patch) | |
| tree | aa93e04123fa299e27b4d701b81d7976865d299c /hugolib/site_url_test.go | |
| parent | b93417aa1d3d38a9e56bad25937e0e638a113faf (diff) | |
| download | hugo-3eb313fef495a39731dafa6bddbf77760090230d.tar.gz hugo-3eb313fef495a39731dafa6bddbf77760090230d.zip | |
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_url_test.go')
| -rw-r--r-- | hugolib/site_url_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hugolib/site_url_test.go b/hugolib/site_url_test.go index fff75bda5..5b9d19e0d 100644 --- a/hugolib/site_url_test.go +++ b/hugolib/site_url_test.go @@ -117,12 +117,12 @@ Do not go gentle into that good night. assert.Len(s.RegularPages, 2) - notUgly, _ := s.getPage(nil, "sect1/p1.md") + notUgly := s.getPage(KindPage, "sect1/p1.md") assert.NotNil(notUgly) assert.Equal("sect1", notUgly.Section()) assert.Equal("/sect1/p1/", notUgly.RelPermalink()) - ugly, _ := s.getPage(nil, "sect2/p2.md") + ugly := s.getPage(KindPage, "sect2/p2.md") assert.NotNil(ugly) assert.Equal("sect2", ugly.Section()) assert.Equal("/sect2/p2.html", ugly.RelPermalink()) @@ -175,7 +175,7 @@ Do not go gentle into that good night. assert.Len(s.RegularPages, 10) - sect1, _ := s.getPage(nil, "sect1") + sect1 := s.getPage(KindSection, "sect1") assert.NotNil(sect1) assert.Equal("/ss1/", sect1.RelPermalink()) th.assertFileContent(filepath.Join("public", "ss1", "index.html"), "P1|URL: /ss1/|Next: /ss1/page/2/") |