diff options
Diffstat (limited to 'cache/filecache/filecache_config_test.go')
| -rw-r--r-- | cache/filecache/filecache_config_test.go | 45 |
1 files changed, 17 insertions, 28 deletions
diff --git a/cache/filecache/filecache_config_test.go b/cache/filecache/filecache_config_test.go index b0f5d2dc0..f2f75344b 100644 --- a/cache/filecache/filecache_config_test.go +++ b/cache/filecache/filecache_config_test.go @@ -20,10 +20,9 @@ import ( "testing" "time" - "github.com/gohugoio/hugo/helpers" + "github.com/spf13/afero" "github.com/gohugoio/hugo/config" - "github.com/gohugoio/hugo/hugofs" "github.com/spf13/viper" "github.com/stretchr/testify/require" @@ -57,22 +56,19 @@ dir = "/path/to/c3" cfg, err := config.FromConfigString(configStr, "toml") assert.NoError(err) - fs := hugofs.NewMem(cfg) - p, err := helpers.NewPathSpec(fs, cfg) + fs := afero.NewMemMapFs() + decoded, err := DecodeConfig(fs, cfg) assert.NoError(err) - decoded, err := decodeConfig(p) - assert.NoError(err) - - assert.Equal(4, len(decoded)) + assert.Equal(5, len(decoded)) c2 := decoded["getcsv"] assert.Equal("11h0m0s", c2.MaxAge.String()) - assert.Equal(filepath.FromSlash("/path/to/c2"), c2.Dir) + assert.Equal(filepath.FromSlash("/path/to/c2/filecache/getcsv"), c2.Dir) c3 := decoded["images"] assert.Equal(time.Duration(-1), c3.MaxAge) - assert.Equal(filepath.FromSlash("/path/to/c3"), c3.Dir) + assert.Equal(filepath.FromSlash("/path/to/c3/filecache/images"), c3.Dir) } @@ -105,14 +101,11 @@ dir = "/path/to/c3" cfg, err := config.FromConfigString(configStr, "toml") assert.NoError(err) - fs := hugofs.NewMem(cfg) - p, err := helpers.NewPathSpec(fs, cfg) - assert.NoError(err) - - decoded, err := decodeConfig(p) + fs := afero.NewMemMapFs() + decoded, err := DecodeConfig(fs, cfg) assert.NoError(err) - assert.Equal(4, len(decoded)) + assert.Equal(5, len(decoded)) for _, v := range decoded { assert.Equal(time.Duration(0), v.MaxAge) @@ -133,24 +126,22 @@ func TestDecodeConfigDefault(t *testing.T) { cfg.Set("cacheDir", "/cache/thecache") } - fs := hugofs.NewMem(cfg) - p, err := helpers.NewPathSpec(fs, cfg) - assert.NoError(err) + fs := afero.NewMemMapFs() - decoded, err := decodeConfig(p) + decoded, err := DecodeConfig(fs, cfg) assert.NoError(err) - assert.Equal(4, len(decoded)) + assert.Equal(5, len(decoded)) imgConfig := decoded[cacheKeyImages] jsonConfig := decoded[cacheKeyGetJSON] if runtime.GOOS == "windows" { - assert.Equal("_gen", imgConfig.Dir) + assert.Equal(filepath.FromSlash("_gen/images"), imgConfig.Dir) } else { - assert.Equal("_gen", imgConfig.Dir) - assert.Equal("/cache/thecache/hugoproject", jsonConfig.Dir) + assert.Equal("_gen/images", imgConfig.Dir) + assert.Equal("/cache/thecache/hugoproject/filecache/getjson", jsonConfig.Dir) } assert.True(imgConfig.isResourceDir) @@ -183,11 +174,9 @@ dir = "/" cfg, err := config.FromConfigString(configStr, "toml") assert.NoError(err) - fs := hugofs.NewMem(cfg) - p, err := helpers.NewPathSpec(fs, cfg) - assert.NoError(err) + fs := afero.NewMemMapFs() - _, err = decodeConfig(p) + _, err = DecodeConfig(fs, cfg) assert.Error(err) } |