From 241b21b0fd34d91fccb2ce69874110dceae6f926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Wed, 4 Jan 2023 18:24:36 +0100 Subject: Create a struct with all of Hugo's config options Primary motivation is documentation, but it will also hopefully simplify the code. Also, * Lower case the default output format names; this is in line with the custom ones (map keys) and how it's treated all the places. This avoids doing `stringds.EqualFold` everywhere. Closes #10896 Closes #10620 --- hugofs/fs_test.go | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'hugofs/fs_test.go') diff --git a/hugofs/fs_test.go b/hugofs/fs_test.go index f7203fac9..509aca62f 100644 --- a/hugofs/fs_test.go +++ b/hugofs/fs_test.go @@ -35,9 +35,10 @@ func TestIsOsFs(t *testing.T) { func TestNewDefault(t *testing.T) { c := qt.New(t) - v := config.NewWithTestDefaults() + v := config.New() v.Set("workingDir", t.TempDir()) - f := NewDefault(v) + v.Set("publishDir", "public") + f := NewDefaultOld(v) c.Assert(f.Source, qt.IsNotNil) c.Assert(f.Source, hqt.IsSameType, new(afero.OsFs)) @@ -49,20 +50,3 @@ func TestNewDefault(t *testing.T) { c.Assert(IsOsFs(f.PublishDir), qt.IsTrue) c.Assert(IsOsFs(f.Os), qt.IsTrue) } - -func TestNewMem(t *testing.T) { - c := qt.New(t) - v := config.NewWithTestDefaults() - f := NewMem(v) - - c.Assert(f.Source, qt.Not(qt.IsNil)) - c.Assert(f.Source, hqt.IsSameType, new(afero.MemMapFs)) - c.Assert(f.PublishDir, qt.Not(qt.IsNil)) - c.Assert(f.PublishDir, hqt.IsSameType, new(afero.BasePathFs)) - c.Assert(f.Os, hqt.IsSameType, new(afero.OsFs)) - c.Assert(f.WorkingDirReadOnly, qt.IsNotNil) - c.Assert(IsOsFs(f.Source), qt.IsFalse) - c.Assert(IsOsFs(f.WorkingDirReadOnly), qt.IsFalse) - c.Assert(IsOsFs(f.PublishDir), qt.IsFalse) - c.Assert(IsOsFs(f.Os), qt.IsTrue) -} -- cgit v1.2.3