hugo

Unnamed repository; edit this file 'description' to name the repository.

git clone git://git.shimmy1996.com/hugo.git
commit bed8197de5123d6e0ec361dad478f31d63a59bb9
parent beda46d289acbe2d448a9009b0742753d072a2e0
Author: bep <bjorn.erik.pedersen@gmail.com>
Date:   Thu, 11 Jun 2015 22:41:26 +0200

Move Viper reset to correct level in menu tests

Diffstat:
Mhugolib/menu_test.go | 10++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/hugolib/menu_test.go b/hugolib/menu_test.go
@@ -169,8 +169,6 @@ type testMenuState struct {
 
 // 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 TestPageMenuWithIdentifier(t *testing.T) {
 
 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 @@ func TestMenuWithHashInURL(t *testing.T) {
 
 // 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 TestMenuWithUnicodeURLs(t *testing.T) {
 }
 
 func doTestMenuWithUnicodeURLs(t *testing.T, canonifyURLs, uglyURLs bool) {
+	viper.Reset()
+	defer viper.Reset()
+
 	viper.Set("CanonifyURLs", canonifyURLs)
 	viper.Set("UglyURLs", uglyURLs)