commit b5485aeae7e1f73f18835fbf0b8eedc305d450d0
parent ccb822eb5afad210432eb46ec3727e3536a87f58
Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Fri, 29 Jan 2021 17:20:55 +0100
Add breaking tests for "map read and map write in templates"
The fix upstream in Go was reverted, so we apply a temporary patch for this in Hugo.
Updates #7293
Diffstat:
4 files changed, 41 insertions(+), 61 deletions(-)
diff --git a/hugolib/embedded_templates_norace_test.go b/hugolib/embedded_templates_norace_test.go
@@ -1,60 +0,0 @@
-// Copyright 2018 The Hugo Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build !race
-
-package hugolib
-
-import (
- "testing"
-
- qt "github.com/frankban/quicktest"
-)
-
-// Just some simple test of the embedded templates to avoid
-// https://github.com/gohugoio/hugo/issues/4757 and similar.
-// TODO(bep) fix me https://github.com/gohugoio/hugo/issues/5926
-func TestEmbeddedTemplates(t *testing.T) {
- t.Parallel()
-
- c := qt.New(t)
- c.Assert(true, qt.Equals, true)
-
- home := []string{"index.html", `
-GA:
-{{ template "_internal/google_analytics.html" . }}
-
-GA async:
-
-{{ template "_internal/google_analytics_async.html" . }}
-
-Disqus:
-
-{{ template "_internal/disqus.html" . }}
-
-`}
-
- b := newTestSitesBuilder(t)
- b.WithSimpleConfigFile().WithTemplatesAdded(home...)
-
- b.Build(BuildCfg{})
-
- // Gheck GA regular and async
- b.AssertFileContent("public/index.html",
- "'anonymizeIp', true",
- "'script','https://www.google-analytics.com/analytics.js','ga');\n\tga('create', 'ga_id', 'auto')",
- "<script async src='https://www.google-analytics.com/analytics.js'>")
-
- // Disqus
- b.AssertFileContent("public/index.html", "\"disqus_shortname\" + '.disqus.com/embed.js';")
-}
diff --git a/hugolib/embedded_templates_test.go b/hugolib/embedded_templates_test.go
@@ -15,6 +15,8 @@ package hugolib
import (
"testing"
+
+ qt "github.com/frankban/quicktest"
)
func TestInternalTemplatesImage(t *testing.T) {
@@ -77,3 +79,40 @@ title: My Site
<meta itemprop="image" content="https://example.org/siteimg1.jpg"/>
`)
}
+
+// Just some simple test of the embedded templates to avoid
+// https://github.com/gohugoio/hugo/issues/4757 and similar.
+func TestEmbeddedTemplates(t *testing.T) {
+ t.Parallel()
+
+ c := qt.New(t)
+ c.Assert(true, qt.Equals, true)
+
+ home := []string{"index.html", `
+GA:
+{{ template "_internal/google_analytics.html" . }}
+
+GA async:
+
+{{ template "_internal/google_analytics_async.html" . }}
+
+Disqus:
+
+{{ template "_internal/disqus.html" . }}
+
+`}
+
+ b := newTestSitesBuilder(t)
+ b.WithSimpleConfigFile().WithTemplatesAdded(home...)
+
+ b.Build(BuildCfg{})
+
+ // Gheck GA regular and async
+ b.AssertFileContent("public/index.html",
+ "'anonymizeIp', true",
+ "'script','https://www.google-analytics.com/analytics.js','ga');\n\tga('create', 'ga_id', 'auto')",
+ "<script async src='https://www.google-analytics.com/analytics.js'>")
+
+ // Disqus
+ b.AssertFileContent("public/index.html", "\"disqus_shortname\" + '.disqus.com/embed.js';")
+}
diff --git a/scripts/fork_go_templates/main.go b/scripts/fork_go_templates/main.go
@@ -75,6 +75,7 @@ var (
"\"text/template\"\n", "template \"github.com/gohugoio/hugo/tpl/internal/go_templates/texttemplate\"\n",
`"html/template"`, `htmltemplate "html/template"`,
`"fmt"`, `htmltemplate "html/template"`,
+ `t.Skip("this test currently fails with -race; see issue #39807")`, `// t.Skip("this test currently fails with -race; see issue #39807")`,
)
)
diff --git a/tpl/internal/go_templates/htmltemplate/exec_test.go b/tpl/internal/go_templates/htmltemplate/exec_test.go
@@ -1724,7 +1724,7 @@ var v = "v";
`
func TestEscapeRace(t *testing.T) {
- t.Skip("this test currently fails with -race; see issue #39807")
+ // t.Skip("this test currently fails with -race; see issue #39807")
tmpl := New("")
_, err := tmpl.New("templ.html").Parse(raceText)