summaryrefslogtreecommitdiffstats
path: root/tpl/collections/collections_test.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2023-01-04 18:24:36 +0100
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2023-05-16 18:01:29 +0200
commit241b21b0fd34d91fccb2ce69874110dceae6f926 (patch)
treed4e0118eac7e9c42f065815447a70805f8d6ad3e /tpl/collections/collections_test.go
parent6aededf6b42011c3039f5f66487a89a8dd65e0e7 (diff)
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
Diffstat (limited to 'tpl/collections/collections_test.go')
-rw-r--r--tpl/collections/collections_test.go71
1 files changed, 23 insertions, 48 deletions
diff --git a/tpl/collections/collections_test.go b/tpl/collections/collections_test.go
index fd78da6d4..86192c480 100644
--- a/tpl/collections/collections_test.go
+++ b/tpl/collections/collections_test.go
@@ -23,15 +23,9 @@ import (
"time"
"github.com/gohugoio/hugo/common/maps"
+ "github.com/gohugoio/hugo/config/testconfig"
qt "github.com/frankban/quicktest"
- "github.com/gohugoio/hugo/common/loggers"
- "github.com/gohugoio/hugo/config"
- "github.com/gohugoio/hugo/deps"
- "github.com/gohugoio/hugo/helpers"
- "github.com/gohugoio/hugo/hugofs"
- "github.com/gohugoio/hugo/langs"
- "github.com/spf13/afero"
)
type tstNoStringer struct{}
@@ -40,7 +34,7 @@ func TestAfter(t *testing.T) {
t.Parallel()
c := qt.New(t)
- ns := New(&deps.Deps{Language: langs.NewDefaultLanguage(config.New())})
+ ns := newNs()
for i, test := range []struct {
index any
@@ -97,7 +91,7 @@ func (g *tstGrouper2) Group(key any, items any) (any, error) {
func TestGroup(t *testing.T) {
t.Parallel()
c := qt.New(t)
- ns := New(&deps.Deps{Language: langs.NewDefaultLanguage(config.New())})
+ ns := newNs()
for i, test := range []struct {
key any
@@ -133,9 +127,7 @@ func TestDelimit(t *testing.T) {
t.Parallel()
c := qt.New(t)
- ns := New(&deps.Deps{
- Language: langs.NewDefaultLanguage(config.New()),
- })
+ ns := newNs()
for i, test := range []struct {
seq any
@@ -187,7 +179,7 @@ func TestDelimit(t *testing.T) {
func TestDictionary(t *testing.T) {
c := qt.New(t)
- ns := New(&deps.Deps{Language: langs.NewDefaultLanguage(config.New())})
+ ns := newNs()
for i, test := range []struct {
values []any
@@ -226,7 +218,7 @@ func TestDictionary(t *testing.T) {
func TestReverse(t *testing.T) {
t.Parallel()
c := qt.New(t)
- ns := New(&deps.Deps{Language: langs.NewDefaultLanguage(config.New())})
+ ns := newNs()
s := []string{"a", "b", "c"}
reversed, err := ns.Reverse(s)
@@ -245,7 +237,7 @@ func TestEchoParam(t *testing.T) {
t.Parallel()
c := qt.New(t)
- ns := New(&deps.Deps{Language: langs.NewDefaultLanguage(config.New())})
+ ns := newNs()
for i, test := range []struct {
a any
@@ -277,7 +269,7 @@ func TestFirst(t *testing.T) {
t.Parallel()
c := qt.New(t)
- ns := New(&deps.Deps{Language: langs.NewDefaultLanguage(config.New())})
+ ns := newNs()
for i, test := range []struct {
limit any
@@ -314,8 +306,7 @@ func TestFirst(t *testing.T) {
func TestIn(t *testing.T) {
t.Parallel()
c := qt.New(t)
-
- ns := New(&deps.Deps{Language: langs.NewDefaultLanguage(config.New())})
+ ns := newNs()
for i, test := range []struct {
l1 any
@@ -391,7 +382,7 @@ func TestIntersect(t *testing.T) {
t.Parallel()
c := qt.New(t)
- ns := New(&deps.Deps{Language: langs.NewDefaultLanguage(config.New())})
+ ns := newNs()
for i, test := range []struct {
l1, l2 any
@@ -481,7 +472,7 @@ func TestIntersect(t *testing.T) {
func TestIsSet(t *testing.T) {
t.Parallel()
c := qt.New(t)
- ns := newTestNs()
+ ns := newNs()
for i, test := range []struct {
a any
@@ -518,7 +509,7 @@ func TestLast(t *testing.T) {
t.Parallel()
c := qt.New(t)
- ns := New(&deps.Deps{Language: langs.NewDefaultLanguage(config.New())})
+ ns := newNs()
for i, test := range []struct {
limit any
@@ -557,7 +548,7 @@ func TestLast(t *testing.T) {
func TestQuerify(t *testing.T) {
t.Parallel()
c := qt.New(t)
- ns := New(&deps.Deps{Language: langs.NewDefaultLanguage(config.New())})
+ ns := newNs()
for i, test := range []struct {
params []any
@@ -591,7 +582,7 @@ func TestQuerify(t *testing.T) {
}
func BenchmarkQuerify(b *testing.B) {
- ns := New(&deps.Deps{Language: langs.NewDefaultLanguage(config.New())})
+ ns := newNs()
params := []any{"a", "b", "c", "d", "f", " &"}
b.ResetTimer()
@@ -604,7 +595,7 @@ func BenchmarkQuerify(b *testing.B) {
}
func BenchmarkQuerifySlice(b *testing.B) {
- ns := New(&deps.Deps{Language: langs.NewDefaultLanguage(config.New())})
+ ns := newNs()
params := []string{"a", "b", "c", "d", "f", " &"}
b.ResetTimer()
@@ -619,7 +610,7 @@ func BenchmarkQuerifySlice(b *testing.B) {
func TestSeq(t *testing.T) {
t.Parallel()
c := qt.New(t)
- ns := New(&deps.Deps{Language: langs.NewDefaultLanguage(config.New())})
+ ns := newNs()
for i, test := range []struct {
args []any
@@ -663,7 +654,7 @@ func TestSeq(t *testing.T) {
func TestShuffle(t *testing.T) {
t.Parallel()
c := qt.New(t)
- ns := New(&deps.Deps{Language: langs.NewDefaultLanguage(config.New())})
+ ns := newNs()
for i, test := range []struct {
seq any
@@ -703,7 +694,7 @@ func TestShuffle(t *testing.T) {
func TestShuffleRandomising(t *testing.T) {
t.Parallel()
c := qt.New(t)
- ns := New(&deps.Deps{Language: langs.NewDefaultLanguage(config.New())})
+ ns := newNs()
// Note that this test can fail with false negative result if the shuffle
// of the sequence happens to be the same as the original sequence. However
@@ -734,7 +725,7 @@ func TestShuffleRandomising(t *testing.T) {
func TestSlice(t *testing.T) {
t.Parallel()
c := qt.New(t)
- ns := New(&deps.Deps{Language: langs.NewDefaultLanguage(config.New())})
+ ns := newNs()
for i, test := range []struct {
args []any
@@ -758,7 +749,7 @@ func TestUnion(t *testing.T) {
t.Parallel()
c := qt.New(t)
- ns := New(&deps.Deps{Language: langs.NewDefaultLanguage(config.New())})
+ ns := newNs()
for i, test := range []struct {
l1 any
@@ -847,7 +838,7 @@ func TestUnion(t *testing.T) {
func TestUniq(t *testing.T) {
t.Parallel()
c := qt.New(t)
- ns := New(&deps.Deps{Language: langs.NewDefaultLanguage(config.New())})
+ ns := newNs()
for i, test := range []struct {
l any
expect any
@@ -971,22 +962,6 @@ func ToTstXIs(slice any) []TstXI {
return tis
}
-func newDeps(cfg config.Provider) *deps.Deps {
- l := langs.NewLanguage("en", cfg)
- l.Set("i18nDir", "i18n")
- cs, err := helpers.NewContentSpec(l, loggers.NewErrorLogger(), afero.NewMemMapFs(), nil)
- if err != nil {
- panic(err)
- }
- return &deps.Deps{
- Language: l,
- Cfg: cfg,
- Fs: hugofs.NewMem(l),
- ContentSpec: cs,
- Log: loggers.NewErrorLogger(),
- }
-}
-
-func newTestNs() *Namespace {
- return New(newDeps(config.NewWithTestDefaults()))
+func newNs() *Namespace {
+ return New(testconfig.GetTestDeps(nil, nil))
}