diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-07-21 11:41:23 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-07-21 11:41:23 +0200 |
| commit | ff16c42ed0965e1c8acf6e6a6dcda3ea50c107f2 (patch) | |
| tree | da1290397767bc9233b90e38230d8502dd975f10 /hugolib/pages_language_merge_test.go | |
| parent | 166483fe1227b0c59c6b4d88cfdfaf7d7b0d79c5 (diff) | |
hugolib: Allow untyped nil to be merged in lang.Merge
Fixes #4977
Diffstat (limited to 'hugolib/pages_language_merge_test.go')
| -rw-r--r-- | hugolib/pages_language_merge_test.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hugolib/pages_language_merge_test.go b/hugolib/pages_language_merge_test.go index b7c78836c..8a4688f16 100644 --- a/hugolib/pages_language_merge_test.go +++ b/hugolib/pages_language_merge_test.go @@ -79,6 +79,11 @@ func TestMergeLanguages(t *testing.T) { // This looks less ugly in the templates ... mergedNNResources := ri.(resource.ResourcesLanguageMerger).MergeByLanguage(enBundle.Resources) assert.Equal(6, len(mergedNNResources)) + + unchanged, err := nnSite.RegularPages.MergeByLanguageInterface(nil) + assert.NoError(err) + assert.Equal(nnSite.RegularPages, unchanged) + } func TestMergeLanguagesTemplate(t *testing.T) { |