Ticket #8270: more_options_on_error_messages_for_with_tests_rebased.diff

actionpack/test/template/active_record_helper_test.rb

@@ -207 +207 @@
-
-    # should space object name
-    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this chunky bacon from being saved</h2><p>There were problems with the following fields:</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for(:user, :post, :object_name => "chunky_bacon")
+
+    # hide header and explanation messages with nil or empty string
+    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for(:user, :post, :header_message => nil, :message => "")
+
+    # override header and explanation messages
+    header_message = "Yikes! Some errors"
+    message = "Please fix the following fields and resubmit:"
+    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>#{header_message}</h2><p>#{message}</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for(:user, :post, :header_message => header_message, :message => message)
-  end
-  
-  def test_error_messages_for_non_instance_variable

actionpack/lib/action_view/helpers/active_record_helper.rb

@@ -106 +106 @@
-      # * <tt>header_tag</tt> - Used for the header of the error div (default: h2)
-      # * <tt>id</tt> - The id of the error div (default: errorExplanation)
-      # * <tt>class</tt> - The class of the error div (default: errorExplanation)
-
-
-
-
-
+
+
+
+
-      #
-      # To specify the display for one object, you simply provide its name as a parameter.  For example, for the +User+ model:
-      # 
@@ -147 +146 @@
-              html[key] = 'errorExplanation'
-            end
-          end
-
+
+
+
-          error_messages = objects.map {|object| object.errors.full_messages.map {|msg| content_tag(:li, msg) } }
-
-
-
-
-
-
+
+
+
+
+
+
+
-        else
-          ''
-        end