diff --git a/middleman-core/features/nested_layouts.feature b/middleman-core/features/nested_layouts.feature index d70a7e23..8ff61bb8 100644 --- a/middleman-core/features/nested_layouts.feature +++ b/middleman-core/features/nested_layouts.feature @@ -7,26 +7,29 @@ Feature: Allow nesting of layouts """ Master

Index Title

- Outer - Inner - Template - + Outer + Inner + Template """ When I go to "/another.html" Then I should see: """ Master

New Article Title

- Outer - Inner -

The Article Content

+ Outer + Inner +

The Article Content

""" - + 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 "

Master

New Article Title

Outer

Inner

The Article Content

" - + Then I should see: + """ +

Master

New Article Title

Outer

Inner

+

The Article Content

+ """ + Scenario: A page uses an inner layout when uses an outer layout (haml) Given the Server is running at "nested-layout-app" When I go to "/haml-test.html" @@ -36,6 +39,7 @@ Feature: Allow nesting of layouts

New Article Title

Outer Inner +

The Article Content

""" diff --git a/middleman-core/fixtures/nested-layout-app/source/another.html.markdown b/middleman-core/fixtures/nested-layout-app/source/another.html.markdown index 562ceae5..4d93a75f 100644 --- a/middleman-core/fixtures/nested-layout-app/source/another.html.markdown +++ b/middleman-core/fixtures/nested-layout-app/source/another.html.markdown @@ -1,7 +1,6 @@ ---- +--- title: "New Article Title" date: 2011-01-01 layout: inner --- - The Article Content diff --git a/middleman-core/fixtures/nested-layout-app/source/index.html.erb b/middleman-core/fixtures/nested-layout-app/source/index.html.erb index 253e9cea..8988e95a 100644 --- a/middleman-core/fixtures/nested-layout-app/source/index.html.erb +++ b/middleman-core/fixtures/nested-layout-app/source/index.html.erb @@ -1,6 +1,5 @@ ---- +--- title: "Index Title" layout: inner --- - -Template \ No newline at end of file +Template diff --git a/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb b/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb index 62dfc12b..11e69061 100644 --- a/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb +++ b/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb @@ -1,4 +1,4 @@ <% wrap_layout :outer do %> - Inner - <%= yield %> -<% end %> \ No newline at end of file +Inner +<%= yield %> +<% end %> diff --git a/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb b/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb index 643d8efc..510956f2 100644 --- a/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb +++ b/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb @@ -1,4 +1,4 @@ <% wrap_layout :master do %> - Outer - <%= yield %> -<% end %> \ No newline at end of file +Outer +<%= yield %> +<% end %>