Remove input, form, error_messages_for and error_message_on from the framework. If you think you will miss them, feel free to use the dynamic_form plugin available at http://github.com/rails/dynamic_form

5 files changed, 32 insertions, 636 deletions

diff --git a/actionpack/lib/action_view/helpers/active_model_helper.rb b/actionpack/lib/action_view/helpers/active_model_helper.rb
index 44e193f18e..92530246a6 100644
--- a/actionpack/lib/action_view/helpers/active_model_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_model_helper.rb
@@ -1,8 +1,6 @@
-require 'cgi'
 require 'action_view/helpers/form_helper'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/enumerable'
-require 'active_support/core_ext/kernel/reporting'
 require 'active_support/core_ext/object/blank'
 
 module ActionView
@@ -14,252 +12,29 @@ module ActionView
   end
 
   module Helpers
-    # The Active Record Helper makes it easier to create forms for records kept in instance variables. The most far-reaching is the +form+
-    # method that creates a complete form for all the basic content types of the record (not associations or aggregations, though). This
-    # is a great way of making the record quickly available for editing, but likely to prove lackluster for a complicated real-world form.
-    # In that case, it's better to use the +input+ method and the specialized +form+ methods in link:classes/ActionView/Helpers/FormHelper.html
     module ActiveModelHelper
