ref: 07ab7ae3d2e64dafb8f6dab937986d8e366d1fe5
parent: ed847ed93d86d0e1c0993adfee787e7fa02e604b
author: Bjørn Erik Pedersen <[email protected]>
date: Fri Feb 17 16:14:52 EST 2017
hugolib: More test helper cleanup
--- a/hugolib/alias_test.go
+++ b/hugolib/alias_test.go
@@ -45,9 +45,9 @@
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 @@
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")}
--- a/hugolib/case_insensitive_test.go
+++ b/hugolib/case_insensitive_test.go
@@ -191,7 +191,7 @@
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 @@
"«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 @@
"“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 @@
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",
--- a/hugolib/embedded_shortcodes_test.go
+++ b/hugolib/embedded_shortcodes_test.go
@@ -115,7 +115,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
03eA photo posted by Instagram (@instagram)\u003c/a\u003e on \u003ctime style=\" font-family:Arial,sans-serif; font-size:14px; line-height:17px;\" datetime=\"2016-11-10T15:02:28+00:00\"\u003eNov 10, 2016 at 7:02am PST\u003c/time\u003e\u003c/p\u003e\u003c/div\u003e\u003c/blockquote\u003e\n\u003cscript async defer src=\"//platform.instagram.com/en_US/embeds.js\"\u003e\u003c/script\u003e", "width": 658, "version": "1.0", "author_url": "https://www.instagram.com/instagram", "author_id": 25025320, "type": "rich"}`,
`(?s)<blockquote class="instagram-media" data-instgrm-version="7" style=" background:#FFF; border:0; .*<script async defer src="//platform.instagram.com/en_US/embeds.js"></script>`,
},
-ial,sans-serif; font-size:14px; line-height:17px;\" datetime=\"2016-11-10T15:02:28+00:00\"\u003eNov 10, 2016 at 7:02am PST\u003c/time\u003e\u003c/p\u003e\u003c/div\u003e\u003c/blockquote\u003e\n\u003cscript async defer src=\"//platform.instagram.com/en_US/embeds.js\"\u003e\u003c/script\u003e", "width": 658, "version": "1.0", "author_url": "https://www.instagram.com/instagram", "author_id": 25025320, "type": "rich"}`,
+ial,sans-serif; font-size:14px; line-height:17px;\" datetime=\"2016-11-10T15:02:28+00:00\"\u003eNov 10, 2016 at 7:02am PST\u003c/time\u003e\u003c/p\u003e\u003c/div\u003e\u003c/blockquote\u003e\n\u003cscript async defer src=\"//platform.instagram.com/en_US/embeds.js\"\u003e\u003c/script\u003e", "width": 658, "version": "1.0", "author_url": "https://www.instagram.com/instagram", "author_id": 25025320, "type": "rich"}`,
10, 2016 at 7:02am PST\u003c/time\u003e\u003c/p\u003e\u003c/div\u003e\u003c/blockquote\u003e\n\u003cscript async defer src=\"//platform.instagram.com/en_US/embeds.js\"\u003e\u003c/script\u003e", "width": 658, "version": "1.0", "author_url": "https://www.instagram.com/instagram", "author_id": 25025320, "type": "rich"}`,
`(?s)<blockquote class="instagram-media" data-instgrm-version="7" style=" background:#FFF; border:0; .*<script async defer src="//platform.instagram.com/en_US/embeds.js"></script>`,
},
--- a/hugolib/hugo_sites_build_test.go
+++ b/hugolib/hugo_sites_build_test.go
@@ -74,79 +74,69 @@
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/"`)+ 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 (th testHelper) replaceDefaultContentLanguageValue(value string, defaultInSubDir bool) string {- replace := th.Cfg.GetString("defaultContentLanguage") + "/"- if !defaultInSubDir {- value = strings.Replace(value, replace, "", 1)
-
- }
- return value
-
-}
-
func TestMultiSitesWithTwoLanguages(t *testing.T) {t.Parallel()
mm := afero.NewMemMapFs()
@@ -262,7 +252,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}
// 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 @@
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 = `
--- a/hugolib/node_as_page_test.go
+++ b/hugolib/node_as_page_test.go
@@ -81,7 +81,7 @@
// 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 @@
"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,17 +116,17 @@
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",
@@ -133,7 +133,7 @@
)
// 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 @@
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 @@
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 @@
)
// 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 @@
// 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,7 +226,7 @@
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",
@@ -233,7 +233,7 @@
)
// 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",
@@ -240,7 +240,7 @@
)
// Taxonomy terms
- th.assertFileContent(expectedFilePath(ugly, "public", "categories"), false,
+ th.assertFileContent(expectedFilePath(ugly, "public", "categories"),
"Taxonomy Terms Title: Categories",
)
@@ -258,13 +258,13 @@
}
// 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",
@@ -271,11 +271,11 @@
)
// 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 @@
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(expectedFilePath(ugly, "public", "nn", "sect2"), true,
+ th.assertFileContent(expectedFilePath(ugly, "public", "nn", "sect2"),
"Section Title: Sect2s")
- th.assertFileContent(expectedFilePath(ugly, "public", "en", "sect1"), true,
+ th.assertFileContent(expectedFilePath(ugly, "public", "en", "sect1"),
"Section Title: Section1")
- th.assertFileContent(expectedFilePath(ugly, "public", "en", "sect2"), true,
+ th.assertFileContent(expectedFilePath(ugly, "public", "en", "sect2"),
"Section Title: Section2")
// Regular pages
- th.assertFileContent(expectedFilePath(ugly, "public", "en", "sect1", "regular1"), true,
+ th.assertFileContent(expectedFilePath(ugly, "public", "en", "sect1", "regular1"),
"Single Title: Page 01")
- th.assertFileContent(expectedFilePath(ugly, "public", "nn", "sect1", "regular2"), true,
+ th.assertFileContent(expectedFilePath(ugly, "public", "nn", "sect1", "regular2"),
"Single Title: Page 02")
// RSS
- th.assertFileContent(filepath.Join("public", "nn", "customrss.xml"), true, "Hugo på norsk", "<rss")- th.assertFileContent(filepath.Join("public", "nn", "sect1", "customrss.xml"), true, "Recent content in Sect1s on Hugo på norsk", "<rss")- th.assertFileContent(filepath.Join("public", "nn", "sect2", "customrss.xml"), true, "Recent content in Sect2s on Hugo på norsk", "<rss")- th.assertFileContent(filepath.Join("public", "nn", "categories", "hugo", "customrss.xml"), true, "Recent content in Hugo on Hugo på norsk", "<rss")- th.assertFileContent(filepath.Join("public", "nn", "categories", "web", "customrss.xml"), true, "Recent content in Web on Hugo på norsk", "<rss")+ th.assertFileContent(filepath.Join("public", "nn", "customrss.xml"), "Hugo på norsk", "<rss")+ th.assertFileContent(filepath.Join("public", "nn", "sect1", "customrss.xml"), "Recent content in Sect1s on Hugo på norsk", "<rss")+ th.assertFileContent(filepath.Join("public", "nn", "sect2", "customrss.xml"), "Recent content in Sect2s on Hugo på norsk", "<rss")+ th.assertFileContent(filepath.Join("public", "nn", "categories", "hugo", "customrss.xml"), "Recent content in Hugo on Hugo på norsk", "<rss")+ th.assertFileContent(filepath.Join("public", "nn", "categories", "web", "customrss.xml"), "Recent content in Web on Hugo på norsk", "<rss")- th.assertFileContent(filepath.Join("public", "en", "customrss.xml"), true, "Recent content in Home Sweet Home! on Hugo in English", "<rss")- th.assertFileContent(filepath.Join("public", "en", "sect1", "customrss.xml"), true, "Recent content in Section1 on Hugo in English", "<rss")- th.assertFileContent(filepath.Join("public", "en", "sect2", "customrss.xml"), true, "Recent content in Section2 on Hugo in English", "<rss")- th.assertFileContent(filepath.Join("public", "en", "categories", "hugo", "customrss.xml"), true, "Recent content in Taxonomy Hugo on Hugo in English", "<rss")- th.assertFileContent(filepath.Join("public", "en", "categories", "web", "customrss.xml"), true, "Recent content in Taxonomy Web on Hugo in English", "<rss")+ th.assertFileContent(filepath.Join("public", "en", "customrss.xml"), "Recent content in Home Sweet Home! on Hugo in English", "<rss")+ th.assertFileContent(filepath.Join("public", "en", "sect1", "customrss.xml"), "Recent content in Section1 on Hugo in English", "<rss")+ th.assertFileContent(filepath.Join("public", "en", "sect2", "customrss.xml"), "Recent content in Section2 on Hugo in English", "<rss")+ th.assertFileContent(filepath.Join("public", "en", "categories", "hugo", "customrss.xml"), "Recent content in Taxonomy Hugo on Hugo in English", "<rss")+ th.assertFileContent(filepath.Join("public", "en", "categories", "web", "customrss.xml"), "Recent content in Taxonomy Web on Hugo in English", "<rss")}
@@ -454,8 +454,8 @@
require.NoError(t, h.Build(BuildCfg{}))- th.assertFileContent(filepath.Join("public", "categories", "hugo", "index.html"), true, "Taxonomy Title: Hugo", "# Pages: 5")- th.assertFileContent(filepath.Join("public", "categories", "home", "index.html"), true, "Taxonomy Title: Home", "# Pages: 1")+ th.assertFileContent(filepath.Join("public", "categories", "hugo", "index.html"), "Taxonomy Title: Hugo", "# Pages: 5")+ th.assertFileContent(filepath.Join("public", "categories", "home", "index.html"), "Taxonomy Title: Home", "# Pages: 1")}
@@ -502,9 +502,9 @@
require.NoError(t, h.Build(BuildCfg{}))- th.assertFileContent(filepath.Join("public", "index.html"), true, "Home With Menu", "Home Menu Item: Go Home!: /")- th.assertFileContent(filepath.Join("public", "sect1", "index.html"), true, "Sect1 With Menu", "Section Menu Item: Go Sect1!: /sect1/")- th.assertFileContent(filepath.Join("public", "categories", "hugo", "index.html"), true, "Taxonomy With Menu", "Taxonomy Menu Item: Go Tax Hugo!: /categories/hugo/")+ th.assertFileContent(filepath.Join("public", "index.html"), "Home With Menu", "Home Menu Item: Go Home!: /")+ th.assertFileContent(filepath.Join("public", "sect1", "index.html"), "Sect1 With Menu", "Section Menu Item: Go Sect1!: /sect1/")+ th.assertFileContent(filepath.Join("public", "categories", "hugo", "index.html"), "Taxonomy With Menu", "Taxonomy Menu Item: Go Tax Hugo!: /categories/hugo/")}
@@ -535,8 +535,8 @@
require.NoError(t, h.Build(BuildCfg{}))- th.assertFileContent(filepath.Join("public", "index.html"), true, "Home With Alias")- th.assertFileContent(filepath.Join("public", "my", "new", "home.html"), true, "content=\"0; url=http://base/")+ th.assertFileContent(filepath.Join("public", "index.html"), "Home With Alias")+ th.assertFileContent(filepath.Join("public", "my", "new", "home.html"), "content=\"0; url=http://base/")}
@@ -564,7 +564,7 @@
require.NoError(t, h.Build(BuildCfg{}))- th.assertFileContent(filepath.Join("public", "sect", "index.html"), true, "My Section")+ th.assertFileContent(filepath.Join("public", "sect", "index.html"), "My Section")}
@@ -595,7 +595,7 @@
require.NoError(t, h.Build(BuildCfg{}))- th.assertFileContent(filepath.Join("public", "sect", "index.html"), true, "My Section")+ th.assertFileContent(filepath.Join("public", "sect", "index.html"), "My Section")s := h.Sites[0]
--- a/hugolib/pagination_test.go
+++ b/hugolib/pagination_test.go
@@ -322,7 +322,7 @@
th := testHelper{s.Cfg, s.Fs, t}- th.assertFileContent(filepath.Join("public", "阅读", "testing", "2", "index.html"), false, "2: /%E9%98%85%E8%AF%BB/testing/2/")+ th.assertFileContent(filepath.Join("public", "阅读", "testing", "2", "index.html"), "2: /%E9%98%85%E8%AF%BB/testing/2/")}
--- a/hugolib/robotstxt_test.go
+++ b/hugolib/robotstxt_test.go
@@ -41,6 +41,6 @@
buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{})- th.assertFileContent("public/robots.txt", true, "User-agent: Googlebot")+ th.assertFileContent("public/robots.txt", "User-agent: Googlebot")}
--- a/hugolib/rss_test.go
+++ b/hugolib/rss_test.go
@@ -44,11 +44,11 @@
buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{})// Home RSS
- th.assertFileContent(filepath.Join("public", rssURI), true, "<?xml", "rss version", "RSSTest")+ th.assertFileContent(filepath.Join("public", rssURI), "<?xml", "rss version", "RSSTest")// Section RSS
- th.assertFileContent(filepath.Join("public", "sect", rssURI), true, "<?xml", "rss version", "Sects on RSSTest")+ th.assertFileContent(filepath.Join("public", "sect", rssURI), "<?xml", "rss version", "Sects on RSSTest")// Taxonomy RSS
- th.assertFileContent(filepath.Join("public", "categories", "hugo", rssURI), true, "<?xml", "rss version", "Hugo on RSSTest")+ th.assertFileContent(filepath.Join("public", "categories", "hugo", rssURI), "<?xml", "rss version", "Hugo on RSSTest")// RSS Item Limit
content := readDestination(t, fs, filepath.Join("public", rssURI))--- a/hugolib/shortcode_test.go
+++ b/hugolib/shortcode_test.go
@@ -555,7 +555,7 @@
continue
}
- th.assertFileContent(test.outFile, true, test.expected)
+ th.assertFileContent(test.outFile, test.expected)
}
}
--- a/hugolib/site_test.go
+++ b/hugolib/site_test.go
@@ -275,7 +275,7 @@
}
for _, test := range tests {- th.assertFileContent(test.doc, true, test.expected)
+ th.assertFileContent(test.doc, test.expected)
}
@@ -429,7 +429,7 @@
test.expected = inflect.Pluralize(test.expected)
}
- th.assertFileContent(filepath.Join("public", test.doc), true, test.expected)+ th.assertFileContent(filepath.Join("public", test.doc), test.expected)}
}
@@ -542,7 +542,7 @@
expected = strings.Replace(expected, baseURL, "", -1)
}
- th.assertFileContent(test.file, true, expected)
+ th.assertFileContent(test.file, expected)
}
}
--- a/hugolib/sitemap_test.go
+++ b/hugolib/sitemap_test.go
@@ -58,7 +58,7 @@
s := buildSingleSite(t, depsCfg, BuildCfg{}) th := testHelper{s.Cfg, s.Fs, t}- th.assertFileContent("public/sitemap.xml", true,+ th.assertFileContent("public/sitemap.xml",// Regular page
" <loc>http://auth/bub/sect/doc1/</loc>",
// Home page
--- a/hugolib/template_engines_test.go
+++ b/hugolib/template_engines_test.go
@@ -86,7 +86,7 @@
s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{}) th := testHelper{s.Cfg, s.Fs, t}- th.assertFileContent(filepath.Join("public", "p", "index.html"), true,+ th.assertFileContent(filepath.Join("public", "p", "index.html"),"Page Title: My Title",
"My Content",
"Hello World",
--- a/hugolib/template_test.go
+++ b/hugolib/template_test.go
@@ -48,7 +48,7 @@
},
func(t *testing.T) {- th.assertFileContent(filepath.Join("public", "sect", "index.html"), false, "Base: sect")+ th.assertFileContent(filepath.Join("public", "sect", "index.html"), "Base: sect")},
},
{@@ -59,7 +59,7 @@
},
func(t *testing.T) {- th.assertFileContent(filepath.Join("public", "index.html"), false, "Base: index")+ th.assertFileContent(filepath.Join("public", "index.html"), "Base: index")},
},
{@@ -70,7 +70,7 @@
},
func(t *testing.T) {- th.assertFileContent(filepath.Join("public", "sect", "index.html"), false, "Base: list")+ th.assertFileContent(filepath.Join("public", "sect", "index.html"), "Base: list")},
},
{@@ -81,7 +81,7 @@
},
func(t *testing.T) {- th.assertFileContent(filepath.Join("public", "sect", "index.html"), false, "Base: list")+ th.assertFileContent(filepath.Join("public", "sect", "index.html"), "Base: list")},
},
{@@ -94,7 +94,7 @@
},
func(t *testing.T) {- th.assertFileContent(filepath.Join("public", "sect", "index.html"), false, "Base: sect")+ th.assertFileContent(filepath.Join("public", "sect", "index.html"), "Base: sect")},
},
{@@ -106,7 +106,7 @@
},
func(t *testing.T) {- th.assertFileContent(filepath.Join("public", "sect", "index.html"), false, "Base Theme: sect")+ th.assertFileContent(filepath.Join("public", "sect", "index.html"), "Base Theme: sect")},
},
{@@ -119,7 +119,7 @@
},
func(t *testing.T) {- th.assertFileContent(filepath.Join("public", "sect", "index.html"), false, "Base: list")+ th.assertFileContent(filepath.Join("public", "sect", "index.html"), "Base: list")},
},
{@@ -131,7 +131,7 @@
},
func(t *testing.T) {- th.assertFileContent(filepath.Join("public", "sect", "index.html"), false, "Base Theme: list")+ th.assertFileContent(filepath.Join("public", "sect", "index.html"), "Base Theme: list")},
},
} {--- a/hugolib/testhelpers_test.go
+++ b/hugolib/testhelpers_test.go
@@ -33,23 +33,42 @@
T testing.TB
}
-func (th testHelper) assertFileContent(filename string, defaultInSubDir bool, matches ...string) {- filename = th.replaceDefaultContentLanguageValue(filename, defaultInSubDir)
+func (th testHelper) assertFileContent(filename string, matches ...string) {+ filename = th.replaceDefaultContentLanguageValue(filename)
content := readDestination(th.T, th.Fs, filename)
for _, match := range matches {- match = th.replaceDefaultContentLanguageValue(match, defaultInSubDir)
+ match = th.replaceDefaultContentLanguageValue(match)
require.True(th.T, strings.Contains(content, match), fmt.Sprintf("File no match for\n%q in\n%q:\n%s", strings.Replace(match, "%", "%%", -1), filename, strings.Replace(content, "%", "%%", -1)))}
}
-func (th testHelper) assertFileContentRegexp(filename string, defaultInSubDir bool, matches ...string) {- filename = th.replaceDefaultContentLanguageValue(filename, defaultInSubDir)
+// TODO(bep) better name for this. It does no magic replacements depending on defaultontentLanguageInSubDir.
+func (th testHelper) assertFileContentStraight(filename string, matches ...string) {content := readDestination(th.T, th.Fs, filename)
for _, match := range matches {- match = th.replaceDefaultContentLanguageValue(match, defaultInSubDir)
+ require.True(th.T, strings.Contains(content, match), fmt.Sprintf("File no match for\n%q in\n%q:\n%s", strings.Replace(match, "%", "%%", -1), filename, strings.Replace(content, "%", "%%", -1)))+ }
+}
+
+func (th testHelper) assertFileContentRegexp(filename string, matches ...string) {+ filename = th.replaceDefaultContentLanguageValue(filename)
+ content := readDestination(th.T, th.Fs, filename)
+ for _, match := range matches {+ match = th.replaceDefaultContentLanguageValue(match)
r := regexp.MustCompile(match)
require.True(th.T, r.MatchString(content), fmt.Sprintf("File no match for\n%q in\n%q:\n%s", strings.Replace(match, "%", "%%", -1), filename, strings.Replace(content, "%", "%%", -1)))}
+}
+
+func (th testHelper) replaceDefaultContentLanguageValue(value string) string {+ defaultInSubDir := th.Cfg.GetBool("defaultContentLanguageInSubDir")+ replace := th.Cfg.GetString("defaultContentLanguage") + "/"+
+ if !defaultInSubDir {+ value = strings.Replace(value, replace, "", 1)
+
+ }
+ return value
}
func newTestPathSpec(fs *hugofs.Fs, v *viper.Viper) *helpers.PathSpec {