Skip to content
Browse files

Merge pull request #5621 from rafaelfranca/fix-2492-master

Fix label_tag to merge the options hash with the object hash
  • Loading branch information...
2 parents 33164c8 + 32763a8 commit da5f65676e4e6f9ac38a3bd0003cf3b1308ff0ea @jeremy jeremy committed
Showing with 37 additions and 3 deletions.
  1. +3 −3 actionpack/lib/action_view/helpers/tags/label.rb
  2. +34 −0 actionpack/test/template/form_helper_test.rb
View
6 actionpack/lib/action_view/helpers/tags/label.rb
@@ -3,16 +3,16 @@ module Helpers
module Tags
class Label < Base #:nodoc:
def initialize(object_name, method_name, template_object, content_or_options = nil, options = nil)
+ options ||= {}
+
content_is_options = content_or_options.is_a?(Hash)
if content_is_options
- options = content_or_options
+ options.merge! content_or_options
@content = nil
else
@content = content_or_options
end
- options ||= {}
-
super(object_name, method_name, template_object, options)
end
View
34 actionpack/test/template/form_helper_test.rb
@@ -1046,6 +1046,40 @@ def test_form_for_with_nil_index_option_override
assert_dom_equal expected, output_buffer
end
+ def test_form_for_label_error_wrapping
+ form_for(@post) do |f|
+ concat f.label(:author_name, :class => 'label')
+ concat f.text_field(:author_name)
+ concat f.submit('Create post')
+ end
+
+ expected = whole_form('/posts/123', 'edit_post_123' , 'edit_post', 'patch') do
+ "<div class='field_with_errors'><label for='post_author_name' class='label'>Author name</label></div>" +
+ "<div class='field_with_errors'><input name='post[author_name]' type='text' id='post_author_name' value='' /></div>" +
+ "<input name='commit' type='submit' value='Create post' />"
+ end
+
+ assert_dom_equal expected, output_buffer
+ end
+
+ def test_form_for_label_error_wrapping_without_conventional_instance_variable
+ post = remove_instance_variable :@post
+
+ form_for(post) do |f|
+ concat f.label(:author_name, :class => 'label')
+ concat f.text_field(:author_name)
+ concat f.submit('Create post')
+ end
+
+ expected = whole_form('/posts/123', 'edit_post_123' , 'edit_post', 'patch') do
+ "<div class='field_with_errors'><label for='post_author_name' class='label'>Author name</label></div>" +
+ "<div class='field_with_errors'><input name='post[author_name]' type='text' id='post_author_name' value='' /></div>" +
+ "<input name='commit' type='submit' value='Create post' />"
+ end
+
+ assert_dom_equal expected, output_buffer
+ end
+
def test_form_for_with_namespace
form_for(@post, :namespace => 'namespace') do |f|
concat f.text_field(:title)

0 comments on commit da5f656

Please sign in to comment.
Something went wrong with that request. Please try again.