Frontmatter parseing changes broke some whitespace in tests, but shouldn't be a regression
This commit is contained in:
parent
d9fc7a95e1
commit
5e3ddbf988
|
@ -7,25 +7,28 @@ 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"
|
||||
|
@ -36,6 +39,7 @@ Feature: Allow nesting of layouts
|
|||
<h1>New Article Title</h1>
|
||||
Outer
|
||||
Inner
|
||||
|
||||
<p>The Article Content</p>
|
||||
"""
|
||||
|
||||
|
|
|
@ -3,5 +3,4 @@ title: "New Article Title"
|
|||
date: 2011-01-01
|
||||
layout: inner
|
||||
---
|
||||
|
||||
The Article Content
|
||||
|
|
|
@ -2,5 +2,4 @@
|
|||
title: "Index Title"
|
||||
layout: inner
|
||||
---
|
||||
|
||||
Template
|
|
@ -1,4 +1,4 @@
|
|||
<% wrap_layout :outer do %>
|
||||
Inner
|
||||
<%= yield %>
|
||||
Inner
|
||||
<%= yield %>
|
||||
<% end %>
|
|
@ -1,4 +1,4 @@
|
|||
<% wrap_layout :master do %>
|
||||
Outer
|
||||
<%= yield %>
|
||||
Outer
|
||||
<%= yield %>
|
||||
<% end %>
|
Loading…
Reference in a new issue