Merge pull request #5191 from rafaelfranca/fix-393

Add a new line after the textarea opening tag.
rails · Feb 27, 2012 · a4e4d2855bbad1c1400fb89ba663f7193d76dc10 · a4e4d28
2 parents 699e460 + a6074c3
commit a4e4d2855bbad1c1400fb89ba663f7193d76dc10
Unified Split

Showing with 38 additions and 38 deletions.

+1 −1 actionpack/lib/action_view/helpers/tags/text_area.rb

+1 −1 actionpack/test/template/active_model_helper_test.rb

+36 −36 actionpack/test/template/form_helper_test.rb
diff --git a/actionpack/lib/action_view/helpers/tags/text_area.rb b/actionpack/lib/action_view/helpers/tags/text_area.rb
@@ -12,7 +12,7 @@ def render
             options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split)
           end
 
-          content_tag("textarea", ERB::Util.html_escape(options.delete('value') || value_before_type_cast(object)), options)
+          content_tag("textarea", "\n#{options.delete('value') || value_before_type_cast(object)}", options)
         end
       end
     end

diff --git a/actionpack/test/template/active_model_helper_test.rb b/actionpack/test/template/active_model_helper_test.rb
@@ -29,7 +29,7 @@ def setup
 
   def test_text_area_with_errors
     assert_dom_equal(
-      %(<div class="field_with_errors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div>),
+      %(<div class="field_with_errors"><textarea cols="40" id="post_body" name="post[body]" rows="20">\nBack to the hill and over it again!</textarea></div>),
       text_area("post", "body")
     )
   end