Ticket #10422: action_view_hidden_fields_tag_proc.diff

actionpack/test/controller/request_forgery_protection_test.rb

@@ -70 +70 @@
-    assert_select 'form>div>input[name=?][value=?]', 'authenticity_token', @token
-  end
-  
+  def test_should_render_form_with_token_tag_inside_hidden_fields_tag_proc
+    default_proc = ActionView::Base.hidden_fields_tag_proc
+    ActionView::Base.hidden_fields_tag_proc = Proc.new {|fields| "<proctag>#{fields}</proctag>"}
+    get :index
+    assert_select 'form>proctag>input[name=?][value=?]', 'authenticity_token', @token    
+  ensure
+    ActionView::Base.hidden_fields_tag_proc = default_proc
+  end
+  
-  def test_should_render_button_to_with_token_tag
-    get :show_button
-    assert_select 'form>div>input[name=?][value=?]', 'authenticity_token', @token
-  end
-
+
-  def test_should_allow_get
-    get :index
-    assert_response :success

actionpack/test/template/form_tag_helper_test.rb

@@ -45 +45 @@
-    expected = %(<form action="http://www.example.com" method="post"><div style='margin:0;padding:0'><input type="hidden" name="_method" value="delete" /></div>)
-    assert_dom_equal expected, actual
-  end
+  
+  def test_form_tag_with_method_put_with_custom_hidden_fields_tag_proc
+    default_proc = ActionView::Base.hidden_fields_tag_proc
+    ActionView::Base.hidden_fields_tag_proc = Proc.new {|fields| "<proctag>#{fields}</proctag>"}
+    actual = form_tag({}, { :method => :put })    
+    expected = %(<form action="http://www.example.com" method="post"><proctag><input type="hidden" name="_method" value="put" /></proctag>)
+    assert_dom_equal expected, actual
+  ensure
+    ActionView::Base.hidden_fields_tag_proc = default_proc
+  end
-
+  def test_form_tag_with_method_delete_with_custom_hidden_fields_tag_proc
+    default_proc = ActionView::Base.hidden_fields_tag_proc
+    ActionView::Base.hidden_fields_tag_proc = Proc.new {|fields| "<proctag>#{fields}</proctag>"}
+    actual = form_tag({}, { :method => :delete })
+    expected = %(<form action="http://www.example.com" method="post"><proctag><input type="hidden" name="_method" value="delete" /></proctag>)
+    assert_dom_equal expected, actual
+  ensure
+    ActionView::Base.hidden_fields_tag_proc = default_proc
+  end
+
-  def test_form_tag_with_block
-    _erbout = ''
-    form_tag("http://example.com") { _erbout.concat "Hello world!" }

actionpack/lib/action_view/helpers/form_tag_helper.rb

@@ -2 +2 @@
-require 'action_view/helpers/tag_helper'
-
-module ActionView
+  class Base
+    # Specify the proc used to surround hidden form fields with a block level element.
+    #
+    # Defaults to:
+    #   Proc.new{|fields| "<div style=\"margin:0;padding:0\">#{fields}</div>"}
+    @@hidden_fields_tag_proc = Proc.new{|fields| "<div style=\"margin:0;padding:0\">#{fields}</div>"}
+    cattr_accessor :hidden_fields_tag_proc
+  end
-  module Helpers
-    # Provides a number of methods for creating form tags that doesn't rely on an ActiveRecord object assigned to the template like
-    # FormHelper does. Instead, you provide the names and values manually.
@@ -401 +409 @@
-              ''
-            when /^post$/i, "", nil
-              html_options["method"] = "post"
-content_tag(:div, token_tag, :style => 'margin:0;padding:0'
+Base.hidden_fields_tag_proc.call(token_tag
-            else
-              html_options["method"] = "post"
-content_tag(:div, tag(:input, :type => "hidden", :name => "_method", :value => method) + token_tag, :style => 'margin:0;padding:0'
+Base.hidden_fields_tag_proc.call(tag(:input, :type => "hidden", :name => "_method", :value => method) + token_tag
-          end
-        end
-