1
0
Fork 0
mirror of https://github.com/middleman/middleman.git synced 2022-11-09 12:20:27 -05:00

Revert "Frontmatter parseing changes broke some whitespace in tests, but shouldn't be a regression"

This reverts commit 5e3ddbf988.
This commit is contained in:
Thomas Reynolds 2015-09-30 10:24:12 -07:00
parent 9686c1ec7a
commit 0698d7f5aa
5 changed files with 21 additions and 23 deletions

View file

@ -7,28 +7,25 @@ Feature: Allow nesting of layouts
"""
Master
<h1>Index Title</h1>
Outer
Inner
Template
Outer
Inner
Template
"""
When I go to "/another.html"
Then I should see:
"""
Master
<h1>New Article Title</h1>
Outer
Inner
<p>The Article Content</p>
Outer
Inner
<p>The Article Content</p>
"""
Scenario: A page uses an inner layout when uses an outer layout (slim)
Given the Server is running at "nested-layout-app"
When I go to "/slim-test.html"
Then I should see:
"""
<h1>Master</h1><p>New Article Title</p><div><h2>Outer</h2><h3>Inner</h3>
<p>The Article Content</p>
"""
Then I should see "<h1>Master</h1><p>New Article Title</p><div><h2>Outer</h2><h3>Inner</h3><p>The Article Content</p>"
Scenario: A page uses an inner layout when uses an outer layout (haml)
Given the Server is running at "nested-layout-app"
@ -39,7 +36,6 @@ Feature: Allow nesting of layouts
<h1>New Article Title</h1>
Outer
Inner
<p>The Article Content</p>
"""

View file

@ -3,4 +3,5 @@ title: "New Article Title"
date: 2011-01-01
layout: inner
---
The Article Content

View file

@ -2,4 +2,5 @@
title: "Index Title"
layout: inner
---
Template

View file

@ -1,4 +1,4 @@
<% wrap_layout :outer do %>
Inner
<%= yield %>
Inner
<%= yield %>
<% end %>

View file

@ -1,4 +1,4 @@
<% wrap_layout :master do %>
Outer
<%= yield %>
Outer
<%= yield %>
<% end %>