-      # Returns a default input tag for the type of object returned by the method. For example, if <tt>@post</tt>
-      # has an attribute +title+ mapped to a +VARCHAR+ column that holds "Hello World":
-      #
-      #   input("post", "title")
-      #   # => <input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />
-      def input(record_name, method, options = {})
-        InstanceTag.new(record_name, method, self).to_tag(options)
-      end
-
-      # Returns an entire form with all needed input tags for a specified Active Record object. For example, if <tt>@post</tt>
-      # has attributes named +title+ of type +VARCHAR+ and +body+ of type +TEXT+ then
-      #
-      #   form("post")
-      #
-      # would yield a form like the following (modulus formatting):
-      #
-      #   <form action='/posts/create' method='post'>
-      #     <p>
-      #       <label for="post_title">Title</label><br />
-      #       <input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />
-      #     </p>
-      #     <p>
-      #       <label for="post_body">Body</label><br />
-      #       <textarea cols="40" id="post_body" name="post[body]" rows="20"></textarea>
-      #     </p>
-      #     <input name="commit" type="submit" value="Create" />
-      #   </form>
-      #
-      # It's possible to specialize the form builder by using a different action name and by supplying another
-      # block renderer. For example, if <tt>@entry</tt> has an attribute +message+ of type +VARCHAR+ then
-      #
-      #   form("entry",
-      #     :action => "sign",
-      #     :input_block => Proc.new { |record, column|
-      #       "#{column.human_name}: #{input(record, column.name)}<br />"
-      #   })
-      #
-      # would yield a form like the following (modulus formatting):
-      #
-      #   <form action="/entries/sign" method="post">
-      #     Message:
-      #     <input id="entry_message" name="entry[message]" size="30" type="text" /><br />
-      #     <input name="commit" type="submit" value="Sign" />
-      #   </form>
-      #
-      # It's also possible to add additional content to the form by giving it a block, such as:
-      #
-      #   form("entry", :action => "sign") do |form|
-      #     form << content_tag("b", "Department")
-      #     form << collection_select("department", "id", @departments, "id", "name")
-      #   end
-      #
-      # The following options are available:
-      #
-      # * <tt>:action</tt> - The action used when submitting the form (default: +create+ if a new record, otherwise +update+).
-      # * <tt>:input_block</tt> - Specialize the output using a different block, see above.
-      # * <tt>:method</tt> - The method used when submitting the form (default: +post+).
-      # * <tt>:multipart</tt> - Whether to change the enctype of the form to "multipart/form-data", used when uploading a file (default: +false+).
-      # * <tt>:submit_value</tt> - The text of the submit button (default: "Create" if a new record, otherwise "Update").
-      def form(record_name, options = {})
-        record = instance_variable_get("@#{record_name}")
-        record = convert_to_model(record)
-
-        options = options.symbolize_keys
-        options[:action] ||= record.persisted? ? "update" : "create"
-        action = url_for(:action => options[:action], :id => record)
-
-        submit_value = options[:submit_value] || options[:action].gsub(/[^\w]/, '').capitalize
-
-        contents = form_tag({:action => action}, :method =>(options[:method] || 'post'), :enctype => options[:multipart] ? 'multipart/form-data': nil)
-        contents.safe_concat hidden_field(record_name, :id) if record.persisted?
-        contents.safe_concat all_input_tags(record, record_name, options)
-        yield contents if block_given?
-        contents.safe_concat submit_tag(submit_value)
-        contents.safe_concat('</form>')
-      end
-
-      # Returns a string containing the error message attached to the +method+ on the +object+ if one exists.
-      # This error message is wrapped in a <tt>DIV</tt> tag by default or with <tt>:html_tag</tt> if specified,
-      # which can be extended to include a <tt>:prepend_text</tt> and/or <tt>:append_text</tt> (to properly explain
-      # the error), and a <tt>:css_class</tt> to style it accordingly. +object+ should either be the name of an
-      # instance variable or the actual object. The method can be passed in either as a string or a symbol.
-      # As an example, let's say you have a model <tt>@post</tt> that has an error message on the +title+ attribute:
-      #
-      #   <%= error_message_on "post", "title" %>
-      #   # => <div class="formError">can't be empty</div>
-      #
-      #   <%= error_message_on @post, :title %>
-      #   # => <div class="formError">can't be empty</div>
-      #
-      #   <%= error_message_on "post", "title",
-      #       :prepend_text => "Title simply ",
-      #       :append_text => " (or it won't work).",
-      #       :html_tag => "span",
-      #       :css_class => "inputError" %>
-      #   # => <span class="inputError">Title simply can't be empty (or it won't work).</span>
-      def error_message_on(object, method, *args)
-        options = args.extract_options!
-        unless args.empty?
-          ActiveSupport::Deprecation.warn('error_message_on takes an option hash instead of separate ' +
-            'prepend_text, append_text, html_tag, and css_class arguments', caller)
-
-          options[:prepend_text] = args[0] || ''
-          options[:append_text] = args[1] || ''
-          options[:html_tag] = args[2] || 'div'
-          options[:css_class] = args[3] || 'formError'
-        end
-        options.reverse_merge!(:prepend_text => '', :append_text => '', :html_tag => 'div', :css_class => 'formError')
-
-        object = convert_to_model(object)
-
-        if (obj = (object.respond_to?(:errors) ? object : instance_variable_get("@#{object}"))) &&
-          (errors = obj.errors[method]).presence
-          content_tag(options[:html_tag],
-            (options[:prepend_text].html_safe << errors.first).safe_concat(options[:append_text]),
-            :class => options[:css_class]
-          )
-        else
-          ''
-        end
-      end
-
-      # Returns a string with a <tt>DIV</tt> containing all of the error messages for the objects located as instance variables by the names
-      # given.  If more than one object is specified, the errors for the objects are displayed in the order that the object names are
-      # provided.
-      #
-      # This <tt>DIV</tt> can be tailored by the following options:
-      #
-      # * <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").
-      # * <tt>:object</tt> - The object (or array of objects) for which to display errors,
-      #   if you need to escape the instance variable convention.
-      # * <tt>:object_name</tt> - The object name to use in the header, or any text that you prefer.
-      #   If <tt>:object_name</tt> is not set, the name of the first object will be used.
-      # * <tt>:header_message</tt> - The message in the header of the error div.  Pass +nil+
-      #   or an empty string to avoid the header message altogether. (Default: "X errors
-      #   prohibited this object from being saved").
-      # * <tt>:message</tt> - The explanation message after the header message and before
-      #   the error list.  Pass +nil+ or an empty string to avoid the explanation message
-      #   altogether. (Default: "There were problems with the following fields:").
-      #
-      # To specify the display for one object, you simply provide its name as a parameter.
-      # For example, for the <tt>@user</tt> model:
-      #
-      #   error_messages_for 'user'
-      #
-      # You can also supply an object:
-      #
-      #   error_messages_for @user
-      #
-      # This will use the last part of the model name in the presentation. For instance, if
-      # this is a MyKlass::User object, this will use "user" as the name in the String. This
-      # is taken from MyKlass::User.model_name.human, which can be overridden.
-      #
-      # To specify more than one object, you simply list them; optionally, you can add an extra <tt>:object_name</tt> parameter, which
-      # will be the name used in the header message:
-      #
-      #   error_messages_for 'user_common', 'user', :object_name => 'user'
-      #
-      # You can also use a number of objects, which will have the same naming semantics
-      # as a single object.
-      #
-      #   error_messages_for @user, @post
-      #
-      # If the objects cannot be located as instance variables, you can add an extra <tt>:object</tt> parameter which gives the actual
-      # object (or array of objects to use):
-      #
-      #   error_messages_for 'user', :object => @question.user
-      #
-      # NOTE: This is a pre-packaged presentation of the errors with embedded strings and a certain HTML structure. If what
-      # you need is significantly different from the default presentation, it makes plenty of sense to access the <tt>object.errors</tt>
-      # instance yourself and set it up. View the source of this method to see how easy it is.
-      def error_messages_for(*params)
-        options = params.extract_options!.symbolize_keys
-
-        objects = Array.wrap(options.delete(:object) || params).map do |object|
-          object = instance_variable_get("@#{object}") unless object.respond_to?(:to_model)
-          object = convert_to_model(object)
-
-          if object.class.respond_to?(:model_name)
-            options[:object_name] ||= object.class.model_name.human.downcase
+      %w(input form error_messages_for error_message_on).each do |method|
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{method}(*args)
+            ActiveSupport::Deprecation.warn "#{method} was removed from Rails and is now available as plugin. " <<
+              "Please install it with `rails plugin install git://github.com/rails/dynamic_form.git`.", caller
           end
