From 4e32dc80a23cae78d2920c87c0ae6789334158ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sun, 6 Mar 2016 00:41:11 +0100 Subject: [PATCH] Simplify the IsHome test cases --- hugolib/site_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hugolib/site_test.go b/hugolib/site_test.go index f7e92cd30..f84ae5902 100644 --- a/hugolib/site_test.go +++ b/hugolib/site_test.go @@ -456,9 +456,9 @@ func doTestShouldAlwaysHaveUglyURLs(t *testing.T, uglyURLs bool) { s.initializeSiteInfo() templatePrep(s) - must(s.addTemplate("index.html", "Home Sweet Home. IsHome={{ .IsHome }}")) - must(s.addTemplate("_default/single.html", "{{.Content}} IsHome={{ .IsHome }}")) - must(s.addTemplate("404.html", "Page Not Found. IsHome={{ .IsHome }}")) + must(s.addTemplate("index.html", "Home Sweet {{ if.IsHome }}Home{{ end }}.")) + must(s.addTemplate("_default/single.html", "{{.Content}}{{ if.IsHome }}This is not home!{{ end }}")) + must(s.addTemplate("404.html", "Page Not Found.{{ if.IsHome }}This is not home!{{ end }}")) // make sure the XML files also end up with ugly urls must(s.addTemplate("rss.xml", "RSS")) @@ -479,13 +479,13 @@ func doTestShouldAlwaysHaveUglyURLs(t *testing.T, uglyURLs bool) { doc string expected string }{ - {filepath.FromSlash("index.html"), "Home Sweet Home. IsHome=true"}, - {filepath.FromSlash(expectedPagePath), "\n\n

title

\n\n

some content

\n IsHome=false"}, - {filepath.FromSlash("404.html"), "Page Not Found. IsHome=false"}, + {filepath.FromSlash("index.html"), "Home Sweet Home."}, + {filepath.FromSlash(expectedPagePath), "\n\n

title

\n\n

some content

\n"}, + {filepath.FromSlash("404.html"), "Page Not Found."}, {filepath.FromSlash("index.xml"), "\nRSS"}, {filepath.FromSlash("sitemap.xml"), "\nSITEMAP"}, // Issue #1923 - {filepath.FromSlash("ugly.html"), "\n\n

title

\n\n

doc2 content

\n IsHome=false"}, + {filepath.FromSlash("ugly.html"), "\n\n

title

\n\n

doc2 content

\n"}, } for _, p := range s.Pages {