Do not call fields_for from form_for, to avoid instantiating two builders

Conflicts:
	actionpack/lib/action_view/helpers/form_helper.rb
	actionpack/test/template/form_helper_test.rb

1 files changed, 13 insertions, 1 deletions

diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 49a325af79..7b35424ec7 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -755,7 +755,6 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
-
   def test_form_for_with_format
     form_for(@post, :format => :json, :html => { :id => "edit_post_123", :class => "edit_post" }) do |f|
       concat f.label(:title)
@@ -2217,6 +2216,19 @@ class FormHelperTest < ActionView::TestCase
     assert_equal "fields", output
   end
 
+  def test_form_for_only_instantiates_builder_once
+    initialization_count = 0
+    builder_class = Class.new(ActionView::Helpers::FormBuilder) do
+      define_method :initialize do |*args|
+        super(*args)
+        initialization_count += 1
+      end
+    end
+
+    form_for(@post, :builder => builder_class) { }
+    assert_equal 1, initialization_count, 'form builder instantiated more than once'
+  end
+
   protected
     def protect_against_forgery?
       false