summaryrefslogtreecommitdiffstats
path: root/hugofs/fs_test.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2017-02-05 10:20:06 +0700
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2017-02-17 17:15:26 +0100
commit93ca7c9e958e34469a337e4efcc7c75774ec50fd (patch)
tree5dfa296cfe74fd5ef8f0d41ea4078704f453aa04 /hugofs/fs_test.go
parente34af6ee30f70f5780a281e2fd8f4ed9b487ee61 (diff)
all: Refactor to nonglobal Viper, i18n etc.
This is a final rewrite that removes all the global state in Hugo, which also enables the use if `t.Parallel` in tests. Updates #2701 Fixes #3016
Diffstat (limited to 'hugofs/fs_test.go')
-rw-r--r--hugofs/fs_test.go19
1 files changed, 7 insertions, 12 deletions
diff --git a/hugofs/fs_test.go b/hugofs/fs_test.go
index 5482e6d27..95900e6a2 100644
--- a/hugofs/fs_test.go
+++ b/hugofs/fs_test.go
@@ -22,10 +22,8 @@ import (
)
func TestNewDefault(t *testing.T) {
- viper.Reset()
- defer viper.Reset()
-
- f := NewDefault()
+ v := viper.New()
+ f := NewDefault(v)
assert.NotNil(t, f.Source)
assert.IsType(t, new(afero.OsFs), f.Source)
@@ -39,10 +37,8 @@ func TestNewDefault(t *testing.T) {
}
func TestNewMem(t *testing.T) {
- viper.Reset()
- defer viper.Reset()
-
- f := NewMem()
+ v := viper.New()
+ f := NewMem(v)
assert.NotNil(t, f.Source)
assert.IsType(t, new(afero.MemMapFs), f.Source)
@@ -53,12 +49,11 @@ func TestNewMem(t *testing.T) {
}
func TestWorkingDir(t *testing.T) {
- viper.Reset()
- defer viper.Reset()
+ v := viper.New()
- viper.Set("workingDir", "/a/b/")
+ v.Set("workingDir", "/a/b/")
- f := NewMem()
+ f := NewMem(v)
assert.NotNil(t, f.WorkingDir)
assert.IsType(t, new(afero.BasePathFs), f.WorkingDir)