diff options
Diffstat (limited to 'helpers/testhelpers_test.go')
| -rw-r--r-- | helpers/testhelpers_test.go | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/helpers/testhelpers_test.go b/helpers/testhelpers_test.go index 4a6ebd0b1..7d63e4d88 100644 --- a/helpers/testhelpers_test.go +++ b/helpers/testhelpers_test.go @@ -2,24 +2,24 @@ package helpers import ( "github.com/gohugoio/hugo/common/loggers" + "github.com/gohugoio/hugo/config" "github.com/spf13/afero" - "github.com/spf13/viper" "github.com/gohugoio/hugo/hugofs" "github.com/gohugoio/hugo/langs" "github.com/gohugoio/hugo/modules" ) -func newTestPathSpec(fs *hugofs.Fs, v *viper.Viper) *PathSpec { +func newTestPathSpec(fs *hugofs.Fs, v config.Provider) *PathSpec { l := langs.NewDefaultLanguage(v) ps, _ := NewPathSpec(fs, l, nil) return ps } func newTestDefaultPathSpec(configKeyValues ...interface{}) *PathSpec { - v := viper.New() + v := config.New() fs := hugofs.NewMem(v) - cfg := newTestCfgFor(fs) + cfg := newTestCfg() for i := 0; i < len(configKeyValues); i += 2 { cfg.Set(configKeyValues[i].(string), configKeyValues[i+1]) @@ -27,15 +27,8 @@ func newTestDefaultPathSpec(configKeyValues ...interface{}) *PathSpec { return newTestPathSpec(fs, cfg) } -func newTestCfgFor(fs *hugofs.Fs) *viper.Viper { - v := newTestCfg() - v.SetFs(fs.Source) - - return v -} - -func newTestCfg() *viper.Viper { - v := viper.New() +func newTestCfg() config.Provider { + v := config.New() v.Set("contentDir", "content") v.Set("dataDir", "data") v.Set("i18nDir", "i18n") @@ -56,7 +49,7 @@ func newTestCfg() *viper.Viper { } func newTestContentSpec() *ContentSpec { - v := viper.New() + v := config.New() spec, err := NewContentSpec(v, loggers.NewErrorLogger(), afero.NewMemMapFs()) if err != nil { panic(err) |