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/hugo_sites_multihost_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/hugo_sites_multihost_test.go')
| -rw-r--r-- | hugolib/hugo_sites_multihost_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hugolib/hugo_sites_multihost_test.go b/hugolib/hugo_sites_multihost_test.go index 736c6d4f0..4062868e6 100644 --- a/hugolib/hugo_sites_multihost_test.go +++ b/hugolib/hugo_sites_multihost_test.go @@ -55,7 +55,7 @@ languageName = "Nynorsk" s1 := b.H.Sites[0] - s1h, _ := s1.getPage(nil, "/") + s1h := s1.getPage(KindHome) assert.True(s1h.IsTranslated()) assert.Len(s1h.Translations(), 2) assert.Equal("https://example.com/docs/", s1h.Permalink()) @@ -66,7 +66,7 @@ languageName = "Nynorsk" // For multihost, we never want any content in the root. // // check url in front matter: - pageWithURLInFrontMatter, _ := s1.getPage(nil, "sect/doc3.en.md") + pageWithURLInFrontMatter := s1.getPage(KindPage, "sect/doc3.en.md") assert.NotNil(pageWithURLInFrontMatter) assert.Equal("/superbob", pageWithURLInFrontMatter.URL()) assert.Equal("/docs/superbob/", pageWithURLInFrontMatter.RelPermalink()) @@ -78,7 +78,7 @@ languageName = "Nynorsk" s2 := b.H.Sites[1] - s2h, _ := s2.getPage(nil, "/") + s2h := s2.getPage(KindHome) assert.Equal("https://example.fr/", s2h.Permalink()) b.AssertFileContent("public/fr/index.html", "French Home Page") @@ -92,7 +92,7 @@ languageName = "Nynorsk" // Check bundles - bundleEn, _ := s1.getPage(nil, "bundles/b1/index.en.md") + bundleEn := s1.getPage(KindPage, "bundles/b1/index.en.md") require.NotNil(t, bundleEn) require.Equal(t, "/docs/bundles/b1/", bundleEn.RelPermalink()) require.Equal(t, 1, len(bundleEn.Resources)) @@ -101,7 +101,7 @@ languageName = "Nynorsk" require.Equal(t, "/docs/bundles/b1/logo.png", logoEn.RelPermalink()) b.AssertFileContent("public/en/bundles/b1/logo.png", "PNG Data") - bundleFr, _ := s2.getPage(nil, "bundles/b1/index.md") + bundleFr := s2.getPage(KindPage, "bundles/b1/index.md") require.NotNil(t, bundleFr) require.Equal(t, "/bundles/b1/", bundleFr.RelPermalink()) require.Equal(t, 1, len(bundleFr.Resources)) |