github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

tpl/collections: Fix merge vs Params

Browse source 
Fixes #6633
This commit is contained in:
Bjørn Erik Pedersen 2019-12-18 21:31:34 +01:00
parent d20ca37005
commit 1b785a7a6d
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tpl/collections/merge.go
View file

@ -40,7 +40,7 @@ func (ns *Namespace) Merge(src, dst interface{}) (interface{}, error) {
return nil, errors.Errorf("source must be a map, got %T", src) return nil, errors.Errorf("source must be a map, got %T", src)
} }
if vsrc.Type() != vdst.Type() { if vsrc.Type().Key() != vdst.Type().Key() {
return nil, errors.Errorf("incompatible map types, got %T to %T", src, dst) return nil, errors.Errorf("incompatible map types, got %T to %T", src, dst)
} }

14
tpl/collections/merge_test.go
View file

@ -21,6 +21,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/gohugoio/hugo/common/maps"
"github.com/gohugoio/hugo/parser" "github.com/gohugoio/hugo/parser"
"github.com/gohugoio/hugo/parser/metadecoders" "github.com/gohugoio/hugo/parser/metadecoders"
@ -57,6 +59,18 @@ func TestMerge(t *testing.T) {
map[string]interface{}{"a": 1, "b": map[string]interface{}{"d": 1, "e": 2}}, map[string]interface{}{"a": 1, "b": map[string]interface{}{"d": 1, "e": 2}},
map[string]interface{}{"a": 42, "c": 3, "b": map[string]interface{}{"d": 55, "e": 66, "f": 3}}, map[string]interface{}{"a": 42, "c": 3, "b": map[string]interface{}{"d": 55, "e": 66, "f": 3}},
map[string]interface{}{"a": 1, "b": map[string]interface{}{"d": 1, "e": 2, "f": 3}, "c": 3}, false}, map[string]interface{}{"a": 1, "b": map[string]interface{}{"d": 1, "e": 2, "f": 3}, "c": 3}, false},
{
// https://github.com/gohugoio/hugo/issues/6633
"params dst",
maps.Params{"a": 1, "b": 2},
map[string]interface{}{"a": 42, "c": 3},
maps.Params{"a": int(1), "b": int(2), "c": int(3)}, false},
{
// https://github.com/gohugoio/hugo/issues/6633
"params src",
map[string]interface{}{"a": 1, "c": 2},
maps.Params{"a": 42, "c": 3},
map[string]interface{}{"a": int(1), "c": int(2)}, false},
{"src nil", simpleMap, nil, simpleMap, false}, {"src nil", simpleMap, nil, simpleMap, false},
// Error cases. // Error cases.
{"dst not a map", "not a map", nil, nil, true}, {"dst not a map", "not a map", nil, nil, true},