From 0698d7f5aa9dd00215af4395a76b3608ccc807c2 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Wed, 30 Sep 2015 10:24:12 -0700
Subject: [PATCH] Revert "Frontmatter parseing changes broke some whitespace in
 tests, but shouldn't be a regression"

This reverts commit 5e3ddbf988d7ef2f9eb97aed495455a6d5b34a82.
---
 .../features/nested_layouts.feature           | 24 ++++++++-----------
 .../source/another.html.markdown              |  3 ++-
 .../nested-layout-app/source/index.html.erb   |  5 ++--
 .../source/layouts/inner.erb                  |  6 ++---
 .../source/layouts/outer.erb                  |  6 ++---
 5 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/middleman-core/features/nested_layouts.feature b/middleman-core/features/nested_layouts.feature
index 8ff61bb8..d70a7e23 100644
--- a/middleman-core/features/nested_layouts.feature
+++ b/middleman-core/features/nested_layouts.feature
@@ -7,29 +7,26 @@ 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"
     When I go to "/haml-test.html"
@@ -39,7 +36,6 @@ Feature: Allow nesting of layouts
     <h1>New Article Title</h1>
     Outer
     Inner
-
     <p>The Article Content</p>
     """
 
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 4d93a75f..562ceae5 100644
--- a/middleman-core/fixtures/nested-layout-app/source/another.html.markdown
+++ b/middleman-core/fixtures/nested-layout-app/source/another.html.markdown
@@ -1,6 +1,7 @@
----
+--- 
 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 8988e95a..253e9cea 100644
--- a/middleman-core/fixtures/nested-layout-app/source/index.html.erb
+++ b/middleman-core/fixtures/nested-layout-app/source/index.html.erb
@@ -1,5 +1,6 @@
----
+--- 
 title: "Index Title"
 layout: inner
 ---
-Template
+
+Template
\ No newline at end of file
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 11e69061..62dfc12b 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 %>
+  Inner
+  <%= yield %>
+<% end %>
\ No newline at end of file
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 510956f2..643d8efc 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 %>
+  Outer
+  <%= yield %>
+<% end %>
\ No newline at end of file