+        RUBY
+      end
+    end
 
-          object
-        end
-
-        objects.compact!
-        count = objects.inject(0) {|sum, object| sum + object.errors.count }
-
-        unless count.zero?
-          html = {}
-          [:id, :class].each do |key|
-            if options.include?(key)
-              value = options[key]
-              html[key] = value unless value.blank?
-            else
-              html[key] = 'errorExplanation'
-            end
-          end
-          options[:object_name] ||= params.first
-
-          I18n.with_options :locale => options[:locale], :scope => [:errors, :template] do |locale|
-            header_message = if options.include?(:header_message)
-              options[:header_message]
-            else
-              locale.t :header, :count => count, :model => options[:object_name].to_s.gsub('_', ' ')
-            end
-
-            message = options.include?(:message) ? options[:message] : locale.t(:body)
-
-            error_messages = objects.sum do |object|
-              object.errors.full_messages.map do |msg|
-                content_tag(:li, msg)
-              end
-            end.join.html_safe
-
-            contents = ''
-            contents << content_tag(options[:header_tag] || :h2, header_message) unless header_message.blank?
-            contents << content_tag(:p, message) unless message.blank?
-            contents << content_tag(:ul, error_messages)
-
-            content_tag(:div, contents.html_safe, html)
+    module ActiveModelFormBuilder
+      %w(error_messages error_message_on).each do |method|
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{method}(*args)
+            ActiveSupport::Deprecation.warn "f.#{method} was removed from Rails and is now available as plugin. " <<
+              "Please install it with `rails plugin install git://github.com/rails/dynamic_form.git`.", caller
           end
-        else
-          ''
-        end
+        RUBY
       end
