diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-02-07 02:04:12 +0700 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-02-07 02:04:12 +0700 |
| commit | f404603340067533ef27d2c3bd1806335812001a (patch) | |
| tree | c644cdba6e01808a9c9882ea97e5067458d28dea /hugolib/template_test.go | |
| parent | d11f37d97cb3b1298f04f2fbc6ba643d93509b35 (diff) | |
Revert "hugolib: Add some baseof test variants"
This reverts commit d11f37d97cb3b1298f04f2fbc6ba643d93509b35.
Will have to look more closely into this.
See #2995
Diffstat (limited to 'hugolib/template_test.go')
| -rw-r--r-- | hugolib/template_test.go | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/hugolib/template_test.go b/hugolib/template_test.go index fa27dfc66..2690b172a 100644 --- a/hugolib/template_test.go +++ b/hugolib/template_test.go @@ -42,16 +42,9 @@ func TestBaseGoTemplate(t *testing.T) { writeSource(t, fs, filepath.Join("layouts", "section", "sect-baseof.html"), `Base: {{block "main" .}}block{{end}}`) writeSource(t, fs, filepath.Join("layouts", "section", "sect.html"), `{{define "main"}}sect{{ end }}`) - // See #2995 - writeSource(t, fs, filepath.Join("layouts", "sect", "single.html"), `{{define "main"}}single sect{{ end }}`) - - // Should not be picked. - writeSource(t, fs, filepath.Join("layouts", "_default", "baseof.html"), `Base: {{block "main" .}}NO{{end}}`) - }, func(t *testing.T) { assertFileContent(t, fs, filepath.Join("public", "sect", "index.html"), false, "Base: sect") - assertFileContent(t, fs, filepath.Join("public", "sect", "page", "index.html"), false, "Base: single sect") }, }, { @@ -59,6 +52,7 @@ func TestBaseGoTemplate(t *testing.T) { func(t *testing.T) { writeSource(t, fs, filepath.Join("layouts", "baseof.html"), `Base: {{block "main" .}}block{{end}}`) writeSource(t, fs, filepath.Join("layouts", "index.html"), `{{define "main"}}index{{ end }}`) + }, func(t *testing.T) { assertFileContent(t, fs, filepath.Join("public", "index.html"), false, "Base: index") @@ -94,16 +88,9 @@ func TestBaseGoTemplate(t *testing.T) { writeSource(t, fs, filepath.Join("themes", "mytheme", "layouts", "section", "sect-baseof.html"), `Base Theme: {{block "main" .}}block{{end}}`) writeSource(t, fs, filepath.Join("layouts", "section", "sect.html"), `{{define "main"}}sect{{ end }}`) - // See #2995 - writeSource(t, fs, filepath.Join("themes", "mytheme", "layouts", "sect", "single.html"), `{{define "main"}}single sect{{ end }}`) - - // Should not be picked. - writeSource(t, fs, filepath.Join("themes", "mytheme", "layouts", "_default", "baseof.html"), `Base: {{block "main" .}}NO{{end}}`) - }, func(t *testing.T) { assertFileContent(t, fs, filepath.Join("public", "sect", "index.html"), false, "Base: sect") - assertFileContent(t, fs, filepath.Join("public", "sect", "page", "index.html"), false, "Base: single sect") }, }, { @@ -113,16 +100,9 @@ func TestBaseGoTemplate(t *testing.T) { writeSource(t, fs, filepath.Join("themes", "mytheme", "layouts", "section", "sect-baseof.html"), `Base Theme: {{block "main" .}}block{{end}}`) writeSource(t, fs, filepath.Join("layouts", "section", "sect.html"), `{{define "main"}}sect{{ end }}`) - // See #2995 - writeSource(t, fs, filepath.Join("themes", "mytheme", "layouts", "sect", "single.html"), `{{define "main"}}single sect{{ end }}`) - - // Should not be picked. - writeSource(t, fs, filepath.Join("themes", "mytheme", "layouts", "_default", "baseof.html"), `Base: {{block "main" .}}NO{{end}}`) - }, func(t *testing.T) { assertFileContent(t, fs, filepath.Join("public", "sect", "index.html"), false, "Base Theme: sect") - assertFileContent(t, fs, filepath.Join("public", "sect", "page", "index.html"), false, "Base: single sect") }, }, { |