summaryrefslogtreecommitdiffstats
path: root/hugolib/menu_test.go
diff options
context:
space:
mode:
authorbep <bjorn.erik.pedersen@gmail.com>2015-06-11 22:41:26 +0200
committerbep <bjorn.erik.pedersen@gmail.com>2015-06-11 22:41:17 +0200
commitbed8197de5123d6e0ec361dad478f31d63a59bb9 (patch)
tree1cbe5488b35f25d11b7fd97ab4b55a82736874ac /hugolib/menu_test.go
parentbeda46d289acbe2d448a9009b0742753d072a2e0 (diff)
Move Viper reset to correct level in menu tests
Diffstat (limited to 'hugolib/menu_test.go')
-rw-r--r--hugolib/menu_test.go10
1 files changed, 6 insertions, 4 deletions
diff --git a/hugolib/menu_test.go b/hugolib/menu_test.go
index 7013822cf..3df0b084b 100644
--- 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)