shithub: hugo

Download patch

ref: f404603340067533ef27d2c3bd1806335812001a
parent: d11f37d97cb3b1298f04f2fbc6ba643d93509b35
author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
date: Mon Feb 6 21:04:12 EST 2017 

Revert "hugolib: Add some baseof test variants"

This reverts commit d11f37d97cb3b1298f04f2fbc6ba643d93509b35.

Will have to look more closely into this.

See #2995


--- a/hugolib/template_test.go
+++ b/hugolib/template_test.go
@@ -42,16 +42,9 @@
 				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(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 @@
 				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 @@
 				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")
 			},
 		},
 		{
-- 
⑨