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/language_content_dir_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/language_content_dir_test.go')
| -rw-r--r-- | hugolib/language_content_dir_test.go | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/hugolib/language_content_dir_test.go b/hugolib/language_content_dir_test.go index 73119d3db..3c3642bf3 100644 --- a/hugolib/language_content_dir_test.go +++ b/hugolib/language_content_dir_test.go @@ -207,6 +207,29 @@ Content. assert.Equal(10, len(svSite.RegularPages)) + svP2, err := svSite.getPageNew(nil, "/sect/page2.md") + assert.NoError(err) + nnP2, err := nnSite.getPageNew(nil, "/sect/page2.md") + assert.NoError(err) + nnP2_2, err := svSite.getPageNew(nil, "/nn/sect/page2.md") + assert.NoError(err) + enP2_2, err := nnSite.getPageNew(nil, "/en/sect/page2.md") + assert.NoError(err) + svP2_2, err := enSite.getPageNew(nil, "/sv/sect/page2.md") + assert.NoError(err) + + enP2, err := enSite.getPageNew(nil, "/sect/page2.md") + assert.NoError(err) + assert.NotNil(enP2) + assert.NotNil(svP2) + assert.NotNil(nnP2) + assert.Equal("sv", svP2.Lang()) + assert.Equal("nn", nnP2.Lang()) + assert.Equal("en", enP2.Lang()) + assert.Equal(nnP2, nnP2_2) + assert.Equal(enP2, enP2_2) + assert.Equal(svP2, svP2_2) + for i, p := range enSite.RegularPages { j := i + 1 msg := fmt.Sprintf("Test %d", j) @@ -244,7 +267,7 @@ Content. b.AssertFileContent("/my/project/public/sv/sect/mybundle/logo.png", "PNG Data") b.AssertFileContent("/my/project/public/nn/sect/mybundle/logo.png", "PNG Data") - nnSect, _ := nnSite.getPage(nil, "sect") + nnSect := nnSite.getPage(KindSection, "sect") assert.NotNil(nnSect) assert.Equal(12, len(nnSect.Pages)) nnHome, _ := nnSite.Info.Home() |