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

Merge pull request #552 from cwebbdesign/master

Browse source 
Adding tests for setting layout in frontmatter on pages already defined in config.rb
This commit is contained in:
Thomas Reynolds 2012-07-29 10:12:06 -07:00
parent 4410d858f2 d0a36f0879
commit 0625d96e43
5 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
middleman-core/features/frontmatter_page_settings.feature
View file

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

2
middleman-core/fixtures/frontmatter-settings-app/config.rb
View file

@ -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'

2
middleman-core/fixtures/frontmatter-settings-app/source/layouts/override.erb Normal file
View file

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

4
middleman-core/fixtures/frontmatter-settings-app/source/override_layout.html.erb Normal file
View file

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

4
middleman-core/fixtures/frontmatter-settings-app/source/page_mentioned.html.erb Normal file
View file

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