diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-02-17 21:14:52 +0100 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-02-18 07:53:25 +0100 |
commit | 07ab7ae3d2e64dafb8f6dab937986d8e366d1fe5 (patch) | |
tree | e208621d1a05c6d1d288445ccaa051bf33fbc92b /hugolib | |
parent | ed847ed93d86d0e1c0993adfee787e7fa02e604b (diff) |
hugolib: More test helper cleanup
Diffstat (limited to 'hugolib')
-rw-r--r-- | hugolib/alias_test.go | 8 | ||||
-rw-r--r-- | hugolib/case_insensitive_test.go | 8 | ||||
-rw-r--r-- | hugolib/embedded_shortcodes_test.go | 16 | ||||
-rw-r--r-- | hugolib/hugo_sites_build_test.go | 116 | ||||
-rw-r--r-- | hugolib/node_as_page_test.go | 118 | ||||
-rw-r--r-- | hugolib/pagination_test.go | 2 | ||||
-rw-r--r-- | hugolib/robotstxt_test.go | 2 | ||||
-rw-r--r-- | hugolib/rss_test.go | 6 | ||||
-rw-r--r-- | hugolib/shortcode_test.go | 2 | ||||
-rw-r--r-- | hugolib/site_test.go | 6 | ||||
-rw-r--r-- | hugolib/sitemap_test.go | 2 | ||||
-rw-r--r-- | hugolib/template_engines_test.go | 2 | ||||
-rw-r--r-- | hugolib/template_test.go | 16 | ||||
-rw-r--r-- | hugolib/testhelpers_test.go | 31 |
14 files changed, 172 insertions, 163 deletions
diff --git a/hugolib/alias_test.go b/hugolib/alias_test.go index 6aa0ca3dd..cd8ef3496 100644 --- a/hugolib/alias_test.go +++ b/hugolib/alias_test.go @@ -45,9 +45,9 @@ func TestAlias(t *testing.T) { buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{}) // the real page - th.assertFileContent(filepath.Join("public", "page", "index.html"), false, "For some moments the old man") + th.assertFileContent(filepath.Join("public", "page", "index.html"), "For some moments the old man") // the alias redirector - th.assertFileContent(filepath.Join("public", "foo", "bar", "index.html"), false, "<meta http-equiv=\"refresh\" content=\"0; ") + th.assertFileContent(filepath.Join("public", "foo", "bar", "index.html"), "<meta http-equiv=\"refresh\" content=\"0; ") } func TestAliasTemplate(t *testing.T) { @@ -69,7 +69,7 @@ func TestAliasTemplate(t *testing.T) { require.NoError(t, sites.Build(BuildCfg{})) // the real page - th.assertFileContent(filepath.Join("public", "page", "index.html"), false, "For some moments the old man") + th.assertFileContent(filepath.Join("public", "page", "index.html"), "For some moments the old man") // the alias redirector - th.assertFileContent(filepath.Join("public", "foo", "bar", "index.html"), false, "ALIASTEMPLATE") + th.assertFileContent(filepath.Join("public", "foo", "bar", "index.html"), "ALIASTEMPLATE") } diff --git a/hugolib/case_insensitive_test.go b/hugolib/case_insensitive_test.go index b0a25bac3..96953b18b 100644 --- a/hugolib/case_insensitive_test.go +++ b/hugolib/case_insensitive_test.go @@ -191,7 +191,7 @@ Site Colors: {{ .Site.Params.COLOR }}|{{ .Site.Params.COLORS.YELLOW }} t.Fatalf("Failed to build sites: %s", err) } - th.assertFileContent(filepath.Join("public", "nn", "sect1", "page1", "index.html"), true, + th.assertFileContent(filepath.Join("public", "nn", "sect1", "page1", "index.html"), "Page Colors: red|heavenly", "Site Colors: green|yellow", "Site Lang Mood: Happy", @@ -204,7 +204,7 @@ Site Colors: {{ .Site.Params.COLOR }}|{{ .Site.Params.COLORS.YELLOW }} "«Hi»", // angled quotes ) - th.assertFileContent(filepath.Join("public", "en", "sect1", "page1", "index.html"), true, + th.assertFileContent(filepath.Join("public", "en", "sect1", "page1", "index.html"), "Site Colors: Pink|golden", "Page Colors: black|bluesy", "Site Lang Mood: Thoughtful", @@ -213,7 +213,7 @@ Site Colors: {{ .Site.Params.COLOR }}|{{ .Site.Params.COLORS.YELLOW }} "“Hi”", ) - th.assertFileContent(filepath.Join("public", "nn", "sect2", "page2", "index.html"), true, + th.assertFileContent(filepath.Join("public", "nn", "sect2", "page2", "index.html"), "Page Colors: black|sky", "Site Colors: green|yellow", "Shortcode Page: black|sky", @@ -296,7 +296,7 @@ p t.Fatalf("Failed to build sites: %s", err) } - th.assertFileContent(filepath.Join("public", "nn", "sect1", "page1", "index.html"), true, + th.assertFileContent(filepath.Join("public", "nn", "sect1", "page1", "index.html"), "Page Colors: red|heavenly", "Site Colors: green|yellow", "Shortcode Page: red|heavenly", diff --git a/hugolib/embedded_shortcodes_test.go b/hugolib/embedded_shortcodes_test.go index e9140f999..5f0f621f9 100644 --- a/hugolib/embedded_shortcodes_test.go +++ b/hugolib/embedded_shortcodes_test.go @@ -115,7 +115,7 @@ title: Shorty buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{}) - th.assertFileContentRegexp(filepath.Join("public", "simple", "index.html"), false, this.expected) + th.assertFileContentRegexp(filepath.Join("public", "simple", "index.html"), this.expected) } } @@ -160,7 +160,7 @@ title: Shorty buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{}) - th.assertFileContentRegexp(filepath.Join("public", "simple", "index.html"), false, this.expected) + th.assertFileContentRegexp(filepath.Join("public", "simple", "index.html"), this.expected) } } @@ -190,7 +190,7 @@ title: Shorty buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{}) - th.assertFileContentRegexp(filepath.Join("public", "simple", "index.html"), false, this.expected) + th.assertFileContentRegexp(filepath.Join("public", "simple", "index.html"), this.expected) } } @@ -228,7 +228,7 @@ title: Shorty buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{}) - th.assertFileContentRegexp(filepath.Join("public", "simple", "index.html"), false, this.expected) + th.assertFileContentRegexp(filepath.Join("public", "simple", "index.html"), this.expected) } } @@ -267,7 +267,7 @@ title: Shorty buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{}) - th.assertFileContentRegexp(filepath.Join("public", "simple", "index.html"), false, this.expected) + th.assertFileContentRegexp(filepath.Join("public", "simple", "index.html"), this.expected) } } @@ -300,7 +300,7 @@ title: Shorty buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{}) - th.assertFileContentRegexp(filepath.Join("public", "simple", "index.html"), false, this.expected) + th.assertFileContentRegexp(filepath.Join("public", "simple", "index.html"), this.expected) } } @@ -348,7 +348,7 @@ title: Shorty buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg, WithTemplate: withTemplate}, BuildCfg{}) - th.assertFileContentRegexp(filepath.Join("public", "simple", "index.html"), false, this.expected) + th.assertFileContentRegexp(filepath.Join("public", "simple", "index.html"), this.expected) } } @@ -403,7 +403,7 @@ title: Shorty buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg, WithTemplate: withTemplate}, BuildCfg{}) - th.assertFileContentRegexp(filepath.Join("public", "simple", "index.html"), false, this.expected) + th.assertFileContentRegexp(filepath.Join("public", "simple", "index.html"), this.expected) } } diff --git a/hugolib/hugo_sites_build_test.go b/hugolib/hugo_sites_build_test.go index 6fe6dc6a8..33273c233 100644 --- a/hugolib/hugo_sites_build_test.go +++ b/hugolib/hugo_sites_build_test.go @@ -74,77 +74,67 @@ func doTestMultiSitesMainLangInRoot(t *testing.T, defaultInSubDir bool) { frPerm := doc1fr.Permalink() frRelPerm := doc1fr.RelPermalink() // Main language in root - require.Equal(t, th.replaceDefaultContentLanguageValue("http://example.com/blog/fr/sect/doc1/", defaultInSubDir), frPerm) - require.Equal(t, th.replaceDefaultContentLanguageValue("/blog/fr/sect/doc1/", defaultInSubDir), frRelPerm) + require.Equal(t, th.replaceDefaultContentLanguageValue("http://example.com/blog/fr/sect/doc1/"), frPerm) + require.Equal(t, th.replaceDefaultContentLanguageValue("/blog/fr/sect/doc1/"), frRelPerm) - th.assertFileContent("public/fr/sect/doc1/index.html", defaultInSubDir, "Single", "Bonjour") - th.assertFileContent("public/en/sect/doc1-slug/index.html", defaultInSubDir, "Single", "Hello") + th.assertFileContent("public/fr/sect/doc1/index.html", "Single", "Bonjour") + th.assertFileContent("public/en/sect/doc1-slug/index.html", "Single", "Hello") // Check home if defaultInSubDir { // should have a redirect on top level. - th.assertFileContent("public/index.html", true, `<meta http-equiv="refresh" content="0; url=http://example.com/blog/fr" />`) + th.assertFileContentStraight("public/index.html", `<meta http-equiv="refresh" content="0; url=http://example.com/blog/fr" />`) } else { // should have redirect back to root - th.assertFileContent("public/fr/index.html", true, `<meta http-equiv="refresh" content="0; url=http://example.com/blog" />`) + th.assertFileContentStraight("public/fr/index.html", `<meta http-equiv="refresh" content="0; url=http://example.com/blog" />`) } - th.assertFileContent("public/fr/index.html", defaultInSubDir, "Home", "Bonjour") - th.assertFileContent("public/en/index.html", defaultInSubDir, "Home", "Hello") + th.assertFileContent("public/fr/index.html", "Home", "Bonjour") + th.assertFileContent("public/en/index.html", "Home", "Hello") // Check list pages - th.assertFileContent("public/fr/sect/index.html", defaultInSubDir, "List", "Bonjour") - th.assertFileContent("public/en/sect/index.html", defaultInSubDir, "List", "Hello") - th.assertFileContent("public/fr/plaques/frtag1/index.html", defaultInSubDir, "List", "Bonjour") - th.assertFileContent("public/en/tags/tag1/index.html", defaultInSubDir, "List", "Hello") + th.assertFileContent("public/fr/sect/index.html", "List", "Bonjour") + th.assertFileContent("public/en/sect/index.html", "List", "Hello") + th.assertFileContent("public/fr/plaques/frtag1/index.html", "List", "Bonjour") + th.assertFileContent("public/en/tags/tag1/index.html", "List", "Hello") // Check sitemaps // Sitemaps behaves different: In a multilanguage setup there will always be a index file and // one sitemap in each lang folder. - th.assertFileContent("public/sitemap.xml", true, + th.assertFileContentStraight("public/sitemap.xml", "<loc>http://example.com/blog/en/sitemap.xml</loc>", "<loc>http://example.com/blog/fr/sitemap.xml</loc>") if defaultInSubDir { - th.assertFileContent("public/fr/sitemap.xml", true, "<loc>http://example.com/blog/fr/</loc>") + th.assertFileContentStraight("public/fr/sitemap.xml", "<loc>http://example.com/blog/fr/</loc>") } else { - th.assertFileContent("public/fr/sitemap.xml", true, "<loc>http://example.com/blog/</loc>") + th.assertFileContentStraight("public/fr/sitemap.xml", "<loc>http://example.com/blog/</loc>") } - th.assertFileContent("public/en/sitemap.xml", true, "<loc>http://example.com/blog/en/</loc>") + th.assertFileContent("public/en/sitemap.xml", "<loc>http://example.com/blog/en/</loc>") // Check rss - th.assertFileContent("public/fr/index.xml", defaultInSubDir, `<atom:link href="http://example.com/blog/fr/index.xml"`) - th.assertFileContent("public/en/index.xml", defaultInSubDir, `<atom:link href="http://example.com/blog/en/index.xml"`) - th.assertFileContent("public/fr/sect/index.xml", defaultInSubDir, `<atom:link href="http://example.com/blog/fr/sect/index.xml"`) - th.assertFileContent("public/en/sect/index.xml", defaultInSubDir, `<atom:link href="http://example.com/blog/en/sect/index.xml"`) - th.assertFileContent("public/fr/plaques/frtag1/index.xml", defaultInSubDir, `<atom:link href="http://example.com/blog/fr/plaques/frtag1/index.xml"`) - th.assertFileContent("public/en/tags/tag1/index.xml", defaultInSubDir, `<atom:link href="http://example.com/blog/en/tags/tag1/index.xml"`) + th.assertFileContent("public/fr/index.xml", `<atom:link href="http://example.com/blog/fr/index.xml"`) + th.assertFileContent("public/en/index.xml", `<atom:link href="http://example.com/blog/en/index.xml"`) + th.assertFileContent("public/fr/sect/index.xml", `<atom:link href="http://example.com/blog/fr/sect/index.xml"`) + th.assertFileContent("public/en/sect/index.xml", `<atom:link href="http://example.com/blog/en/sect/index.xml"`) + th.assertFileContent("public/fr/plaques/frtag1/index.xml", `<atom:link href="http://example.com/blog/fr/plaques/frtag1/index.xml"`) + th.assertFileContent("public/en/tags/tag1/index.xml", `<atom:link href="http://example.com/blog/en/tags/tag1/index.xml"`) // Check paginators - th.assertFileContent("public/fr/page/1/index.html", defaultInSubDir, `refresh" content="0; url=http://example.com/blog/fr/"`) - th.assertFileContent("public/en/page/1/index.html", defaultInSubDir, `refresh" content="0; url=http://example.com/blog/en/"`) - th.assertFileContent("public/fr/page/2/index.html", defaultInSubDir, "Home Page 2", "Bonjour", "http://example.com/blog/fr/") - th.assertFileContent("public/en/page/2/index.html", defaultInSubDir, "Home Page 2", "Hello", "http://example.com/blog/en/") - th.assertFileContent("public/fr/sect/page/1/index.html", defaultInSubDir, `refresh" content="0; url=http://example.com/blog/fr/sect/"`) - th.assertFileContent("public/en/sect/page/1/index.html", defaultInSubDir, `refresh" content="0; url=http://example.com/blog/en/sect/"`) - th.assertFileContent("public/fr/sect/page/2/index.html", defaultInSubDir, "List Page 2", "Bonjour", "http://example.com/blog/fr/sect/") - th.assertFileContent("public/en/sect/page/2/index.html", defaultInSubDir, "List Page 2", "Hello", "http://example.com/blog/en/sect/") - th.assertFileContent("public/fr/plaques/frtag1/page/1/index.html", defaultInSubDir, `refresh" content="0; url=http://example.com/blog/fr/plaques/frtag1/"`) - th.assertFileContent("public/en/tags/tag1/page/1/index.html", defaultInSubDir, `refresh" content="0; url=http://example.com/blog/en/tags/tag1/"`) - th.assertFileContent("public/fr/plaques/frtag1/page/2/index.html", defaultInSubDir, "List Page 2", "Bonjour", "http://example.com/blog/fr/plaques/frtag1/") - th.assertFileContent("public/en/tags/tag1/page/2/index.html", defaultInSubDir, "List Page 2", "Hello", "http://example.com/blog/en/tags/tag1/") + th.assertFileContent("public/fr/page/1/index.html", `refresh" content="0; url=http://example.com/blog/fr/"`) + th.assertFileContent("public/en/page/1/index.html", `refresh" content="0; url=http://example.com/blog/en/"`) + th.assertFileContent("public/fr/page/2/index.html", "Home Page 2", "Bonjour", "http://example.com/blog/fr/") + th.assertFileContent("public/en/page/2/index.html", "Home Page 2", "Hello", "http://example.com/blog/en/") + th.assertFileContent("public/fr/sect/page/1/index.html", `refresh" content="0; url=http://example.com/blog/fr/sect/"`) + th.assertFileContent("public/en/sect/page/1/index.html", `refresh" content="0; url=http://example.com/blog/en/sect/"`) + th.assertFileContent("public/fr/sect/page/2/index.html", "List Page 2", "Bonjour", "http://example.com/blog/fr/sect/") + th.assertFileContent("public/en/sect/page/2/index.html", "List Page 2", "Hello", "http://example.com/blog/en/sect/") + th.assertFileContent("public/fr/plaques/frtag1/page/1/index.html", `refresh" content="0; url=http://example.com/blog/fr/plaques/frtag1/"`) + th.assertFileContent("public/en/tags/tag1/page/1/index.html", `refresh" content="0; url=http://example.com/blog/en/tags/tag1/"`) + th.assertFileContent("public/fr/plaques/frtag1/page/2/index.html", "List Page 2", "Bonjour", "http://example.com/blog/fr/plaques/frtag1/") + th.assertFileContent("public/en/tags/tag1/page/2/index.html", "List Page 2", "Hello", "http://example.com/blog/en/tags/tag1/") // nn (Nynorsk) and nb (Bokmål) have custom pagePath: side ("page" in Norwegian) - th.assertFileContent("public/nn/side/1/index.html", defaultInSubDir, `refresh" content="0; url=http://example.com/blog/nn/"`) - th.assertFileContent("public/nb/side/1/index.html", defaultInSubDir, `refresh" content="0; url=http://example.com/blog/nb/"`) -} - -func (th testHelper) replaceDefaultContentLanguageValue(value string, defaultInSubDir bool) string { - replace := th.Cfg.GetString("defaultContentLanguage") + "/" - if !defaultInSubDir { - value = strings.Replace(value, replace, "", 1) - - } - return value - + th.assertFileContent("public/nn/side/1/index.html", `refresh" content="0; url=http://example.com/blog/nn/"`) + th.assertFileContent("public/nb/side/1/index.html", `refresh" content="0; url=http://example.com/blog/nb/"`) } func TestMultiSitesWithTwoLanguages(t *testing.T) { @@ -262,7 +252,7 @@ func doTestMultiSitesBuild(t *testing.T, configTemplate, configSuffix string) { require.Equal(t, "http://example.com/blog/superbob", permalink, "invalid doc3 permalink") require.Equal(t, "/superbob", doc3.URL(), "invalid url, was specified on doc3") - th.assertFileContent("public/superbob/index.html", true, "doc3|Hello|en") + th.assertFileContent("public/superbob/index.html", "doc3|Hello|en") require.Equal(t, doc2.Next, doc3, "doc3 should follow doc2, in .Next") doc1fr := doc1en.Translations()[0] @@ -306,12 +296,12 @@ func doTestMultiSitesBuild(t *testing.T, configTemplate, configSuffix string) { require.True(t, strings.Contains(languageRedirect, "0; url=http://example.com/blog/fr"), languageRedirect) // check home page content (including data files rendering) - th.assertFileContent("public/en/index.html", true, "Home Page 1", "Hello", "Hugo Rocks!") - th.assertFileContent("public/fr/index.html", true, "Home Page 1", "Bonjour", "Hugo Rocks!") + th.assertFileContent("public/en/index.html", "Home Page 1", "Hello", "Hugo Rocks!") + th.assertFileContent("public/fr/index.html", "Home Page 1", "Bonjour", "Hugo Rocks!") // check single page content - th.assertFileContent("public/fr/sect/doc1/index.html", true, "Single", "Shortcode: Bonjour") - th.assertFileContent("public/en/sect/doc1-slug/index.html", true, "Single", "Shortcode: Hello") + th.assertFileContent("public/fr/sect/doc1/index.html", "Single", "Shortcode: Bonjour") + th.assertFileContent("public/en/sect/doc1-slug/index.html", "Single", "Shortcode: Hello") // Check node translations homeEn := enSite.getPage(KindHome) @@ -410,12 +400,12 @@ func TestMultiSitesRebuild(t *testing.T) { require.Len(t, frSite.RegularPages, 3) // Verify translations - th.assertFileContent("public/en/sect/doc1-slug/index.html", true, "Hello") - th.assertFileContent("public/fr/sect/doc1/index.html", true, "Bonjour") + th.assertFileContent("public/en/sect/doc1-slug/index.html", "Hello") + th.assertFileContent("public/fr/sect/doc1/index.html", "Bonjour") // check single page content - th.assertFileContent("public/fr/sect/doc1/index.html", true, "Single", "Shortcode: Bonjour") - th.assertFileContent("public/en/sect/doc1-slug/index.html", true, "Single", "Shortcode: Hello") + th.assertFileContent("public/fr/sect/doc1/index.html", "Single", "Shortcode: Bonjour") + th.assertFileContent("public/en/sect/doc1-slug/index.html", "Single", "Shortcode: Hello") for i, this := range []struct { preFunc func(t *testing.T) @@ -553,8 +543,8 @@ func TestMultiSitesRebuild(t *testing.T) { require.Len(t, enSite.RegularPages, 5) require.Len(t, enSite.AllPages, 30) require.Len(t, frSite.RegularPages, 4) - th.assertFileContent("public/fr/sect/doc1/index.html", true, "Single", "Modified Shortcode: Salut") - th.assertFileContent("public/en/sect/doc1-slug/index.html", true, "Single", "Modified Shortcode: Hello") + th.assertFileContent("public/fr/sect/doc1/index.html", "Single", "Modified Shortcode: Salut") + th.assertFileContent("public/en/sect/doc1-slug/index.html", "Single", "Modified Shortcode: Hello") }, }, } { @@ -684,8 +674,8 @@ func TestChangeDefaultLanguage(t *testing.T) { t.Fatalf("Failed to build sites: %s", err) } - th.assertFileContent("public/sect/doc1/index.html", false, "Single", "Bonjour") - th.assertFileContent("public/en/sect/doc2/index.html", false, "Single", "Hello") + th.assertFileContent("public/sect/doc1/index.html", "Single", "Bonjour") + th.assertFileContent("public/en/sect/doc2/index.html", "Single", "Hello") newConfig := createConfig(t, testSiteConfig{Fs: mf, DefaultContentLanguage: "en", DefaultContentLanguageInSubdir: false}, multiSiteTOMLConfigTemplate) @@ -702,8 +692,8 @@ func TestChangeDefaultLanguage(t *testing.T) { } // Default language is now en, so that should now be the "root" language - th.assertFileContent("public/fr/sect/doc1/index.html", false, "Single", "Bonjour") - th.assertFileContent("public/sect/doc2/index.html", false, "Single", "Hello") + th.assertFileContent("public/fr/sect/doc1/index.html", "Single", "Bonjour") + th.assertFileContent("public/sect/doc2/index.html", "Single", "Hello") } func TestTableOfContentsInShortcodes(t *testing.T) { @@ -727,8 +717,8 @@ func TestTableOfContentsInShortcodes(t *testing.T) { fs := sites.Fs th := testHelper{sites.Cfg, fs, t} - th.assertFileContent("public/en/post/simple/index.html", true, tocPageSimpleExpected) - th.assertFileContent("public/en/post/withSCInHeading/index.html", true, tocPageWithShortcodesInHeadingsExpected) + th.assertFileContent("public/en/post/simple/index.html", tocPageSimpleExpected) + th.assertFileContent("public/en/post/withSCInHeading/index.html", tocPageWithShortcodesInHeadingsExpected) } var tocShortcode = ` diff --git a/hugolib/node_as_page_test.go b/hugolib/node_as_page_test.go index a7abd9728..3697f5d46 100644 --- a/hugolib/node_as_page_test.go +++ b/hugolib/node_as_page_test.go @@ -81,7 +81,7 @@ func doTestNodeAsPage(t *testing.T, ugly, preserveTaxonomyNames bool) { // date order: home, sect1, sect2, cat/hugo, cat/web, categories - th.assertFileContent(filepath.Join("public", "index.html"), false, + th.assertFileContent(filepath.Join("public", "index.html"), "Index Title: Home Sweet Home!", "Home <strong>Content!</strong>", "# Pages: 4", @@ -90,7 +90,7 @@ func doTestNodeAsPage(t *testing.T, ugly, preserveTaxonomyNames bool) { "GetPage: Section1 ", ) - th.assertFileContent(expectedFilePath(ugly, "public", "sect1", "regular1"), false, "Single Title: Page 01", "Content Page 01") + th.assertFileContent(expectedFilePath(ugly, "public", "sect1", "regular1"), "Single Title: Page 01", "Content Page 01") nodes := sites.findAllPagesByKindNotIn(KindPage) @@ -116,24 +116,24 @@ func doTestNodeAsPage(t *testing.T, ugly, preserveTaxonomyNames bool) { require.True(t, first.IsPage()) // Check Home paginator - th.assertFileContent(expectedFilePath(ugly, "public", "page", "2"), false, + th.assertFileContent(expectedFilePath(ugly, "public", "page", "2"), "Pag: Page 02") // Check Sections - th.assertFileContent(expectedFilePath(ugly, "public", "sect1"), false, + th.assertFileContent(expectedFilePath(ugly, "public", "sect1"), "Section Title: Section", "Section1 <strong>Content!</strong>", "Date: 2009-01-04", "Lastmod: 2009-01-05", ) - th.assertFileContent(expectedFilePath(ugly, "public", "sect2"), false, + th.assertFileContent(expectedFilePath(ugly, "public", "sect2"), "Section Title: Section", "Section2 <strong>Content!</strong>", "Date: 2009-01-06", "Lastmod: 2009-01-07", ) // Check Sections paginator - th.assertFileContent(expectedFilePath(ugly, "public", "sect1", "page", "2"), false, + th.assertFileContent(expectedFilePath(ugly, "public", "sect1", "page", "2"), "Pag: Page 02") sections := sites.findAllPagesByKind(KindSection) @@ -141,13 +141,13 @@ func doTestNodeAsPage(t *testing.T, ugly, preserveTaxonomyNames bool) { require.Len(t, sections, 2) // Check taxonomy lists - th.assertFileContent(expectedFilePath(ugly, "public", "categories", "hugo"), false, + th.assertFileContent(expectedFilePath(ugly, "public", "categories", "hugo"), "Taxonomy Title: Taxonomy Hugo", "Taxonomy Hugo <strong>Content!</strong>", "Date: 2009-01-08", "Lastmod: 2009-01-09", ) - th.assertFileContent(expectedFilePath(ugly, "public", "categories", "hugo-rocks"), false, + th.assertFileContent(expectedFilePath(ugly, "public", "categories", "hugo-rocks"), "Taxonomy Title: Taxonomy Hugo Rocks", ) @@ -157,7 +157,7 @@ func doTestNodeAsPage(t *testing.T, ugly, preserveTaxonomyNames bool) { require.NotNil(t, web) require.Len(t, web.Data["Pages"].(Pages), 4) - th.assertFileContent(expectedFilePath(ugly, "public", "categories", "web"), false, + th.assertFileContent(expectedFilePath(ugly, "public", "categories", "web"), "Taxonomy Title: Taxonomy Web", "Taxonomy Web <strong>Content!</strong>", "Date: 2009-01-10", @@ -165,12 +165,12 @@ func doTestNodeAsPage(t *testing.T, ugly, preserveTaxonomyNames bool) { ) // Check taxonomy list paginator - th.assertFileContent(expectedFilePath(ugly, "public", "categories", "hugo", "page", "2"), false, + th.assertFileContent(expectedFilePath(ugly, "public", "categories", "hugo", "page", "2"), "Taxonomy Title: Taxonomy Hugo", "Pag: Page 02") // Check taxonomy terms - th.assertFileContent(expectedFilePath(ugly, "public", "categories"), false, + th.assertFileContent(expectedFilePath(ugly, "public", "categories"), "Taxonomy Terms Title: Taxonomy Term Categories", "Taxonomy Term Categories <strong>Content!</strong>", "k/v: hugo", "Date: 2009-01-14", "Lastmod: 2009-01-15", @@ -179,11 +179,11 @@ func doTestNodeAsPage(t *testing.T, ugly, preserveTaxonomyNames bool) { // There are no pages to paginate over in the taxonomy terms. // RSS - th.assertFileContent(filepath.Join("public", "customrss.xml"), false, "Recent content in Home Sweet Home! on Hugo Rocks", "<rss") - th.assertFileContent(filepath.Join("public", "sect1", "customrss.xml"), false, "Recent content in Section1 on Hugo Rocks", "<rss") - th.assertFileContent(filepath.Join("public", "sect2", "customrss.xml"), false, "Recent content in Section2 on Hugo Rocks", "<rss") - th.assertFileContent(filepath.Join("public", "categories", "hugo", "customrss.xml"), false, "Recent content in Taxonomy Hugo on Hugo Rocks", "<rss") - th.assertFileContent(filepath.Join("public", "categories", "web", "customrss.xml"), false, "Recent content in Taxonomy Web on Hugo Rocks", "<rss") + th.assertFileContent(filepath.Join("public", "customrss.xml"), "Recent content in Home Sweet Home! on Hugo Rocks", "<rss") + th.assertFileContent(filepath.Join("public", "sect1", "customrss.xml"), "Recent content in Section1 on Hugo Rocks", "<rss") + th.assertFileContent(filepath.Join("public", "sect2", "customrss.xml"), "Recent content in Section2 on Hugo Rocks", "<rss") + th.assertFileContent(filepath.Join("public", "categories", "hugo", "customrss.xml"), "Recent content in Taxonomy Hugo on Hugo Rocks", "<rss") + th.assertFileContent(filepath.Join("public", "categories", "web", "customrss.xml"), "Recent content in Taxonomy Web on Hugo Rocks", "<rss") } @@ -226,21 +226,21 @@ func doTestNodesWithNoContentFile(t *testing.T, ugly bool) { require.Len(t, homePage.Pages, 4) require.True(t, homePage.Path() == "") - th.assertFileContent(filepath.Join("public", "index.html"), false, + th.assertFileContent(filepath.Join("public", "index.html"), "Index Title: Hugo Rocks!", "Date: 2010-06-12", "Lastmod: 2010-06-13", ) // Taxonomy list - th.assertFileContent(expectedFilePath(ugly, "public", "categories", "hugo"), false, + th.assertFileContent(expectedFilePath(ugly, "public", "categories", "hugo"), "Taxonomy Title: Hugo", "Date: 2010-06-12", "Lastmod: 2010-06-13", ) // Taxonomy terms - th.assertFileContent(expectedFilePath(ugly, "public", "categories"), false, + th.assertFileContent(expectedFilePath(ugly, "public", "categories"), "Taxonomy Terms Title: Categories", ) @@ -258,24 +258,24 @@ func doTestNodesWithNoContentFile(t *testing.T, ugly bool) { } // Sections - th.assertFileContent(expectedFilePath(ugly, "public", "sect1"), false, + th.assertFileContent(expectedFilePath(ugly, "public", "sect1"), "Section Title: Sect1s", "Date: 2010-06-12", "Lastmod: 2010-06-13", ) - th.assertFileContent(expectedFilePath(ugly, "public", "sect2"), false, + th.assertFileContent(expectedFilePath(ugly, "public", "sect2"), "Section Title: Sect2s", "Date: 2008-07-06", "Lastmod: 2008-07-09", ) // RSS - th.assertFileContent(filepath.Join("public", "customrss.xml"), false, "Hugo Rocks!", "<rss") - th.assertFileContent(filepath.Join("public", "sect1", "customrss.xml"), false, "Recent content in Sect1s on Hugo Rocks!", "<rss") - th.assertFileContent(filepath.Join("public", "sect2", "customrss.xml"), false, "Recent content in Sect2s on Hugo Rocks!", "<rss") - th.assertFileContent(filepath.Join("public", "categories", "hugo", "customrss.xml"), false, "Recent content in Hugo on Hugo Rocks!", "<rss") - th.assertFileContent(filepath.Join("public", "categories", "web", "customrss.xml"), false, "Recent content in Web on Hugo Rocks!", "<rss") + th.assertFileContent(filepath.Join("public", "customrss.xml"), "Hugo Rocks!", "<rss") + th.assertFileContent(filepath.Join("public", "sect1", "customrss.xml"), "Recent content in Sect1s on Hugo Rocks!", "<rss") + th.assertFileContent(filepath.Join("public", "sect2", "customrss.xml"), "Recent content in Sect2s on Hugo Rocks!", "<rss") + th.assertFileContent(filepath.Join("public", "categories", "hugo", "customrss.xml"), "Recent content in Hugo on Hugo Rocks!", "<rss") + th.assertFileContent(filepath.Join("public", "categories", "web", "customrss.xml"), "Recent content in Web on Hugo Rocks!", "<rss") } @@ -376,53 +376,53 @@ title = "Deutsche Hugo" require.Equal(t, expetedPermalink(ugly, "/en/sect1/"), enSect.Permalink()) - th.assertFileContent(filepath.Join("public", "nn", "index.html"), true, + th.assertFileContent(filepath.Join("public", "nn", "index.html"), "Index Title: Hugo på norsk") - th.assertFileContent(filepath.Join("public", "en", "index.html"), true, + th.assertFileContent(filepath.Join("public", "en", "index.html"), "Index Title: Home Sweet Home!", "<strong>Content!</strong>") - th.assertFileContent(filepath.Join("public", "de", "index.html"), true, + th.assertFileContent(filepath.Join("public", "de", "index.html"), "Index Title: Home Sweet Home!", "<strong>Content!</strong>") // Taxonomy list - th.assertFileContent(expectedFilePath(ugly, "public", "nn", "categories", "hugo"), true, + th.assertFileContent(expectedFilePath(ugly, "public", "nn", "categories", "hugo"), "Taxonomy Title: Hugo") - th.assertFileContent(expectedFilePath(ugly, "public", "en", "categories", "hugo"), true, + th.assertFileContent(expectedFilePath(ugly, "public", "en", "categories", "hugo"), "Taxonomy Title: Taxonomy Hugo") // Taxonomy terms - th.assertFileContent(expectedFilePath(ugly, "public", "nn", "categories"), true, + th.assertFileContent(expectedFilePath(ugly, "public", "nn", "categories"), "Taxonomy Terms Title: Categories") - th.assertFileContent(expectedFilePath(ugly, "public", "en", "categories"), true, + th.assertFileContent(expectedFilePath(ugly, "public", "en", "categories"), "Taxonomy Terms Title: Taxonomy Term Categories") // Sections - th.assertFileContent(expectedFilePath(ugly, "public", "nn", "sect1"), true, + th.assertFileContent(expectedFilePath(ugly, "public", "nn", "sect1"), "Section Title: Sect1s") - th.assertFileContent(expectedFilePat |