Revert "hugolib: Add some baseof test variants"

This reverts commit d11f37d97cb3b1298f04f2fbc6ba643d93509b35.

Will have to look more closely into this.

See #2995

diff --git a/hugolib/template_test.go b/hugolib/template_test.go
index fa27dfc6640d118aa4168987d5ae834d87d26b55..2690b172aabde8c4e4269e826cafaf6a1d255c97 100644 (file)
--- 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")
                        },
                },
                {