diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-05-16 13:52:51 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-05-16 13:55:29 -0700 |
| commit | ade756fe42423033bae8e5aea8f58782f7a6c517 (patch) | |
| tree | 5fecc7c19ef8b6984765928999d8ddbb99771afd /actionpack/test/fixtures | |
| parent | 821e15e5f2d9ef2aa43918a16cbd00f40c221e95 (diff) | |
| download | rails-ade756fe42423033bae8e5aea8f58782f7a6c517.tar.gz rails-ade756fe42423033bae8e5aea8f58782f7a6c517.tar.bz2 rails-ade756fe42423033bae8e5aea8f58782f7a6c517.zip | |
Moved encoding work in progress to a feature branch.
This reverts commits af0d1a88157942c6e6398dbf73891cff1e152405 and 64d109e3539ad600f58536d3ecabd2f87b67fd1c.
Diffstat (limited to 'actionpack/test/fixtures')
4 files changed, 5 insertions, 4 deletions
diff --git a/actionpack/test/fixtures/test/content_for.erb b/actionpack/test/fixtures/test/content_for.erb index 1fb829f54c..0e47ca8c3d 100644 --- a/actionpack/test/fixtures/test/content_for.erb +++ b/actionpack/test/fixtures/test/content_for.erb @@ -1 +1,2 @@ -<% content_for :title do -%>Putting stuff in the title!<% end -%>Great stuff!
\ No newline at end of file +<% content_for :title do %>Putting stuff in the title!<% end %> +Great stuff!
\ No newline at end of file diff --git a/actionpack/test/fixtures/test/content_for_concatenated.erb b/actionpack/test/fixtures/test/content_for_concatenated.erb index e65f629574..fb6b4b05d7 100644 --- a/actionpack/test/fixtures/test/content_for_concatenated.erb +++ b/actionpack/test/fixtures/test/content_for_concatenated.erb @@ -1,3 +1,3 @@ <% content_for :title, "Putting stuff " - content_for :title, "in the title!" -%> + content_for :title, "in the title!" %> Great stuff!
\ No newline at end of file diff --git a/actionpack/test/fixtures/test/content_for_with_parameter.erb b/actionpack/test/fixtures/test/content_for_with_parameter.erb index aeb6f73ce0..57aecbac05 100644 --- a/actionpack/test/fixtures/test/content_for_with_parameter.erb +++ b/actionpack/test/fixtures/test/content_for_with_parameter.erb @@ -1,2 +1,2 @@ -<% content_for :title, "Putting stuff in the title!" -%> +<% content_for :title, "Putting stuff in the title!" %> Great stuff!
\ No newline at end of file diff --git a/actionpack/test/fixtures/test/non_erb_block_content_for.builder b/actionpack/test/fixtures/test/non_erb_block_content_for.builder index d539a425a4..a94643561c 100644 --- a/actionpack/test/fixtures/test/non_erb_block_content_for.builder +++ b/actionpack/test/fixtures/test/non_erb_block_content_for.builder @@ -1,4 +1,4 @@ content_for :title do 'Putting stuff in the title!' end -xml << "Great stuff!" +xml << "\nGreat stuff!" |