diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-07-09 10:29:18 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-07-09 10:29:18 +0200 |
commit | 179de5f5bc0336c9c279e851ea13202b7ffe572e (patch) | |
tree | a7f058536f5f0a240b352dbadad2def3f1a28b48 /output/layout_test.go | |
parent | 5dc1f95b63267fe93aca09b3bf0d59b2484c21e4 (diff) |
Revert "Consider root and current section's content type if set in front matter"
This reverts commit c790029e1dbb0b66af18d05764bd6045deb2e180.
Diffstat (limited to 'output/layout_test.go')
-rw-r--r-- | output/layout_test.go | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/output/layout_test.go b/output/layout_test.go index 6754ddb39..4b958e9ff 100644 --- a/output/layout_test.go +++ b/output/layout_test.go @@ -90,13 +90,8 @@ func TestLayout(t *testing.T) { []string{"_default/mylayout.amp.html", "_default/single.amp.html", "_default/mylayout.html", "_default/single.html"}, 4}, {"Page with layout and type", LayoutDescriptor{Kind: "page", Layout: "mylayout", Type: "myttype"}, "", ampType, []string{"myttype/mylayout.amp.html", "myttype/single.amp.html", "myttype/mylayout.html"}, 8}, - {"Page with layout and type with subtype", LayoutDescriptor{Kind: "page", Layout: "mylayout", Type: "myttype/mysubtype", TypeCurrentSection: "cst"}, "", ampType, - []string{"myttype/mysubtype/mylayout.amp.html", "myttype/mysubtype/single.amp.html", "myttype/mysubtype/mylayout.html"}, 12}, - {"Page with type in section", LayoutDescriptor{Kind: "page", TypeCurrentSection: "cst"}, "", ampType, - []string{"cst/single.amp.html", "cst/single.html", "_default/single.amp.html", "_default/single.html"}, 4}, - {"Page with type in root section", LayoutDescriptor{Kind: "page", TypeFirstSection: "cst"}, "", ampType, - []string{"cst/single.amp.html", "cst/single.html", "_default/single.amp.html", "_default/single.html"}, 4}, - + {"Page with layout and type with subtype", LayoutDescriptor{Kind: "page", Layout: "mylayout", Type: "myttype/mysubtype"}, "", ampType, + []string{"myttype/mysubtype/mylayout.amp.html", "myttype/mysubtype/single.amp.html", "myttype/mysubtype/mylayout.html"}, 8}, // RSS {"RSS Home", LayoutDescriptor{Kind: "home"}, "", RSSFormat, []string{"index.rss.xml", "home.rss.xml", "rss.xml"}, 15}, |