deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

24
middleman-core/features/nested_layouts.feature
View file

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

3
middleman-core/fixtures/nested-layout-app/source/another.html.markdown
View file

@ -1,6 +1,7 @@
--- ---
title: "New Article Title" title: "New Article Title"
date: 2011-01-01 date: 2011-01-01
layout: inner layout: inner
--- ---
The Article Content The Article Content

5
middleman-core/fixtures/nested-layout-app/source/index.html.erb
View file

@ -1,5 +1,6 @@
--- ---
title: "Index Title" title: "Index Title"
layout: inner layout: inner
--- ---
Template
Template

6
middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb
View file

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

6
middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb
View file

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