-
-      private
-        def all_input_tags(record, record_name, options)
-          input_block = options[:input_block] || default_input_block
-          record.class.content_columns.collect{ |column| input_block.call(record_name, column) }.join("\n")
-        end
-
-        def default_input_block
-          Proc.new { |record, column| %(<p><label for="#{record}_#{column.name}">#{column.human_name}</label><br />#{input(record, column.name)}</p>) }
-        end
     end
 
-    module ActiveRecordInstanceTag
+    module ActiveModelInstanceTag
       def object
         @active_model_object ||= begin
           object = super
@@ -267,26 +42,6 @@ module ActionView
         end
       end
 
-      def to_tag(options = {})
-        case column_type
-          when :string
-            field_type = @method_name.include?("password") ? "password" : "text"
-            to_input_field_tag(field_type, options)
-          when :text
-            to_text_area_tag(options)
-          when :integer, :float, :decimal
-            to_input_field_tag("text", options)
-          when :date
-            to_date_select_tag(options)
-          when :datetime, :timestamp
-            to_datetime_select_tag(options)
-          when :time
-            to_time_select_tag(options)
-          when :boolean
-            to_boolean_select_tag(options)
-        end
-      end
-
       %w(tag content_tag to_date_select_tag to_datetime_select_tag to_time_select_tag).each do |meth|
         module_eval "def #{meth}(*) error_wrapping(super) end"
       end
@@ -302,14 +57,14 @@ module ActionView
       def error_message
         object.errors[@method_name]
       end
+    end
 
-      def column_type
-        object.send(:column_for_attribute, @method_name).type
-      end
+    class FormBuilder
+      include ActiveModelFormBuilder
     end
 
     class InstanceTag
-      include ActiveRecordInstanceTag
+      include ActiveModelInstanceTag
     end
   end
 end
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index c0e84ce225..a3453cc47a 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -1169,14 +1169,6 @@ module ActionView
         @template.hidden_field(@object_name, method, objectify_options(options))
       end
 
-      def error_message_on(method, *args)
-        @template.error_message_on(@object, method, *args)
-      end
-
-      def error_messages(options = {})
-        @template.error_messages_for(@object_name, objectify_options(options))
-      end
-
       # Add the submit button for the given form. When no value is given, it checks
       # if the object is a new resource or not to create the proper label:
       #
diff --git a/actionpack/test/template/active_model_helper_i18n_test.rb b/actionpack/test/template/active_model_helper_i18n_test.rb
deleted file mode 100644
index 4eb2f262bd..0000000000
--- a/actionpack/test/template/active_model_helper_i18n_test.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'abstract_unit'
-
-class ActiveModelHelperI18nTest < Test::Unit::TestCase
-  include ActionView::Context
-  include ActionView::Helpers::ActiveModelHelper
-
-  attr_reader :request
-
-  def setup
-    @object = stub :errors => stub(:count => 1, :full_messages => ['full_messages'])
-    @object.stubs :to_model => @object
-    @object.stubs :class => stub(:model_name => stub(:human => ""))
-
-    @object_name = 'book_seller'
-    @object_name_without_underscore = 'book seller'
-
-    stubs(:content_tag).returns 'content_tag'
-
-    I18n.stubs(:t).with(:'header', :locale => 'en', :scope => [:errors, :template], :count => 1, :model => '').returns "1 error prohibited this  from being saved"
-    I18n.stubs(:t).with(:'body', :locale => 'en', :scope => [:errors, :template]).returns 'There were problems with the following fields:'
-  end
-
-  def test_error_messages_for_given_a_header_option_it_does_not_translate_header_message
-    I18n.expects(:t).with(:'header', :locale => 'en', :scope => [:errors, :template], :count => 1, :model => '').never
-    error_messages_for(:object => @object, :header_message => 'header message', :locale => 'en')
-  end
-
-  def test_error_messages_for_given_no_header_option_it_translates_header_message
-    I18n.expects(:t).with(:'header', :locale => 'en', :scope => [:errors, :template], :count => 1, :model => '').returns 'header message'
-    error_messages_for(:object => @object, :locale => 'en')
-  end
-
-  def test_error_messages_for_given_a_message_option_it_does_not_translate_message
-    I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:errors, :template]).never
-    error_messages_for(:object => @object, :message => 'message', :locale => 'en')
-  end
-
-  def test_error_messages_for_given_no_message_option_it_translates_message
-    I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:errors, :template]).returns 'There were problems with the following fields:'
-    error_messages_for(:object => @object, :locale => 'en')
-  end
-end
diff --git a/actionpack/test/template/active_model_helper_test.rb b/actionpack/test/template/active_model_helper_test.rb
index 47eb620f7a..8deeb78eab 100644
--- a/actionpack/test/template/active_model_helper_test.rb
+++ b/actionpack/test/template/active_model_helper_test.rb
@@ -4,132 +4,25 @@ class ActiveModelHelperTest < ActionView::TestCase
   tests ActionView::Helpers::ActiveModelHelper
 
   silence_warnings do
-    class Post < Struct.new(:title, :author_name, :body, :secret, :written_on)
-      extend ActiveModel::Naming
+    class Post < Struct.new(:author_name, :body)
       include ActiveModel::Conversion
