Merge pull request #552 from cwebbdesign/master

Adding tests for setting layout in frontmatter on pages already defined in config.rb

middleman-core/features/frontmatter_page_settings.feature

@@ -31,3 +31,13 @@ Feature: Setting page settings through frontmatter
       """
     When I go to "/ignored.html"
     Then I should see "This file is no longer ignored."
+
+  Scenario: Overriding layout through frontmatter
+    Given the Server is running at "frontmatter-settings-app"
+    When I go to "/override_layout.html"
+    Then I should see "Layout in use: Override"
+
+  Scenario: Setting layout through frontmatter even if page is mentioned in config
+    Given the Server is running at "frontmatter-settings-app"
+    When I go to "/page_mentioned.html"
+    Then I should see "Layout in use: Override"

middleman-core/fixtures/frontmatter-settings-app/config.rb

@@ -1,2 +1,4 @@
 # Proxy ignored.html, which should ignore itself through a frontmatter
 page 'proxied.html', :proxy => 'ignored.html'
+page 'override_layout.html', :layout => :alternate
+page 'page_mentioned.html'

middleman-core/fixtures/frontmatter-settings-app/source/layouts/override.erb

@@ -0,0 +1,2 @@
+<%= yield %>
+ Override.

middleman-core/fixtures/frontmatter-settings-app/source/override_layout.html.erb

@@ -0,0 +1,4 @@
+---
+layout: override
+---
+Layout in use:

middleman-core/fixtures/frontmatter-settings-app/source/page_mentioned.html.erb

@@ -0,0 +1,4 @@
+---
+layout: override
+---
+Layout in use: