github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-12-22 15:52:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'gohugoio:master' into fix/js.Build-sourcemap-comment

Browse source
This commit is contained in:
Brian Leishman 2024-09-22 14:31:04 -04:00 committed by GitHub
commit 4a8df5446b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tpl/compare/compare.go
View file

@ -231,8 +231,8 @@ func (n *Namespace) checkComparisonArgCount(min int, others ...any) bool {
// Conditional can be used as a ternary operator.
//
// It returns v1 if cond is true, else v2.
func (n *Namespace) Conditional(cond bool, v1, v2 any) any {
if cond {
func (n *Namespace) Conditional(cond any, v1, v2 any) any {
if hreflect.IsTruthful(cond) {
return v1
}
return v2

34
tpl/compare/compare_test.go
View file

@ -21,10 +21,9 @@ import (
"testing"
"time"
"github.com/gohugoio/hugo/htesting/hqt"
qt "github.com/frankban/quicktest"
"github.com/gohugoio/hugo/common/hugo"
"github.com/gohugoio/hugo/htesting/hqt"
"github.com/spf13/cast"
)
@ -447,12 +446,35 @@ func TestTimeUnix(t *testing.T) {
}
func TestConditional(t *testing.T) {
t.Parallel()
c := qt.New(t)
n := New(time.UTC, false)
a, b := "a", "b"
ns := New(time.UTC, false)
c.Assert(n.Conditional(true, a, b), qt.Equals, a)
c.Assert(n.Conditional(false, a, b), qt.Equals, b)
type args struct {
cond any
v1 any
v2 any
}
tests := []struct {
name string
args args
want any
}{
{"a", args{cond: true, v1: "true", v2: "false"}, "true"},
{"b", args{cond: false, v1: "true", v2: "false"}, "false"},
{"c", args{cond: 1, v1: "true", v2: "false"}, "true"},
{"d", args{cond: 0, v1: "true", v2: "false"}, "false"},
{"e", args{cond: "foo", v1: "true", v2: "false"}, "true"},
{"f", args{cond: "", v1: "true", v2: "false"}, "false"},
{"g", args{cond: []int{6, 7}, v1: "true", v2: "false"}, "true"},
{"h", args{cond: []int{}, v1: "true", v2: "false"}, "false"},
{"i", args{cond: nil, v1: "true", v2: "false"}, "false"},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
c.Assert(ns.Conditional(tt.args.cond, tt.args.v1, tt.args.v2), qt.Equals, tt.want)
})
}
}
// Issue 9462