-    end
-
-    class User < Struct.new(:email)
-      extend ActiveModel::Naming
-      include ActiveModel::Conversion
-    end
-
-    class Column < Struct.new(:type, :name, :human_name)
-      extend ActiveModel::Naming
-      include ActiveModel::Conversion
-    end
-  end
+      include ActiveModel::Validations
 
-  class DirtyPost
-    class Errors
-      def empty?
+      def persisted?
         false
       end
-
-      def count
-        1
-      end
-
-      def full_messages
-        ["Author name can't be <em>empty</em>"]
-      end
-
-      def [](field)
-        ["can't be <em>empty</em>"]
-      end
-    end
-
-    def errors
-      Errors.new
     end
   end
 
-  def setup_post
-    @post = Post.new
-    def @post.errors
-      Class.new {
-        def [](field)
-          case field.to_s
-          when "author_name"
-            ["can't be empty"]
-          when "body"
-            ['foo']
-          else
-            []
-          end
-        end
-        def empty?() false end
-        def count() 1 end
-        def full_messages() [ "Author name can't be empty" ] end
-      }.new
-    end
-
-    def @post.persisted?() false end
-    def @post.to_param() nil end
-
-    def @post.column_for_attribute(attr_name)
-      Post.content_columns.select { |column| column.name == attr_name }.first
-    end
-
-    silence_warnings do
-      def Post.content_columns() [ Column.new(:string, "title", "Title"), Column.new(:text, "body", "Body") ] end
-    end
-
-    @post.title       = "Hello World"
-    @post.author_name = ""
-    @post.body        = "Back to the hill and over it again!"
-    @post.secret = 1
-    @post.written_on  = Date.new(2004, 6, 15)
-  end
-
-  def setup_user
-    @user = User.new
-    def @user.errors
-      Class.new {
-        def [](field) field == "email" ? ['nonempty'] : [] end
-        def empty?() false end
-        def count() 1 end
-        def full_messages() [ "User email can't be empty" ] end
-      }.new
-    end
-
-    def @user.new_record?() true end
-    def @user.to_param() nil end
-
-    def @user.column_for_attribute(attr_name)
-      User.content_columns.select { |column| column.name == attr_name }.first
-    end
-
-    silence_warnings do
-      def User.content_columns() [ Column.new(:string, "email", "Email") ] end
-    end
-
-    @user.email = ""
-  end
-
-  def protect_against_forgery?
-    @protect_against_forgery ? true : false
-  end
-  attr_accessor :request_forgery_protection_token, :form_authenticity_token
-
   def setup
     super
-    setup_post
-    setup_user
-
-    @response = ActionController::TestResponse.new
-  end
-
-  def url_for(options)
-    options = options.symbolize_keys
 
-    [options[:action], options[:id].to_param].compact.join('/')
-  end
+    @post = Post.new
+    @post.errors[:author_name] << "can't be empty"
+    @post.errors[:body] << "foo"
 
-  def test_generic_input_tag
-    assert_dom_equal(
-      %(<input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />), input("post", "title")
-    )
+    @post.author_name = ""
+    @post.body        = "Back to the hill and over it again!"
   end
 
   def test_text_area_with_errors
@@ -160,176 +53,11 @@ class ActiveModelHelperTest < ActionView::TestCase
     ActionView::Base.field_error_proc = old_proc if old_proc
   end
 
