Ticket #2448: simple_format_html_options.diff

actionpack/test/template/text_helper_test.rb

@@ -24 +24 @@
-
-    text = "A\r\n  \nB\n\n\r\n\t\nC\nD".freeze
-    assert_equal "<p>A\n<br />  \n<br />B</p>\n\n<p>\t\n<br />C\n<br />D</p>", simple_format(text)
+    
+     assert_equal %q(<p class="test">This is a classy test</p>), simple_format("This is a classy test", :class => 'test')
+     assert_equal %Q(<p class="test">para 1</p>\n\n<p class="test">para 2</p>), simple_format("para 1\n\npara 2", :class => 'test')     
-  end
-
-  def test_truncate

actionpack/lib/action_view/helpers/text_helper.rb

@@ -291 +291 @@
-      # considered as a linebreak and a <tt><br /></tt> tag is appended. This
-      # method does not remove the newlines from the +text+. 
-      #
+      # You can pass any HTML attributes into <tt>html_options</tt>.  These 
+      # will be added to all created paragraphs.
-      # ==== Examples
-      #   my_text = "Here is some basic text...\n...with a line break."
-      #
@@ -301 +303 @@
-      #
-      #   simple_format(more_text)
-      #   # => "<p>We want to put a paragraph...</p>\n\n<p>...right there.</p>"
-
+
+
+
+
-        content_tag 'p', text.to_s.
-          gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
-
-
+
+
+
-      end
-
-      # Turns all URLs and e-mail addresses into clickable links. The +link+ parameter