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

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

Browse source
This commit is contained in:
Thomas Reynolds 2015-09-29 10:27:53 -07:00
parent d9fc7a95e1
commit 5e3ddbf988
5 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,25 +7,28 @@ 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 "<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) 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"
@ -36,6 +39,7 @@ 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>
""" """

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

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

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

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

4
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 %>

4
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 %>