From 3eb313fef495a39731dafa6bddbf77760090230d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Tue, 17 Jul 2018 11:18:29 +0200 Subject: 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 --- hugolib/site_test.go | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'hugolib/site_test.go') diff --git a/hugolib/site_test.go b/hugolib/site_test.go index d9460e91a..202c01986 100644 --- a/hugolib/site_test.go +++ b/hugolib/site_test.go @@ -628,8 +628,7 @@ func TestOrderedPages(t *testing.T) { s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{SkipRender: true}) - sect, _ := s.getPage(nil, "sect") - if sect.Pages[1].title != "Three" || sect.Pages[2].title != "Four" { + if s.getPage(KindSection, "sect").Pages[1].title != "Three" || s.getPage(KindSection, "sect").Pages[2].title != "Four" { t.Error("Pages in unexpected order.") } @@ -875,10 +874,8 @@ func TestWeightedTaxonomies(t *testing.T) { func setupLinkingMockSite(t *testing.T) *Site { sources := [][2]string{ {filepath.FromSlash("level2/unique.md"), ""}, - {filepath.FromSlash("_index.md"), ""}, {filepath.FromSlash("rootfile.md"), ""}, {filepath.FromSlash("root-image.png"), ""}, - {filepath.FromSlash("common.md"), ""}, {filepath.FromSlash("level2/2-root.md"), ""}, {filepath.FromSlash("level2/common.md"), ""}, @@ -886,7 +883,7 @@ func setupLinkingMockSite(t *testing.T) *Site { {filepath.FromSlash("level2/2-image.png"), ""}, {filepath.FromSlash("level2/common.png"), ""}, - {filepath.FromSlash("level2/level3/current.md"), ""}, + {filepath.FromSlash("level2/level3/start.md"), ""}, {filepath.FromSlash("level2/level3/3-root.md"), ""}, {filepath.FromSlash("level2/level3/common.md"), ""}, {filepath.FromSlash("level2/level3/3-image.png"), ""}, @@ -913,7 +910,7 @@ func TestRefLinking(t *testing.T) { t.Parallel() site := setupLinkingMockSite(t) - currentPage, _ := site.getPage(nil, "level2/level3/current.md") + currentPage := site.getPage(KindPage, "level2/level3/start.md") if currentPage == nil { t.Fatalf("failed to find current page in site") } @@ -924,16 +921,12 @@ func TestRefLinking(t *testing.T) { relative bool expected string }{ - {"/level2/unique.md", "", true, "/level2/unique/"}, - {"../unique.md", "", true, "/level2/unique/"}, - {"/level2/common.md", "", true, "/level2/common/"}, - {"../common.md", "", true, "/level2/common/"}, - {"common.md", "", true, "/level2/level3/common/"}, - {"/common.md", "", true, "/common/"}, + {"unique.md", "", true, "/level2/unique/"}, + {"level2/common.md", "", true, "/level2/common/"}, {"3-root.md", "", true, "/level2/level3/3-root/"}, } { if out, err := site.Info.refLink(test.link, currentPage, test.relative, test.outputFormat); err != nil || out != test.expected { - t.Errorf("[%d] Expected %q from %q to resolve to %q, got %q - error: %s", i, test.link, currentPage.absoluteSourceRef(), test.expected, out, err) + t.Errorf("[%d] Expected %s to resolve to (%s), got (%s) - error: %s", i, test.link, test.expected, out, err) } } -- cgit v1.2.3