-  def test_form_with_string
-    assert_dom_equal(
-      %(<form action="create" method="post"><p><label for="post_title">Title</label><br /><input id="post_title" name="post[title]" size="30" type="text" value="Hello World" /></p>\n<p><label for="post_body">Body</label><br /><div class="fieldWithErrors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div></p><input name="commit" type="submit" value="Create" /></form>),
-      form("post")
-    )
-
-    silence_warnings do
-      class << @post
-        def persisted?() true end
-        def to_param() id end
-        def id() 1 end
+  def test_deprecations
+    %w(input form error_messages_for error_message_on).each do |method|
+      assert_deprecated do
+        send(method, "post")
       end
     end
-
-    assert_dom_equal(
-      %(<form action="update/1" method="post"><input id="post_id" name="post[id]" type="hidden" value="1" /><p><label for="post_title">Title</label><br /><input id="post_title" name="post[title]" size="30" type="text" value="Hello World" /></p>\n<p><label for="post_body">Body</label><br /><div class="fieldWithErrors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div></p><input name="commit" type="submit" value="Update" /></form>),
-      form("post")
-    )
-  end
-
-  def test_form_with_protect_against_forgery
-    @protect_against_forgery = true
-    @request_forgery_protection_token = 'authenticity_token'
-    @form_authenticity_token = '123'
-    assert_dom_equal(
-      %(<form action="create" method="post"><div style='margin:0;padding:0;display:inline'><input type='hidden' name='authenticity_token' value='123' /></div><p><label for="post_title">Title</label><br /><input id="post_title" name="post[title]" size="30" type="text" value="Hello World" /></p>\n<p><label for="post_body">Body</label><br /><div class="fieldWithErrors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div></p><input name="commit" type="submit" value="Create" /></form>),
-      form("post")
-    )
-  end
-
-  def test_form_with_method_option
-    assert_dom_equal(
-      %(<form action="create" method="get"><p><label for="post_title">Title</label><br /><input id="post_title" name="post[title]" size="30" type="text" value="Hello World" /></p>\n<p><label for="post_body">Body</label><br /><div class="fieldWithErrors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div></p><input name="commit" type="submit" value="Create" /></form>),
-      form("post", :method=>'get')
-    )
-  end
-
-  def test_form_with_action_option
-    output_buffer << form("post", :action => "sign")
-    assert_select "form[action=sign]" do |form|
-      assert_select "input[type=submit][value=Sign]"
-    end
-  end
-
-  def test_form_with_date
-    silence_warnings do
-      def Post.content_columns() [ Column.new(:date, "written_on", "Written on") ] end
-    end
-
-    assert_dom_equal(
-      %(<form action="create" method="post"><p><label for="post_written_on">Written on</label><br /><select id="post_written_on_1i" name="post[written_on(1i)]">\n<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n</select>\n<select id="post_written_on_2i" name="post[written_on(2i)]">\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n</select>\n<select id="post_written_on_3i" name="post[written_on(3i)]">\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n</select>\n</p><input name="commit" type="submit" value="Create" /></form>),
-      form("post")
-    )
-  end
-
-  def test_form_with_datetime
-    silence_warnings do
-      def Post.content_columns() [ Column.new(:datetime, "written_on", "Written on") ] end
-    end
-    @post.written_on  = Time.gm(2004, 6, 15, 16, 30)
-
-    assert_dom_equal(
-      %(<form action="create" method="post"><p><label for="post_written_on">Written on</label><br /><select id="post_written_on_1i" name="post[written_on(1i)]">\n<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n</select>\n<select id="post_written_on_2i" name="post[written_on(2i)]">\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n</select>\n<select id="post_written_on_3i" name="post[written_on(3i)]">\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n</select>\n &mdash; <select id="post_written_on_4i" name="post[written_on(4i)]">\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n</select>\n : <select id="post_written_on_5i" name="post[written_on(5i)]">\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30" selected="selected">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n</select>\n</p><input name="commit" type="submit" value="Create" /></form>),
-      form("post")
-    )
-  end
-
-  def test_error_for_block
-    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post")
-    assert_equal %(<div class="errorDeathByClass" id="errorDeathById"><h1>1 error prohibited this post from being saved</h1><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post", :class => "errorDeathByClass", :id => "errorDeathById", :header_tag => "h1")
-    assert_equal %(<div id="errorDeathById"><h1>1 error prohibited this post from being saved</h1><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post", :class => nil, :id => "errorDeathById", :header_tag => "h1")
-    assert_equal %(<div class="errorDeathByClass"><h1>1 error prohibited this post from being saved</h1><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post", :class => "errorDeathByClass", :id => nil, :header_tag => "h1")
-  end
-
-  def test_error_messages_for_escapes_html
-    @dirty_post = DirtyPost.new
-    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this dirty post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be &lt;em&gt;empty&lt;/em&gt;</li></ul></div>), error_messages_for("dirty_post")
-  end
-
-  def test_error_messages_for_handles_nil
-    assert_equal "", error_messages_for("notthere")
-  end
-
-  def test_error_message_on_escapes_html
-    @dirty_post = DirtyPost.new
-    assert_dom_equal "<div class=\"formError\">can't be &lt;em&gt;empty&lt;/em&gt;</div>", error_message_on(:dirty_post, :author_name)
-  end
-
-  def test_error_message_on_handles_nil
-    assert_equal "", error_message_on("notthere", "notthere")
-  end
-
-  def test_error_message_on
-    assert_dom_equal "<div class=\"formError\">can't be empty</div>", error_message_on(:post, :author_name)
-  end
-
-  def test_error_message_on_no_instance_variable
-    other_post = @post
-    assert_dom_equal "<div class=\"formError\">can't be empty</div>", error_message_on(other_post, :author_name)
-  end
-
-  def test_error_message_on_with_options_hash
-    assert_dom_equal "<div class=\"differentError\">beforecan't be emptyafter</div>", error_message_on(:post, :author_name, :css_class => 'differentError', :prepend_text => 'before', :append_text => 'after')
-  end
-
-  def test_error_message_on_with_tag_option_in_options_hash
-    assert_dom_equal "<span class=\"differentError\">beforecan't be emptyafter</span>", error_message_on(:post, :author_name, :html_tag => "span", :css_class => 'differentError', :prepend_text => 'before', :append_text => 'after')
-  end
-
-  def test_error_message_on_handles_empty_errors
-    assert_equal "", error_message_on(@post, :tag)
-  end
-
-  def test_error_messages_for_many_objects
-    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li><li>User email can't be empty</li></ul></div>), error_messages_for("post", "user")
-
-    # reverse the order, error order changes and so does the title
-    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this user 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")
-
-    # add the default to put post back in the title
-    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this post 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 => "post")
-
-    # symbols work as well
-    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this post 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 => :post)
-
-    # any default works too
-    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this monkey 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 => "monkey")
-
-    # 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
-    actual_user = @user
-    actual_post = @post
-    @user = nil
-    @post = nil
-
-  #explicitly set object
-    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post", :object => actual_post)
-
-  #multiple objects
-    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this user 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 => [actual_user, actual_post])
-
-  #nil object
-    assert_equal '', error_messages_for('user', :object => nil)
-  end
-
-  def test_error_messages_for_model_objects
-    error = error_messages_for(@post)
-    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>),
-      error
-
-    error = error_messages_for(@user, @post)
-    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this user 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
-  end
-
-  def test_form_with_string_multipart
-    assert_dom_equal(
-      %(<form action="create" enctype="multipart/form-data" method="post"><p><label for="post_title">Title</label><br /><input id="post_title" name="post[title]" size="30" type="text" value="Hello World" /></p>\n<p><label for="post_body">Body</label><br /><div class="fieldWithErrors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div></p><input name="commit" type="submit" value="Create" /></form>),
-      form("post", :multipart => true)
-    )
   end
 end
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index abd50a3bf9..28a13b07be 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -1366,43 +1366,6 @@ class FormHelperTest < ActionView::TestCase
     ActionView::Base.default_form_builder = old_default_form_builder
   end
 
-  def test_default_form_builder_with_active_record_helpers
-    assert_deprecated do
-      form_for(:post, @post) do |f|
-         concat f.error_message_on('author_name')
-         concat f.error_messages
-      end
-    end
-
-    expected = %(<form action='http://www.example.com' method='post'>) +
-               %(<div class='formError'>can't be empty</div>) +
-               %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>) +
-               %(</form>)
-
-    assert_dom_equal expected, output_buffer
-
-  end
-
-  def test_default_form_builder_no_instance_variable
-    post = @post
-    @post = nil
-
-    assert_deprecated do
-      form_for(:post, post) do |f|
-         concat f.error_message_on('author_name')
-         concat f.error_messages
-      end
-    end
-
-    expected = %(<form action='http://www.example.com' method='post'>) +
-               %(<div class='formError'>can't be empty</div>) +
-               %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>) +
-               %(</form>)
-
-    assert_dom_equal expected, output_buffer
-
-  end
-
   def test_fields_for_with_labelled_builder
     output_buffer = fields_for(:post, @post, :builder => LabelledFormBuilder) do |f|
       concat f.text_field(:title)