diff options
| author | José Valim <jose.valim@gmail.com> | 2011-11-27 06:47:32 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-11-27 06:47:32 -0800 |
| commit | ee8db25e64df7fa5870781957dcdc67fa2a1d8e1 (patch) | |
| tree | fab94e9158920a0ae33c23b0f8072800d298189b /actionpack | |
| parent | 3c81fc3b91ddfd4d115a7001640588eb93249261 (diff) | |
| parent | bc81ba2451a6a6c5507ad497cf838935e9d1ece2 (diff) | |
| download | rails-ee8db25e64df7fa5870781957dcdc67fa2a1d8e1.tar.gz rails-ee8db25e64df7fa5870781957dcdc67fa2a1d8e1.tar.bz2 rails-ee8db25e64df7fa5870781957dcdc67fa2a1d8e1.zip | |
Merge pull request #3772 from lest/label-with-block
fix label with block in erb
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/fixtures/test/_label_with_block.erb | 4 | ||||
| -rw-r--r-- | actionpack/test/template/form_helper_test.rb | 7 |
3 files changed, 13 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index d687866d0d..4471a2b541 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -960,7 +960,7 @@ module ActionView end class InstanceTag - include Helpers::CaptureHelper, Context, Helpers::TagHelper, Helpers::FormTagHelper + include Helpers::TagHelper, Helpers::FormTagHelper attr_reader :object, :method_name, :object_name @@ -992,7 +992,7 @@ module ActionView options["for"] ||= name_and_id["id"] if block_given? - label_tag(name_and_id["id"], options, &block) + @template_object.label_tag(name_and_id["id"], options, &block) else content = if text.blank? object_name.gsub!(/\[(.*)_attributes\]\[\d\]/, '.\1') diff --git a/actionpack/test/fixtures/test/_label_with_block.erb b/actionpack/test/fixtures/test/_label_with_block.erb new file mode 100644 index 0000000000..40117e594e --- /dev/null +++ b/actionpack/test/fixtures/test/_label_with_block.erb @@ -0,0 +1,4 @@ +<%= label 'post', 'message' do %> + Message + <%= text_field 'post', 'message' %> +<% end %> diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb index ccedcd7dac..0758106a40 100644 --- a/actionpack/test/template/form_helper_test.rb +++ b/actionpack/test/template/form_helper_test.rb @@ -230,6 +230,13 @@ class FormHelperTest < ActionView::TestCase assert_dom_equal('<label for="post_title">The title, please:</label>', label(:post, :title) { "The title, please:" }) end + def test_label_with_block_in_erb + path = ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH) + view_paths = ActionView::PathSet.new([path]) + view = ActionView::Base.new(view_paths) + assert_equal "<label for=\"post_message\">\n Message\n <input id=\"post_message\" name=\"post[message]\" size=\"30\" type=\"text\" />\n</label>", view.render("test/label_with_block") + end + def test_text_field assert_dom_equal( '<input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />', text_field("post", "title") |