Merge pull request #927 from middleman/content_for_escaping

content_for is escaping .erb
This commit is contained in:
Thomas Reynolds 2013-06-07 10:08:37 -07:00
commit efc0f9961b
4 changed files with 7 additions and 6 deletions

View file

@ -3,14 +3,14 @@ Feature: Support content_for and yield_content helpers
Scenario: content_for works as expected in erb
Given the Server is running at "content-for-app"
When I go to "/content_for_erb.html"
Then I should see "In Layout: I am the yielded content erb"
Then I should see "In Layout: I am the yielded content erb <s>with html tags</s>"
Scenario: content_for works as expected in haml
Given the Server is running at "content-for-app"
When I go to "/content_for_haml.html"
Then I should see "In Layout: I am the yielded content haml"
Then I should see "In Layout: I am the yielded content haml <s>with html tags</s>"
Scenario: content_for works as expected in slim
Given the Server is running at "content-for-app"
When I go to "/content_for_slim.html"
Then I should see "In Layout: I am the yielded content slim"
Then I should see "In Layout: I am the yielded content slim <s>with html tags</s>"

View file

@ -1,5 +1,5 @@
<% content_for :from_template do %>
I am the yielded content erb
I am the yielded content erb <s>with html tags</s>
<% end %>
I am in the template

View file

@ -1,4 +1,4 @@
- content_for :from_template do
= "I am the yielded content haml"
= "I am the yielded content haml <s>with html tags</s>"
%p I am in the template

View file

@ -1,4 +1,5 @@
- content_for :from_template do
| I am the yielded content slim
| I am the yielded content slim
s with html tags
| I am in the template