From ab82a27d055c3aa177821d81a45a5c6e972aa29e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Fri, 5 Jan 2018 12:01:13 +0100 Subject: Fix URLs for bundle resources in multihost mode Fixes #4217 --- hugolib/hugo_sites_build_test.go | 2 +- hugolib/hugo_sites_multihost_test.go | 35 ++++++++++++++++++++++++++++------- 2 files changed, 29 insertions(+), 8 deletions(-) (limited to 'hugolib') diff --git a/hugolib/hugo_sites_build_test.go b/hugolib/hugo_sites_build_test.go index 09cd7aff3..429ea9a7c 100644 --- a/hugolib/hugo_sites_build_test.go +++ b/hugolib/hugo_sites_build_test.go @@ -394,7 +394,7 @@ func doTestMultiSitesBuild(t *testing.T, configTemplate, configSuffix string) { } // Check bundles - bundleFr := enSite.getPage(KindPage, "bundles/b1/index.md") + bundleFr := frSite.getPage(KindPage, "bundles/b1/index.md") require.NotNil(t, bundleFr) require.Equal(t, "/blog/fr/bundles/b1/", bundleFr.RelPermalink()) require.Equal(t, 1, len(bundleFr.Resources)) diff --git a/hugolib/hugo_sites_multihost_test.go b/hugolib/hugo_sites_multihost_test.go index 0729f7d9d..5f4455371 100644 --- a/hugolib/hugo_sites_multihost_test.go +++ b/hugolib/hugo_sites_multihost_test.go @@ -1,6 +1,7 @@ package hugolib import ( + "path/filepath" "testing" "github.com/spf13/afero" @@ -26,7 +27,7 @@ tag = "tags" [Languages] [Languages.en] staticDir2 = ["ens1", "ens2"] -baseURL = "https://example.com" +baseURL = "https://example.com/docs" weight = 10 title = "In English" languageName = "English" @@ -65,7 +66,7 @@ languageName = "Nynorsk" s1h := s1.getPage(KindHome) assert.True(s1h.IsTranslated()) assert.Len(s1h.Translations(), 2) - assert.Equal("https://example.com/", s1h.Permalink()) + assert.Equal("https://example.com/docs/", s1h.Permalink()) // For “regular multilingual” we kept the aliases pages with url in front matter // as a literal value that we use as is. @@ -76,12 +77,12 @@ languageName = "Nynorsk" pageWithURLInFrontMatter := s1.getPage(KindPage, "sect/doc3.en.md") assert.NotNil(pageWithURLInFrontMatter) assert.Equal("/superbob", pageWithURLInFrontMatter.URL()) - assert.Equal("/superbob/", pageWithURLInFrontMatter.RelPermalink()) + assert.Equal("/docs/superbob/", pageWithURLInFrontMatter.RelPermalink()) th.assertFileContent("public/en/superbob/index.html", "doc3|Hello|en") // check alias: - th.assertFileContent("public/en/al/alias1/index.html", `content="0; url=https://example.com/superbob/"`) - th.assertFileContent("public/en/al/alias2/index.html", `content="0; url=https://example.com/superbob/"`) + th.assertFileContent("public/en/al/alias1/index.html", `content="0; url=https://example.com/docs/superbob/"`) + th.assertFileContent("public/en/al/alias2/index.html", `content="0; url=https://example.com/docs/superbob/"`) s2 := sites.Sites[1] assert.Equal([]string{"s1", "s2", "frs1", "frs2"}, s2.StaticDirs()) @@ -93,9 +94,29 @@ languageName = "Nynorsk" th.assertFileContentStraight("public/en/index.html", "Default Home Page") // Check paginators - th.assertFileContent("public/en/page/1/index.html", `refresh" content="0; url=https://example.com/"`) + th.assertFileContent("public/en/page/1/index.html", `refresh" content="0; url=https://example.com/docs/"`) th.assertFileContent("public/nn/page/1/index.html", `refresh" content="0; url=https://example.no/"`) - th.assertFileContent("public/en/sect/page/2/index.html", "List Page 2", "Hello", "https://example.com/sect/", "\"/sect/page/3/") + th.assertFileContent("public/en/sect/page/2/index.html", "List Page 2", "Hello", "https://example.com/docs/sect/", "\"/docs/sect/page/3/") th.assertFileContent("public/fr/sect/page/2/index.html", "List Page 2", "Bonjour", "https://example.fr/sect/") + // Check bundles + + 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)) + logoEn := bundleEn.Resources.GetByPrefix("logo") + require.NotNil(t, logoEn) + require.Equal(t, "/docs/bundles/b1/logo.png", logoEn.RelPermalink()) + require.Contains(t, readFileFromFs(t, fs.Destination, filepath.FromSlash("public/en/bundles/b1/logo.png")), "PNG Data") + + 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)) + logoFr := bundleFr.Resources.GetByPrefix("logo") + require.NotNil(t, logoFr) + require.Equal(t, "/bundles/b1/logo.png", logoFr.RelPermalink()) + require.Contains(t, readFileFromFs(t, fs.Destination, filepath.FromSlash("public/fr/bundles/b1/logo.png")), "PNG Data") + } -- cgit v1.2.3