shithub: hugo

Info  •  Files  •  Log  •  Branches

Move Viper reset to correct level in menu tests

--- a/hugolib/menu_test.go

+++ b/hugolib/menu_test.go

@@ -169,8 +169,6 @@

 // Issue 817 - identifier should trump everything

 func TestPageMenuWithIdentifier(t *testing.T) {

-	viper.Reset()

-	defer viper.Reset()

 	toml := []source.ByteSource{

 		{"sect/doc1.md", tstCreateMenuPageWithIdentifierTOML("t1", "m1", "i1")},

@@ -191,6 +189,9 @@

 func doTestPageMenuWithIdentifier(t *testing.T, menuPageSources []source.ByteSource) {

+	viper.Reset()

+	defer viper.Reset()

+

 	s := setupMenuTests(t, menuPageSources)

 	assert.Equal(t, 3, len(s.Pages), "Not enough pages")

@@ -308,8 +309,6 @@

 // issue #719

 func TestMenuWithUnicodeURLs(t *testing.T) {

-	viper.Reset()

-	defer viper.Reset()

 	for _, uglyURLs := range []bool{true, false} {

 		for _, canonifyURLs := range []bool{true, false} {

@@ -319,6 +318,9 @@

 }

 func doTestMenuWithUnicodeURLs(t *testing.T, canonifyURLs, uglyURLs bool) {

+	viper.Reset()

+	defer viper.Reset()

+

 	viper.Set("CanonifyURLs", canonifyURLs)

 	viper.Set("UglyURLs", uglyURLs)